From a4d39c6edec5263be3469573cda04cc63493d4c6 Mon Sep 17 00:00:00 2001 From: Milon Date: Fri, 8 Nov 2024 09:39:04 +0100 Subject: [PATCH 1/5] make it clearer what code is ours instead of from other codebases part 2 (#2151) aaaaaaaaaaaaaaaaaaaaa --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 501d2f64df2..1d673a84aa7 100644 --- 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). From eb601b02f1b1eb335145b7949164f1a308ab491c Mon Sep 17 00:00:00 2001 From: Milon Date: Fri, 8 Nov 2024 09:39:55 +0100 Subject: [PATCH 2/5] hide ratvar and narsie from the spawn menu (#2150) this was not supposed to be a part of my day --- Resources/Prototypes/Entities/Mobs/Player/narsie.yml | 2 ++ Resources/Prototypes/Entities/Mobs/Player/ratvar.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/narsie.yml b/Resources/Prototypes/Entities/Mobs/Player/narsie.yml index 5d07409b5f8..fbc00b8dbbc 100644 --- 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 index 530f5e10374..3349fe9b29f 100644 --- 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 From e4fad202f9e6f6ab6f351e4a3dcbf540a4c2dfca Mon Sep 17 00:00:00 2001 From: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com> Date: Fri, 8 Nov 2024 04:20:08 -0700 Subject: [PATCH 3/5] Remove the mention of secHUD functionality in corpsman sunglasses (#2149) Remove mention of secHUD in corps glasses --- Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml index 281067b4114..08c2a103e1e 100644 --- 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 From 8e807727660dd531a9dbfc3c5f2045b8410d8deb Mon Sep 17 00:00:00 2001 From: Milon Date: Fri, 8 Nov 2024 14:38:47 +0100 Subject: [PATCH 4/5] standarize sec hardsuit storage (#2148) another day another hellfire commit --- Resources/Migrations/deltaMigrations.yml | 3 +++ .../Catalog/Fills/Lockers/suit_storage.yml | 12 ++++-------- .../Catalog/Fills/Lockers/suit_storage.yml | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/suit_storage.yml diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index b6c578490b2..9624e6c01e9 100644 --- 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 index ff7d4fd4152..16b45329fee 100644 --- 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 new file mode 100644 index 00000000000..c49f30bd28a --- /dev/null +++ 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 From a9b5d46b24a921c3a72f5ec4f4871efd9d27882b Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:39:06 +0100 Subject: [PATCH 5/5] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3c86e1323d8..96d417e75f4 100644 --- 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