Merge branch 'master' into map-testing

DeltaV-Station · Nov 8, 2024 · 9a21003 · 9a21003
2 parents a239892 + a9b5d46
commit 9a21003
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,8 @@ Make sure to read [CONTRIBUTING.md](/CONTRIBUTING.md) if you are new to Delta-V!
 Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.
 Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.txt`.
 
+To be more specific, code in `Content.*/DeltaV`, `Resources/*/DeltaV` and any Delta-V specific scripts in `Tools` are licensed under AGPLv3. Other files are originally from other codebases and are not owned by Delta-V, though any code must be relicensable to AGPLv3. SS14 is MIT licensed so this forking is possible.
+
 [87c70a89a67d0521a56388e6b1c3f2cb947943e4](https://github.com/DeltaV-Station/Delta-v/commit/87c70a89a67d0521a56388e6b1c3f2cb947943e4) was pushed on February 17th 2024 at 21:48 UTC
 
 Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file. [Example](https://github.com/DeltaV-Station/Delta-v/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,10 +1,4 @@
 Entries:
-- author: Tryded
-  changes:
-  - message: Added energy guns to dynamic protolathe emagable recipes.
-    type: Add
-  id: 157
-  time: '2023-12-06T15:57:01.0000000+00:00'
 - author: Ygg01
   changes:
   - message: Digging dirt.
@@ -3712,3 +3706,11 @@
   id: 656
   time: '2024-11-07T20:09:26.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2090
+- author: MilonPL
+  changes:
+  - message: Adjusted security hardsuit lockers, now they all contain two jetpacks,
+      magboots and hardsuits.
+    type: Tweak
+  id: 657
+  time: '2024-11-08T13:38:47.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2148
diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml
@@ -125,3 +125,6 @@ BoxMagazinePistolSubMachineGunRubber: MagazineBoxPistolRubber
 
 # 2024-09-21
 VendingMachineAutomatrobe: null
+
+# 2024-11-08
+SuitStorageSec: SuitStorageSecDeltaV
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -135,17 +135,13 @@
   id: SuitStorageSec
   parent: SuitStorageBase
   suffix: Security
+  categories: [ HideSpawnMenu ] # DeltaV
   components:
   - type: StorageFill
     contents:
-        - id: OxygenTankFilled
-          amount: 2 #DeltaV - Double the tanks
-        - id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit.
-          amount: 2 #DeltaV - Double the suits
-        - id: ClothingMaskBreath
-          amount: 2 #Delta-V Double the masks
-        - id: ClothingShoesBootsSecurityMagboots # DeltaV - Added security magboots.
-          amount: 2
+    - id: OxygenTankFilled
+    - id: ClothingOuterHardsuitSecurity
+    - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Security"]]
 

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/suit_storage.yml
@@ -0,0 +1,17 @@
+- type: entity
+  id: SuitStorageSecDeltaV
+  parent: SuitStorageSec
+  suffix: Security, DeltaV
+  components:
+  - type: StorageFill
+    contents:
+    - id: OxygenTankFilled
+      amount: 2
+    - id: ClothingOuterHardsuitCombatOfficer
+      amount: 2
+    - id: ClothingMaskGasSecurity
+      amount: 2
+    - id: ClothingShoesBootsSecurityMagboots
+      amount: 2
+    - id: JetpackSecurity
+      amount: 2
diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml
@@ -27,7 +27,7 @@
   startNode: start
   targetNode: glassesCorps
   category: construction-category-clothing
-  description: A pair of sunglasses, modified to have a built-in security and medical HUD.
+  description: A pair of sunglasses, modified to have a built-in medical HUD.
   icon: { sprite: DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi, state: icon }
   objectType: Item
 

diff --git a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml
@@ -17,6 +17,7 @@
   parent: MobNarsieBase
   id: MobNarsieSpawn
   suffix: Spawn
+  categories: [ HideSpawnMenu ] # DeltaV
   components:
   - type: Sprite
     layers:
@@ -31,6 +32,7 @@
 - type: entity
   parent: [MobNarsieBase, BaseMob]
   id: MobNarsie
+  categories: [ HideSpawnMenu ] # DeltaV
   components:
   - type: AnnounceOnSpawn
     message: narsie-has-risen

diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
@@ -16,6 +16,7 @@
   parent: MobRatvarBase
   id: MobRatvarSpawn
   suffix: Spawn
+  categories: [ HideSpawnMenu ] # DeltaV
   components:
   - type: Sprite
     layers:
@@ -29,6 +30,7 @@
 - type: entity
   parent: [MobRatvarBase, BaseMob]
   id: MobRatvar
+  categories: [ HideSpawnMenu ] # DeltaV
   components:
   - type: AnnounceOnSpawn
     message: ratvar-has-risen