From c1ba1f231b9f3f1de075bc7ee0cdc11b1403a53b Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:23:32 +0200 Subject: [PATCH 01/43] Cleanup pins.yml (#32593) * Cleanup pins.yml * oh my * forgor --- .../Entities/Clothing/Neck/pins.yml | 112 +++++------------- .../Neck/Misc/autismpin.rsi/meta.json | 18 --- .../Neck/Misc/goldautismpin.rsi/meta.json | 18 --- ...aro-equipped.png => aro-equipped-NECK.png} | Bin ...ex-equipped.png => asex-equipped-NECK.png} | Bin .../autism-equipped-NECK.png} | Bin .../{autismpin.rsi => pins.rsi}/autism.png | Bin .../{bi-equipped.png => bi-equipped-NECK.png} | Bin ...gay-equipped.png => gay-equipped-NECK.png} | Bin .../goldautism-equipped-NECK.png} | Bin .../goldautism.png | Bin ...r-equipped.png => inter-equipped-NECK.png} | Bin ...les-equipped.png => les-equipped-NECK.png} | Bin ...bt-equipped.png => lgbt-equipped-NECK.png} | Bin .../Clothing/Neck/Misc/pins.rsi/meta.json | 36 ++++-- ...non-equipped.png => non-equipped-NECK.png} | Bin ...pan-equipped.png => pan-equipped-NECK.png} | Bin ...s-equipped.png => trans-equipped-NECK.png} | Bin 18 files changed, 53 insertions(+), 131 deletions(-) delete mode 100644 Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{aro-equipped.png => aro-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{asex-equipped.png => asex-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{autismpin.rsi/autism-equipped.png => pins.rsi/autism-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{autismpin.rsi => pins.rsi}/autism.png (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{bi-equipped.png => bi-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{gay-equipped.png => gay-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{goldautismpin.rsi/goldautism-equipped.png => pins.rsi/goldautism-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/{goldautismpin.rsi => pins.rsi}/goldautism.png (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{inter-equipped.png => inter-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{les-equipped.png => les-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{lgbt-equipped.png => lgbt-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{non-equipped.png => non-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{pan-equipped.png => pan-equipped-NECK.png} (100%) rename Resources/Textures/Clothing/Neck/Misc/pins.rsi/{trans-equipped.png => trans-equipped-NECK.png} (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 9f0ff79b20b..a7dcf03f28c 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -7,6 +7,10 @@ components: - type: Item size: Tiny + - type: Sprite + sprite: Clothing/Neck/Misc/pins.rsi + - type: Clothing + sprite: Clothing/Neck/Misc/pins.rsi - type: entity parent: ClothingNeckPinBase @@ -15,14 +19,9 @@ description: Be gay do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: lgbt + state: lgbt - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: lgbt-equipped + equippedPrefix: lgbt - type: entity parent: ClothingNeckPinBase @@ -31,14 +30,9 @@ description: Be aro do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: aro + state: aro - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: aro-equipped + equippedPrefix: aro - type: entity parent: ClothingNeckPinBase @@ -47,14 +41,9 @@ description: Be ace do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: asex + state: asex - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: asex-equipped + equippedPrefix: asex - type: entity parent: ClothingNeckPinBase @@ -63,14 +52,9 @@ description: Be bi do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: bi + state: bi - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: bi-equipped + equippedPrefix: bi - type: entity parent: ClothingNeckPinBase @@ -79,14 +63,9 @@ description: Be gay~ do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: gay + state: gay - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: gay-equipped + equippedPrefix: gay - type: entity parent: ClothingNeckPinBase @@ -95,14 +74,9 @@ description: Be intersex do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: inter + state: inter - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: inter-equipped + equippedPrefix: inter - type: entity parent: ClothingNeckPinBase @@ -111,14 +85,9 @@ description: Be lesbian do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: les + state: les - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: les-equipped + equippedPrefix: les - type: entity parent: ClothingNeckPinBase @@ -127,14 +96,9 @@ description: "01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101" components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: non + state: non - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: non-equipped + equippedPrefix: non - type: entity parent: ClothingNeckPinBase @@ -143,14 +107,9 @@ description: Be pan do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: pan + state: pan - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: pan-equipped + equippedPrefix: pan - type: entity parent: ClothingNeckPinBase @@ -159,14 +118,9 @@ description: Be trans do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/pins.rsi - layers: - - state: trans + state: trans - type: Clothing - sprite: Clothing/Neck/Misc/pins.rsi - clothingVisuals: - neck: - - state: trans-equipped + equippedPrefix: trans - type: entity parent: ClothingNeckPinBase @@ -175,14 +129,9 @@ description: Be autism do crime. components: - type: Sprite - sprite: Clothing/Neck/Misc/autismpin.rsi - layers: - - state: autism + state: autism - type: Clothing - sprite: Clothing/Neck/Misc/autismpin.rsi - clothingVisuals: - neck: - - state: autism-equipped + equippedPrefix: autism - type: entity parent: ClothingNeckPinBase @@ -191,11 +140,6 @@ description: Be autism do warcrime. components: - type: Sprite - sprite: Clothing/Neck/Misc/goldautismpin.rsi - layers: - - state: goldautism + state: goldautism - type: Clothing - sprite: Clothing/Neck/Misc/goldautismpin.rsi - clothingVisuals: - neck: - - state: goldautism-equipped + equippedPrefix: goldautism diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json deleted file mode 100644 index e82672f071c..00000000000 --- a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Terraspark's work", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "autism" - }, - { - "name": "autism-equipped", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json deleted file mode 100644 index 6848744ab8a..00000000000 --- a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-4.0", - "copyright": "Terraspark's work", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "goldautism" - }, - { - "name": "goldautism-equipped", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/autismpin.rsi/autism.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/autism.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/gay-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/goldautismpin.rsi/goldautism.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/goldautism.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json index aab069b5478..0619f962df3 100644 --- a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay", + "copyright": "PixelTK leaves his mark on upstream, BackeTako made the gay, autism pins by Terraspark", "size": { "x": 32, "y": 32 @@ -11,70 +11,84 @@ "name": "aro" }, { - "name": "aro-equipped", + "name": "aro-equipped-NECK", "directions": 4 }, { "name": "asex" }, { - "name": "asex-equipped", + "name": "asex-equipped-NECK", + "directions": 4 + }, + { + "name": "autism" + }, + { + "name": "autism-equipped-NECK", "directions": 4 }, { "name": "bi" }, { - "name": "bi-equipped", + "name": "bi-equipped-NECK", "directions": 4 }, { "name": "gay" }, { - "name": "gay-equipped", + "name": "gay-equipped-NECK", + "directions": 4 + }, + { + "name": "goldautism" + }, + { + "name": "goldautism-equipped-NECK", "directions": 4 }, { "name": "inter" }, { - "name": "inter-equipped", + "name": "inter-equipped-NECK", "directions": 4 }, { "name": "les" }, { - "name": "les-equipped", + "name": "les-equipped-NECK", "directions": 4 }, { "name": "lgbt" }, { - "name": "lgbt-equipped", + "name": "lgbt-equipped-NECK", "directions": 4 }, { "name": "non" }, { - "name": "non-equipped", + "name": "non-equipped-NECK", "directions": 4 }, { "name": "pan" }, { - "name": "pan-equipped", + "name": "pan-equipped-NECK", "directions": 4 }, { "name": "trans" }, { - "name": "trans-equipped", + "name": "trans-equipped-NECK", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png rename to Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped-NECK.png From 63f89ff0d4e74faa299b95dbd5a8f253b604556e Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:44:11 +0000 Subject: [PATCH 02/43] fix instigator not existing (#32597) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/GameRules/unknown_shuttles.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index db036c270e3..cde980debf5 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -7,7 +7,7 @@ - id: UnknownShuttleCargoLost - id: UnknownShuttleTravelingCuisine - id: UnknownShuttleDisasterEvacPod - # - id: UnknownShuttleHonki #DeltaV - Removes the Clown Shuttle + #- id: UnknownShuttleHonki #DeltaV - Removes the Clown Shuttle #- id: UnknownShuttleNTQuark # DeltaV - removed until theyre individually looked at #- id: UnknownShuttleCruiser #- id: UnknownShuttleCryptid @@ -20,7 +20,7 @@ #- id: UnknownShuttleMeatZone #- id: UnknownShuttleMicroshuttle #- id: UnknownShuttleSpacebus - #- id: UnknownShuttleInstigator # DeltaV - remove random ops (preemptively since original pr didnt add it lmao) + #- id: UnknownShuttleInstigator # DeltaV - remove random ops - type: entityTable id: UnknownShuttlesFreelanceTable From e297f56c48fb29b080889b94fb73bbda68e2f168 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 2 Oct 2024 11:45:17 +0000 Subject: [PATCH 03/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d29f410c515..5e2944e1428 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: Fix infinite QSI linking range - type: Fix - id: 6977 - time: '2024-07-24T20:57:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30332 - author: deltanedas changes: - message: Borgs can no longer unlock the robotics console or other borgs. @@ -3912,3 +3905,10 @@ id: 7476 time: '2024-10-02T10:53:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32594 +- author: deltanedas + changes: + - message: Fixed the Instigator shuttle event never happening. + type: Fix + id: 7477 + time: '2024-10-02T11:44:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32597 From fc0704c4e67b55ff71ffd1fd74afa1abcef5e8b7 Mon Sep 17 00:00:00 2001 From: FluffMe Date: Wed, 2 Oct 2024 14:00:31 +0200 Subject: [PATCH 04/43] Fix accidental erase of paper contents by spamming save action (#32598) Fix spammable paper save issue --- Content.Client/Paper/UI/PaperWindow.xaml.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index 02c4ed64c35..3522aabc66a 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -319,6 +319,8 @@ protected override DragMode GetDragModeFor(Vector2 relativeMousePos) private void RunOnSaved() { + // Prevent further saving while text processing still in + SaveButton.Disabled = true; OnSaved?.Invoke(Rope.Collapse(Input.TextRope)); } From c2fb4f6ef6dc3426ad87f3ee4b3031eb7d821b07 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 2 Oct 2024 12:01:37 +0000 Subject: [PATCH 05/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5e2944e1428..74db9759d88 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Borgs can no longer unlock the robotics console or other borgs. - type: Tweak - id: 6978 - time: '2024-07-25T03:54:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27888 - author: themias changes: - message: Fixed the ripley control panel not loading @@ -3912,3 +3905,10 @@ id: 7477 time: '2024-10-02T11:44:12.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32597 +- author: FluffMe + changes: + - message: Fixed accidental erase of paper contents by spamming save action. + type: Fix + id: 7478 + time: '2024-10-02T12:00:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32598 From 656e6182633b9ce42b93d83d6a8d3eb6e42a8068 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:14:44 -0500 Subject: [PATCH 06/43] Steel tile variantization fix (#32596) steel tile variantization fix --- Resources/Textures/Tiles/steel.png | Bin 952 -> 1354 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Tiles/steel.png b/Resources/Textures/Tiles/steel.png index b7792ef138e88ca6793940d036c5b691d57314e7..e41e7a1804ec882a34898b4c3fe62675bf9a9f03 100644 GIT binary patch delta 920 zcmV;J184lW2g(Yt!2y4RgM*2NhJ=KKczAexe0+a@e~XEUf`Wp8fPjaEg@uHKr@B^i z00009a7bBm000ia000ia0czHX2><{CH%UZ6R9Hv7mW@v2FbsrS4wn5XEcgB|doyEa zV^0>HPC{oPXyVV)Y3ej=J@%JhuWzRkdnPjWmpv01f6u>XO7VZJ{*1U>64>_F3xYHJ zA#lB3Z;XSn?We{gA46pi)SnuE+TWXA)K8uUKDvRo&pR^=RMG&|D5{G6)Oh5jzHL!L z1C>X<=^@{E8K5F3rMjQCBMfuy4B&PX$~bN`Pj%swV@5Xa4+=lIJsO zU_dWLC2jzhSi*nG)4*j67XvpLsCqO|`7n^co`^qG*EdO@K=BWRiGqSAR9alEU#cr=mvj{4+B$g8eqgW%=J-M$^f@Z znASF24HO=Eb#=sZ162?C#)p9%W)E;h8)3$OGd@w^x1TSzq;#Z@lv1CBqIY0hv<# ze17lol7GL8AJ20IYWRem=TGuI{+-VziUs1tc!M#qoaYN4J&}4(c++!U+f+?4CWNyn z3+y~!_}CRO;@ElDb3Q&Kw2fH;*lQzr{^NH%5bJ-?#S5=p9Wy9ddDmNbJI`wY_dWhZ zlCm;je14i4U{~Jt7T(Tt732zqfqtGZ{QR<}pz*G^@OGZ7AWKwW=lR0V2Z|+i-u0Zv zf@y*;O%rzhLs0J%bvn-%e(DVaop(Lwhaf`*XxHGU0VzTS{axG1t!X zh1YyMvjm-YJ?9~aAujo$3Ip>zm4SYqFMPP+3}fY8&v~vGhmzC8<5o9BN?#p)Oc{RgiT2P!%+^E|5`LMhkF6&S~a1UE-;Hs4e8mfAugk@9|C z#~kwezr3Au1onAu_`tiSD2Is+%d)IYG-wX3oZFI1B(7)*q?A%{a|qZdSf*U5Y*^P& zk-n+}FUN-9PGw#MJfZ_LFAeu|8h0Ugtpqn81kMqKR9<>IaB!?rah^*O770v`4$OQL z7;O_Q&p~kWSf!Ca1veiAE|SL(!F}q$!8t@UcsXj7E<7Q2f}2AC#2cEkLL8Plt`K$L z*2(n)Hy?xRGM_TfukYu1EpPeo|AAV60pd Date: Wed, 2 Oct 2024 15:52:14 +0200 Subject: [PATCH 07/43] Disable bioluminescence plant mutations because it breaks the engine (#32561) No fun allowed Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Resources/Prototypes/Hydroponics/randomMutations.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml index 88df438ce9d..77ae2288f3a 100644 --- a/Resources/Prototypes/Hydroponics/randomMutations.yml +++ b/Resources/Prototypes/Hydroponics/randomMutations.yml @@ -1,10 +1,11 @@ - type: RandomPlantMutationList id: RandomPlantMutations - mutations: - - name: Bioluminescent - baseOdds: 0.036 - appliesToPlant: false - effect: !type:Glow + mutations: + # disabled until 50 morbillion point lights don't cause the renderer to die + #- name: Bioluminescent + # baseOdds: 0.036 + # appliesToPlant: false + # effect: !type:Glow - name: Sentient baseOdds: 0.0072 appliesToProduce: false From cad334f217051c12d5f4ded5f9fe39286e05914f Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 2 Oct 2024 13:53:20 +0000 Subject: [PATCH 08/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 74db9759d88..e2e2aefec89 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: themias - changes: - - message: Fixed the ripley control panel not loading - type: Fix - id: 6979 - time: '2024-07-25T05:23:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30325 - author: Timur2011 changes: - message: Space adders are now butcherable. @@ -3912,3 +3905,11 @@ id: 7478 time: '2024-10-02T12:00:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32598 +- author: PJB3005 + changes: + - message: Removed bioluminescence plant mutations due to it breaking the rendering + engine. + type: Remove + id: 7479 + time: '2024-10-02T13:52:14.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32561 From 3337c91e7bfe96d4478029e6d24a956ec03652fd Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 3 Oct 2024 02:11:56 +0200 Subject: [PATCH 09/43] Fix borg hands showing up in stripping menu (#32606) * Fix borg hands showing up in stripping menu Borgs can't drop their items anyways, and the amount of hands borgs have causes the UI to just bug out. * Add more checks --- Content.Client/Inventory/StrippableBoundUserInterface.cs | 2 +- Content.Shared/Hands/Components/HandsComponent.cs | 6 ++++++ Content.Shared/Strip/SharedStrippableSystem.cs | 9 +++++++++ .../Entities/Mobs/Cyborgs/base_borg_chassis.yml | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index 97172f8de8c..2ce07758c96 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -98,7 +98,7 @@ public void UpdateMenu() } } - if (EntMan.TryGetComponent(Owner, out var handsComp)) + if (EntMan.TryGetComponent(Owner, out var handsComp) && handsComp.CanBeStripped) { // good ol hands shit code. there is a GuiHands comparer that does the same thing... but these are hands // and not gui hands... which are different... diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs index f218455c0bb..b3cb51ae359 100644 --- a/Content.Shared/Hands/Components/HandsComponent.cs +++ b/Content.Shared/Hands/Components/HandsComponent.cs @@ -80,6 +80,12 @@ public sealed partial class HandsComponent : Component [DataField] public DisplacementData? HandDisplacement; + + /// + /// If false, hands cannot be stripped, and they do not show up in the stripping menu. + /// + [DataField] + public bool CanBeStripped = true; } [Serializable, NetSerializable] diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs index a68bf755d42..e1c3d8ef0d8 100644 --- a/Content.Shared/Strip/SharedStrippableSystem.cs +++ b/Content.Shared/Strip/SharedStrippableSystem.cs @@ -118,6 +118,9 @@ private void StripHand( !Resolve(target, ref targetStrippable)) return; + if (!target.Comp.CanBeStripped) + return; + if (!_handsSystem.TryGetHand(target.Owner, handId, out var handSlot)) return; @@ -349,6 +352,9 @@ private bool CanStripInsertHand( !Resolve(target, ref target.Comp)) return false; + if (!target.Comp.CanBeStripped) + return false; + if (user.Comp.ActiveHand == null) return false; @@ -449,6 +455,9 @@ private bool CanStripRemoveHand( if (!Resolve(target, ref target.Comp)) return false; + if (!target.Comp.CanBeStripped) + return false; + if (!_handsSystem.TryGetHand(target, handName, out var handSlot, target.Comp)) { _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-free-message", ("owner", Identity.Name(target, EntityManager, user)))); diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 11b8064f739..b4cee6b0915 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -85,6 +85,7 @@ - type: Hands showInHands: false disableExplosionRecursion: true + canBeStripped: false - type: ComplexInteraction - type: IntrinsicRadioReceiver - type: IntrinsicRadioTransmitter From 4ee60e7d2b116b920d32bae342c5e70a9b0a1018 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 3 Oct 2024 00:13:04 +0000 Subject: [PATCH 10/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e2e2aefec89..4fd91de7b72 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: Timur2011 - changes: - - message: Space adders are now butcherable. - type: Add - - message: Snakes now drop snake meat when butchered. - type: Fix - - message: Snakes now appear lying when in critical state. - type: Tweak - id: 6980 - time: '2024-07-25T10:52:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29629 - author: Plykiya changes: - message: You can now build atmos gas pipes through things like walls. @@ -3913,3 +3902,10 @@ id: 7479 time: '2024-10-02T13:52:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32561 +- author: PJB3005 + changes: + - message: Fixed borg "hands" showing up in their stripping menu. + type: Fix + id: 7480 + time: '2024-10-03T00:11:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32606 From d362ca4687a37172e756b73f1908433c6cbef043 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Thu, 3 Oct 2024 03:01:58 -0700 Subject: [PATCH 11/43] Various item contraband fixes (#32614) * fixes current contraband issues: xray cannon, hos's trench coats, stinger grenades * yet another contraband addition --- .../Prototypes/Entities/Clothing/OuterClothing/coats.yml | 6 +++--- .../Entities/Clothing/OuterClothing/wintercoats.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Entities/Objects/Weapons/Throwable/clusterbang.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 559e9d36686..7ef4d615abe 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -83,7 +83,7 @@ damageCoefficient: 0.9 - type: entity - parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase] + parent: [ClothingOuterArmorHoS, ClothingOuterStorageBase, BaseSecurityCommandContraband] id: ClothingOuterCoatHoSTrench name: head of security's armored trenchcoat description: A greatcoat enhanced with a special alloy for some extra protection and style for those with a commanding presence. @@ -380,7 +380,7 @@ sprite: Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi - type: entity - parent: ClothingOuterStorageBase + parent: [ClothingOuterStorageBase, BaseSyndicateContraband] id: ClothingOuterCoatSyndieCap name: syndicate's coat description: The syndicate's coat is made of durable fabric, with gilded patterns. @@ -391,7 +391,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi - type: entity - parent: ClothingOuterCoatHoSTrench + parent: [BaseSyndicateContraband, ClothingOuterCoatHoSTrench] # BaseSyndicateContraband as first parent so contraband system takes that as priority, yeah I know id: ClothingOuterCoatSyndieCapArmored name: syndicate's armored coat description: The syndicate's armored coat is made of durable fabric, with gilded patterns. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 266f3604f28..e9856e6dc66 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -366,7 +366,7 @@ ########################################################## - type: entity - parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband] id: ClothingOuterWinterHoS name: head of security's armored winter coat description: A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events. @@ -380,7 +380,7 @@ ########################################################## - type: entity - parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] + parent: [ClothingOuterWinterCoatToggleable, BaseSecurityCommandContraband] id: ClothingOuterWinterHoSUnarmored name: head of security's winter coat description: A sturdy coat, a warm coat, but not an armored coat. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index a12a60d0b8d..62eaf20f783 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -382,7 +382,7 @@ - type: entity name: x-ray cannon - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseSecurityContraband] id: WeaponXrayCannon description: An experimental weapon that uses concentrated x-ray energy against its target. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml index b4f540ae53d..b041349d26e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml @@ -116,7 +116,7 @@ cluster-payload: !type:Container - type: entity - parent: [GrenadeBase, BaseSyndicateContraband] + parent: [GrenadeBase, BaseSecurityContraband] id: GrenadeStinger name: stinger grenade description: Nothing to see here, please disperse. From 8bf7f31b14ff3b7319da97e0f983f1f97119a6de Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 3 Oct 2024 10:03:05 +0000 Subject: [PATCH 12/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4fd91de7b72..4b2e41819af 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: You can now build atmos gas pipes through things like walls. - type: Tweak - id: 6981 - time: '2024-07-25T23:26:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28707 - author: Ilya246 changes: - message: Nuclear operative reinforcements now come with full nuclear operative @@ -3909,3 +3902,11 @@ id: 7480 time: '2024-10-03T00:11:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32606 +- author: ArtisticRoomba + changes: + - message: X-ray cannons and stinger grenades are now security restricted. HoS's + armored trench coat and its variants are security and command restricted. + type: Fix + id: 7481 + time: '2024-10-03T10:01:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32614 From 7299a7ef91649c67b84aa5e6c2fe1f561d8f3b8c Mon Sep 17 00:00:00 2001 From: Vasilis Date: Thu, 3 Oct 2024 12:32:10 +0200 Subject: [PATCH 13/43] Remove sentience from clean and medi bot (#32383) There is no point in these silicon being sentient, they have basically zero role play potential and are not meant to be controlled by players. The janibot can be played somewhat but at that point we have janitor borgs which are way better at this. You can only clean floors and even then it does a terrible job at doing that and only that. A player playing as a janibot will get bored quickly. No amount of RP will save you. A player taking over a mediborg just makes it useless as you cant inject anymore. And again, medical borg. There's no point in adding the feature. It's too much work then its worth when we have borgs. They don't have ghost role info for a reason. They are not meant to be played. --- Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 7d988c6fe95..612e49baec0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -258,8 +258,6 @@ - type: Construction graph: CleanBot node: bot - - type: SentienceTarget - flavorKind: station-event-random-sentience-flavor-mechanical - type: Absorbent pickupAmount: 10 - type: UseDelay @@ -331,8 +329,6 @@ - type: Construction graph: MediBot node: bot - - type: SentienceTarget - flavorKind: station-event-random-sentience-flavor-mechanical - type: Anchorable - type: InteractionPopup interactSuccessString: petting-success-medibot From 4b293219366c65340ccdf6cdc855b01c30e7e392 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 3 Oct 2024 10:33:16 +0000 Subject: [PATCH 14/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4b2e41819af..4d311b5f0d4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Ilya246 - changes: - - message: Nuclear operative reinforcements now come with full nuclear operative - gear (and a toy carp) at no additional cost. - type: Tweak - - message: Nuclear operative reinforcements now get nuclear operative names. - type: Tweak - id: 6982 - time: '2024-07-25T23:37:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30173 - author: Cojoke-dot changes: - message: Engineering goggles and other similar-looking eyewear now help block @@ -3910,3 +3900,11 @@ id: 7481 time: '2024-10-03T10:01:58.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32614 +- author: Myra + changes: + - message: Medibots and Janibots can no longer become sentient via the sentience + event. + type: Remove + id: 7482 + time: '2024-10-03T10:32:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32383 From b40ef09c5184c463a52bd2d7c5c9e76d8ed51514 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Thu, 3 Oct 2024 15:01:01 +0100 Subject: [PATCH 15/43] Allow users to drag-reorder action bar (#32552) * Avoid rebuilding all buttons on action state change Allows for drag events to continue when actions change * Remove excess action buttons --------- Co-authored-by: Eoin Mcloughlin --- .../Systems/Actions/ActionUIController.cs | 4 --- .../Actions/Controls/ActionButtonContainer.cs | 34 +++++++++---------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs index 1dffeb8d2d4..a6c1cfc94f8 100644 --- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs +++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs @@ -398,10 +398,6 @@ private void OnActionsUpdated() { QueueWindowUpdate(); - // TODO ACTIONS allow buttons to persist across state applications - // Then we don't have to interrupt drags any time the buttons get rebuilt. - _menuDragHelper.EndDrag(); - if (_actionsSystem != null) _container?.SetActionData(_actionsSystem, _actions.ToArray()); } diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs index 38c08dc4721..67b96d03307 100644 --- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs +++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs @@ -28,14 +28,26 @@ public ActionButton this[int index] get => (ActionButton) GetChild(index); } - private void BuildActionButtons(int count) + public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes) { + var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1); var keys = ContentKeyFunctions.GetHotbarBoundKeys(); - Children.Clear(); - for (var index = 0; index < count; index++) + for (var i = 0; i < uniqueCount; i++) + { + if (i >= ChildCount) + { + AddChild(MakeButton(i)); + } + + if (!actionTypes.TryGetValue(i, out var action)) + action = null; + ((ActionButton) GetChild(i)).UpdateData(action, system); + } + + for (var i = ChildCount - 1; i >= uniqueCount; i--) { - Children.Add(MakeButton(index)); + RemoveChild(GetChild(i)); } ActionButton MakeButton(int index) @@ -55,20 +67,6 @@ ActionButton MakeButton(int index) } } - public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes) - { - var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1); - if (ChildCount != uniqueCount) - BuildActionButtons(uniqueCount); - - for (var i = 0; i < uniqueCount; i++) - { - if (!actionTypes.TryGetValue(i, out var action)) - action = null; - ((ActionButton) GetChild(i)).UpdateData(action, system); - } - } - public void ClearActionData() { foreach (var button in Children) From c0d69fb8678f454abda345530743f0d70a27949a Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 3 Oct 2024 14:02:07 +0000 Subject: [PATCH 16/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4d311b5f0d4..f99785392cd 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: Engineering goggles and other similar-looking eyewear now help block - identity. - type: Tweak - - message: Radiation suit's hood now blocks identity. - type: Fix - id: 6983 - time: '2024-07-26T05:26:05.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30305 - author: Moomoobeef changes: - message: Some radio channel colors have been tweaked in order to be more easily @@ -3908,3 +3898,10 @@ id: 7482 time: '2024-10-03T10:32:11.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32383 +- author: eoineoineoin + changes: + - message: Action bar can be reconfigured again + type: Fix + id: 7483 + time: '2024-10-03T14:01:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32552 From 78ddab7b46416ba2d1badf5188fcc2733d750113 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 4 Oct 2024 01:14:09 +0000 Subject: [PATCH 17/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f99785392cd..9fa42c49d51 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Moomoobeef - changes: - - message: Some radio channel colors have been tweaked in order to be more easily - distinguishable. - type: Tweak - id: 6984 - time: '2024-07-26T06:47:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30133 - author: Errant changes: - message: Replay ghosts now actually spawn on the proper station, take two. @@ -3905,3 +3897,15 @@ id: 7483 time: '2024-10-03T14:01:01.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32552 +- author: Southbridge + changes: + - message: Box station's recycler has been properly connected. + type: Fix + - message: Box station's singlo substation has been rewired to the station-wide + HV network. + type: Tweak + - message: Box station now has AI law boards in the upload room. + type: Add + id: 7484 + time: '2024-10-04T01:12:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32608 From fb2604b4a4f253599964cf09246dc5325e5420d1 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:55:36 -0700 Subject: [PATCH 18/43] Two additional checks to prevent FTLing stations (#32558) Add two additional checks to prevent FTLing --- .../Systems/ShuttleConsoleSystem.FTL.cs | 3 +++ .../Systems/ShuttleSystem.FasterThanLight.cs | 20 ++++++++++++++----- Resources/Locale/en-US/shuttles/console.ftl | 1 + 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs index 02b15242923..eac2535e8b2 100644 --- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs +++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs @@ -124,6 +124,9 @@ private void ConsoleFTL(Entity ent, EntityCoordinates t if (!TryComp(shuttleUid, out ShuttleComponent? shuttleComp)) return; + if (shuttleComp.Enabled == false) + return; + // Check shuttle can even FTL if (!_shuttle.CanFTL(shuttleUid.Value, out var reason)) { diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index ce6a914847f..d0aab9aad55 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -225,18 +225,28 @@ public void RemoveFTLDestination(EntityUid uid) /// public bool CanFTL(EntityUid shuttleUid, [NotNullWhen(false)] out string? reason) { + // Currently in FTL already if (HasComp(shuttleUid)) { reason = Loc.GetString("shuttle-console-in-ftl"); return false; } - if (FTLMassLimit > 0 && - TryComp(shuttleUid, out PhysicsComponent? shuttlePhysics) && - shuttlePhysics.Mass > FTLMassLimit) + if (TryComp(shuttleUid, out var shuttlePhysics)) { - reason = Loc.GetString("shuttle-console-mass"); - return false; + // Static physics type is set when station anchor is enabled + if (shuttlePhysics.BodyType == BodyType.Static) + { + reason = Loc.GetString("shuttle-console-static"); + return false; + } + + // Too large to FTL + if (FTLMassLimit > 0 && shuttlePhysics.Mass > FTLMassLimit) + { + reason = Loc.GetString("shuttle-console-mass"); + return false; + } } if (HasComp(shuttleUid)) diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl index 80e61a28126..6143c995529 100644 --- a/Resources/Locale/en-US/shuttles/console.ftl +++ b/Resources/Locale/en-US/shuttles/console.ftl @@ -4,6 +4,7 @@ shuttle-pilot-end = Stopped piloting shuttle-console-in-ftl = Currently in FTL shuttle-console-mass = Too large to FTL shuttle-console-prevent = You are unable to pilot this ship +shuttle-console-static = Grid is static # NAV From 588e7669fa4921123adca7086e62f1a0451f36a1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 4 Oct 2024 02:56:43 +0000 Subject: [PATCH 19/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9fa42c49d51..0b7d81a2feb 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Errant - changes: - - message: Replay ghosts now actually spawn on the proper station, take two. - type: Fix - id: 6985 - time: '2024-07-26T12:59:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30273 - author: themias changes: - message: Arcade machines are functional again @@ -3909,3 +3902,10 @@ id: 7484 time: '2024-10-04T01:12:59.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32608 +- author: Plykiya + changes: + - message: You can no longer FTL the station. + type: Fix + id: 7485 + time: '2024-10-04T02:55:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32558 From 2b594417d190f457a79874d6f6b7d1fb12535e17 Mon Sep 17 00:00:00 2001 From: SoulFN <164462467+SoulFN@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:39:50 +0800 Subject: [PATCH 20/43] Give dragon pull ability (#32568) --- Resources/Prototypes/Entities/Mobs/Player/dragon.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 16e3038fcd2..c750b568b40 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -150,7 +150,9 @@ tags: - CannotSuicide - DoorBumpOpener - + - type: Puller + needsHands: false + - type: entity parent: BaseMobDragon id: MobDragon From 17c5c78fd31c51ea895fbce8825fa809ba77af37 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 4 Oct 2024 05:40:57 +0000 Subject: [PATCH 21/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0b7d81a2feb..6067590b344 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: themias - changes: - - message: Arcade machines are functional again - type: Fix - id: 6986 - time: '2024-07-26T17:30:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30376 - author: themias changes: - message: Zombies now get uncuffed upon transformation @@ -3909,3 +3902,10 @@ id: 7485 time: '2024-10-04T02:55:36.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32558 +- author: SoulFN + changes: + - message: Dragon can now pull things using tail. + type: Add + id: 7486 + time: '2024-10-04T05:39:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32568 From 876486339bfea7c95d337043d322dc2f51b2c135 Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Fri, 4 Oct 2024 14:43:45 +0600 Subject: [PATCH 22/43] Make the explosions throw the container/item they originated from (#32428) Extra fun if it's something that can trigger multiple times --- .../Explosion/EntitySystems/ExplosionSystem.Processing.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs index b1546600da8..6335a9b32cd 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs @@ -487,9 +487,12 @@ private void ProcessEntity( && physics.BodyType == BodyType.Dynamic) { var pos = _transformSystem.GetWorldPosition(xform); + var dir = pos - epicenter.Position; + if (dir.IsLengthZero()) + dir = _robustRandom.NextVector2().Normalized(); _throwingSystem.TryThrow( uid, - pos - epicenter.Position, + dir, physics, xform, _projectileQuery, From 643ecad8e0de6232cd71c3e34055be8196ede1c9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 4 Oct 2024 08:44:51 +0000 Subject: [PATCH 23/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6067590b344..0752c1833d1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: themias - changes: - - message: Zombies now get uncuffed upon transformation - type: Fix - id: 6987 - time: '2024-07-26T18:48:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30321 - author: metalgearsloth changes: - message: Fix grid labels getting spammed from VGRoid. @@ -3909,3 +3902,10 @@ id: 7486 time: '2024-10-04T05:39:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32568 +- author: SaphireLattice + changes: + - message: Explosives throw a container they are in + type: Tweak + id: 7487 + time: '2024-10-04T08:43:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32428 From acc4499420f6122f349805126ecf2d6fb8bc48fc Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Fri, 4 Oct 2024 15:34:48 +0600 Subject: [PATCH 24/43] Change the syndicate charge to start a timer on signal (#32423) * Change the syndicate charge to start a timer on signal * Actually add the component in question * Add default link for TimerStart signal --- .../Components/TimerStartOnSignalComponent.cs | 15 +++++++++++++++ .../EntitySystems/TriggerSystem.Signal.cs | 15 +++++++++++++++ .../en-US/machine-linking/receiver_ports.ftl | 3 +++ Resources/Prototypes/DeviceLinking/sink_ports.yml | 5 +++++ .../Prototypes/DeviceLinking/source_ports.yml | 12 ++++++------ .../Entities/Objects/Weapons/Bombs/plastic.yml | 4 ++-- 6 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs diff --git a/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs b/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs new file mode 100644 index 00000000000..9adc6dab871 --- /dev/null +++ b/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs @@ -0,0 +1,15 @@ +using Content.Shared.DeviceLinking; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Server.Explosion.Components +{ + /// + /// Sends a trigger when signal is received. + /// + [RegisterComponent] + public sealed partial class TimerStartOnSignalComponent : Component + { + [DataField("port", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string Port = "Timer"; + } +} diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs index ffd47f0257b..ce4d201f289 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs @@ -11,6 +11,9 @@ private void InitializeSignal() { SubscribeLocalEvent(OnSignalReceived); SubscribeLocalEvent(OnInit); + + SubscribeLocalEvent(OnTimerSignalReceived); + SubscribeLocalEvent(OnTimerSignalInit); } private void OnSignalReceived(EntityUid uid, TriggerOnSignalComponent component, ref SignalReceivedEvent args) @@ -24,5 +27,17 @@ private void OnInit(EntityUid uid, TriggerOnSignalComponent component, Component { _signalSystem.EnsureSinkPorts(uid, component.Port); } + + private void OnTimerSignalReceived(EntityUid uid, TimerStartOnSignalComponent component, ref SignalReceivedEvent args) + { + if (args.Port != component.Port) + return; + + StartTimer(uid, args.Trigger); + } + private void OnTimerSignalInit(EntityUid uid, TimerStartOnSignalComponent component, ComponentInit args) + { + _signalSystem.EnsureSinkPorts(uid, component.Port); + } } } diff --git a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl index a0d2fd3ec40..d7a2636e11b 100644 --- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl +++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl @@ -28,6 +28,9 @@ signal-port-description-doorbolt = Bolts door when HIGH. signal-port-name-trigger = Trigger signal-port-description-trigger = Triggers some mechanism on the device. +signal-port-name-timer = Timer +signal-port-description-timer = Starts the timer countdown of the device. + signal-port-name-order-sender = Order sender signal-port-description-order-sender = Cargo console order sender diff --git a/Resources/Prototypes/DeviceLinking/sink_ports.yml b/Resources/Prototypes/DeviceLinking/sink_ports.yml index 339b8141751..a5313fcc4e4 100644 --- a/Resources/Prototypes/DeviceLinking/sink_ports.yml +++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml @@ -48,6 +48,11 @@ name: signal-port-name-trigger description: signal-port-description-trigger +- type: sinkPort + id: Timer + name: signal-port-name-timer + description: signal-port-description-timer + - type: sinkPort id: OrderReceiver name: signal-port-name-order-receiver diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml index 1988f29e45c..5c327347268 100644 --- a/Resources/Prototypes/DeviceLinking/source_ports.yml +++ b/Resources/Prototypes/DeviceLinking/source_ports.yml @@ -2,13 +2,13 @@ id: Pressed name: signal-port-name-pressed description: signal-port-description-pressed - defaultLinks: [ Toggle, Trigger ] + defaultLinks: [ Toggle, Trigger, Timer ] - type: sourcePort id: On name: signal-port-name-on-transmitter description: signal-port-description-on-transmitter - defaultLinks: [ On, Open, Forward, Trigger ] + defaultLinks: [ On, Open, Forward, Trigger, Timer ] - type: sourcePort id: Off @@ -25,13 +25,13 @@ id: Left name: signal-port-name-left description: signal-port-description-left - defaultLinks: [ On, Open, Forward, Trigger ] + defaultLinks: [ On, Open, Forward, Trigger, Timer ] - type: sourcePort id: Right name: signal-port-name-right description: signal-port-description-right - defaultLinks: [ On, Open, Reverse, Trigger ] + defaultLinks: [ On, Open, Reverse, Trigger, Timer ] - type: sourcePort id: Middle @@ -76,7 +76,7 @@ id: Timer name: signal-port-name-timer-trigger description: signal-port-description-timer-trigger - defaultLinks: [ AutoClose, On, Open, Forward, Trigger ] + defaultLinks: [ AutoClose, On, Open, Forward, Trigger, Timer ] - type: sourcePort id: Start @@ -94,7 +94,7 @@ id: OutputHigh name: signal-port-name-logic-output-high description: signal-port-description-logic-output-high - defaultLinks: [ On, Open, Forward, Trigger ] + defaultLinks: [ On, Open, Forward, Trigger, Timer ] - type: sourcePort id: OutputLow diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 772dd15ab80..87b6bb25341 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -54,10 +54,10 @@ beepSound: /Audio/Machines/Nuke/general_beep.ogg startOnStick: true canToggleStartOnStick: true - - type: TriggerOnSignal + - type: TimerStartOnSignal - type: DeviceLinkSink ports: - - Trigger + - Timer - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. explosionType: DemolitionCharge totalIntensity: 60 From 45b9c06241450b336a5f5d611412ce2c893eef3c Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 7 Oct 2024 22:34:06 +0100 Subject: [PATCH 25/43] use old c4 signal behaviour --- .../Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 87b6bb25341..cf331c5519d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -54,10 +54,10 @@ beepSound: /Audio/Machines/Nuke/general_beep.ogg startOnStick: true canToggleStartOnStick: true - - type: TimerStartOnSignal + - type: TriggerOnSignal # DeltaV: use old behaviour instead of TimerStartOnSignal - type: DeviceLinkSink ports: - - Timer + - Trigger # DeltaV: replace Timer with Trigger for TriggerOnSignal - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating. explosionType: DemolitionCharge totalIntensity: 60 From 76bcaad6d02475b22b6c3390e36debf45d72414d Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 4 Oct 2024 09:35:55 +0000 Subject: [PATCH 26/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0752c1833d1..26c3b38fc19 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Fix grid labels getting spammed from VGRoid. - type: Fix - id: 6988 - time: '2024-07-27T01:54:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29946 - author: GoldenCan changes: - message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe. @@ -3909,3 +3902,11 @@ id: 7487 time: '2024-10-04T08:43:45.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32428 +- author: SaphireLattice + changes: + - message: Syndicate C4 now starts a countdown on signal, rather than exploding + instantly. + type: Tweak + id: 7488 + time: '2024-10-04T09:34:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32423 From cb6b99a599d6ecf542ee3dbf100f23518fc64550 Mon Sep 17 00:00:00 2001 From: NotSoDamn <75203942+NotSoDana@users.noreply.github.com> Date: Fri, 4 Oct 2024 23:13:30 +0300 Subject: [PATCH 27/43] `BaseAdvancedPen` migration (#32638) * Update migration.yml * Update Resources/migration.yml Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> --------- Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> --- Resources/Migrations/migration.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index c96d0afd03b..54c071f541c 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -424,3 +424,6 @@ HatBase: null # 2024-09-19 BlueprintFlare: null + +# 2024-10-04 +BaseAdvancedPen: Pen From b1ddcaa27cc964ea903da192541cee8a33e95b7e Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sat, 5 Oct 2024 20:44:47 +0200 Subject: [PATCH 28/43] fix light bulbs not fitting into the trash bag (#32452) fix trash --- Resources/Prototypes/Entities/Objects/Power/lights.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 3bd8d3ddf6a..c0cc138cc21 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -129,6 +129,7 @@ - type: Tag tags: - LightBulb + - Trash - type: entity parent: BaseLightbulb @@ -147,6 +148,7 @@ - type: Tag tags: - LightBulb + - Trash - type: entity parent: LightBulb @@ -160,9 +162,6 @@ lightEnergy: 0.3 # old incandescents just arent as bright lightRadius: 6 lightSoftness: 1.1 - - type: Tag - tags: - - LightBulb - type: entity suffix: Broken @@ -190,6 +189,7 @@ - type: Tag tags: - LightBulb + - Trash - type: entity parent: BaseLightTube From d3b311375798e7e3fee0b39636b7361d062a653a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 5 Oct 2024 18:45:55 +0000 Subject: [PATCH 29/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 26c3b38fc19..6a2ac2081f0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: GoldenCan - changes: - - message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe. - type: Add - id: 6989 - time: '2024-07-27T04:09:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30249 - author: Plykiya changes: - message: Thief game rule now properly selects more than one thief. @@ -3910,3 +3903,10 @@ id: 7488 time: '2024-10-04T09:34:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32423 +- author: slarticodefast + changes: + - message: Light bulbs now fit into the trash bag again. + type: Fix + id: 7489 + time: '2024-10-05T18:44:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32452 From ab9293e504a55e90e7f136e99256d0cfb09b8c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82?= <123451459+JustArt1m@users.noreply.github.com> Date: Sun, 6 Oct 2024 15:48:49 +0300 Subject: [PATCH 30/43] Add flowers to loadout (#32097) * Add_Poppy&Lily * Add_FlowerWreath * Add_Headflowers Sprites, meta, prototype * Id_Changes * Changes * Update_Sprite * Desc_Change * Scale_Change * Sprite_Scaling --- .../Entities/Clothing/Head/misc.yml | 11 +++++++++++ .../Loadouts/Miscellaneous/trinkets.yml | 13 +++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 2 ++ .../Misc/hairflower.rsi/equipped-HELMET.png | Bin 0 -> 297 bytes .../Head/Misc/hairflower.rsi/icon.png | Bin 0 -> 442 bytes .../Head/Misc/hairflower.rsi/meta.json | 18 ++++++++++++++++++ 6 files changed, 44 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 5a3110faf5e..b85f5c26b71 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -312,3 +312,14 @@ - WhitelistChameleon - type: StaticPrice price: 1 + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHairflower + name: hairflower + description: A beautiful hairflower that can be inserted between locks of hair. + components: + - type: Sprite + sprite: Clothing/Head/Misc/hairflower.rsi + - type: Clothing + sprite: Clothing/Head/Misc/hairflower.rsi diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index ea70828ce4a..14c1174a7d0 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -8,6 +8,19 @@ department: Command time: 3600 # 1 hour +# Flowers +- type: loadout + id: FlowerWreath + storage: + back: + - ClothingHeadHatFlowerWreath + +- type: loadout + id: Hairflower + storage: + back: + - ClothingHeadHatHairflower + # Plushies - type: loadout id: PlushieLizard diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 25b6dfa2132..36ffaaa138d 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -5,6 +5,8 @@ minLimit: 0 maxLimit: 3 loadouts: + - FlowerWreath + - Hairflower - PlushieLizard - PlushieSpaceLizard - Lighter diff --git a/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Misc/hairflower.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a436b83793c3d52c053dfcff4d88fe84243253 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=A3R+gLn`LHowbpZ$x(#$eph3R z?z3mt+kIz7Hru{f`YfuYbEbmQ9N!w5zPXwYjLmgoKHW0$eK}K9*Wq$)L+R0p*X!mS zSG2Tw{>E>5SmEdRDSH|UJ>Jbv*&TUhySgSSd=tPx$bV)=(R9J=Wmc44jFcgJPN*c)EK)_l%c2e+=)oaH>roKSOyhDe)Ltdg&z@wib zLy4x2U9Z4ULjz499TEw}jVf7AI<)@4Aj?1Z_}qIX11&B8olcX77vs@RjVH@h(7S>K zEXJc%m|qc~&~}pq zurIjCa&J|n%Qb5ep31cN;%qCk6I428y#a&} zV2pu?z&Xd$=Q{v=bIi3iI2}-_Fj2wg!#+6Y+6k3!^Kf;6R~uGIvK(oe0@$bF`Su3D z!J(QfqIU{Tb%W}JB+Kz~e|I$RD Date: Mon, 7 Oct 2024 22:39:46 +0100 Subject: [PATCH 31/43] add deltav comments to waddle shoes yml --- Resources/Prototypes/Entities/Clothing/Shoes/misc.yml | 2 +- Resources/Prototypes/Entities/Clothing/Shoes/specific.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index 2f5e3ef3946..73f6b45a17b 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -47,7 +47,7 @@ collection: FootstepDuck params: variation: 0.07 - - type: WaddleWhenWorn + - type: WaddleWhenWorn # DeltaV: upstream removed waddling tumbleIntensity: 10 # smaller than clown shoes - type: Construction graph: ClothingShoeSlippersDuck diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index bd37135e98d..0838ecd914e 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -15,7 +15,7 @@ parent: [ClothingShoesBaseButcherable, ClothingSlotBase] id: ClothingShoesClownBase components: - - type: WaddleWhenWorn + - type: WaddleWhenWorn # DeltaV: upstream removed waddling - type: ItemSlots slots: item: From 2d0fdecb92179f0edbab3dcc969fb0c192edee93 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 6 Oct 2024 13:34:08 +0000 Subject: [PATCH 32/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6a2ac2081f0..e0267b809b3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,18 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Thief game rule now properly selects more than one thief. - type: Fix - id: 6990 - time: '2024-07-27T07:27:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30393 -- author: BombasterDS - changes: - - message: Added new plant mutations for apple, sugarcane and galaxythistle - type: Add - id: 6991 - time: '2024-07-27T15:08:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28993 - author: Spessmann changes: - message: Thief objectives for figurines and stamps now require less items @@ -3910,3 +3896,17 @@ id: 7489 time: '2024-10-05T18:44:47.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32452 +- author: Just_Art + changes: + - message: Added a flower wreath and hairflower to loadout! + type: Add + id: 7490 + time: '2024-10-06T12:48:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32097 +- author: Golinth + changes: + - message: Removed clown waddling until implemented properly + type: Remove + id: 7491 + time: '2024-10-06T13:33:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32652 From a8b11660f77a51239b6d3aa85bb0733802ba2114 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Mon, 7 Oct 2024 19:19:42 +0200 Subject: [PATCH 33/43] Move client dumpentities command to "DEBUG" (#32687) --- Resources/clientCommandPerms.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml index 99e0fea0c5a..04961185d04 100644 --- a/Resources/clientCommandPerms.yml +++ b/Resources/clientCommandPerms.yml @@ -20,13 +20,10 @@ - net_watchent - devwindow - fill - - dumpentities - ">" - gcf - gc - gc_mode - - resetent - - resetallents - cvar - midipanic - replay_recording_start @@ -53,6 +50,8 @@ - hidemechanisms - showmechanisms - menuvis + - resetent + - resetallents - showhealthbars - toggledecals - nodevis @@ -72,7 +71,8 @@ - detachent - localdelete - fullstatereset - - fuckrules + - dumpentities + - fuckrules # DeltaV: move fuckrules to DEBUG - Flags: MAPPING Commands: From 550c0545d89ac33a498a3271cce995ba274593ae Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 7 Oct 2024 22:45:36 +0100 Subject: [PATCH 34/43] keep cleanbot sentience --- Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 612e49baec0..e13ee1c3cbc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -258,6 +258,8 @@ - type: Construction graph: CleanBot node: bot + - type: SentienceTarget # DeltaV: upstream removed it, cleanbot works when player controlled + flavorKind: station-event-random-sentience-flavor-mechanical - type: Absorbent pickupAmount: 10 - type: UseDelay From 42048542970c280906a913f755ac8079ad9a3cd7 Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Tue, 8 Oct 2024 04:42:42 +0600 Subject: [PATCH 35/43] Change minibomb to be explosion resistant and start timer on damage (#32429) * Make minibomb explosion resistant and trigger timer on damage * Tune damage behaviour and threshold for minibomb --- .../Thresholds/Behaviors/TimerStartBehavior.cs | 10 ++++++++++ .../Objects/Weapons/Throwable/grenades.yml | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs new file mode 100644 index 00000000000..97a5f8b7ef5 --- /dev/null +++ b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs @@ -0,0 +1,10 @@ +namespace Content.Server.Destructible.Thresholds.Behaviors; + +[DataDefinition] +public sealed partial class TimerStartBehavior : IThresholdBehavior +{ + public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null) + { + system.TriggerSystem.StartTimer(owner, cause); + } +} diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 3de77897c41..a4c70262439 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -109,6 +109,22 @@ components: - type: Sprite sprite: Objects/Weapons/Grenades/syndgrenade.rsi + - type: ExplosionResistance + damageCoefficient: 0.1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:TimerStartBehavior + - trigger: + !type:DamageTrigger + damage: 45 + behaviors: + - !type:TriggerBehavior + - !type:DoActsBehavior + acts: ["Destruction"] - type: OnUseTimerTrigger delay: 5 - type: ExplodeOnTrigger From 8c43b306121652a1f7971ced5b553af08d8503b9 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 7 Oct 2024 22:43:51 +0000 Subject: [PATCH 36/43] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e0267b809b3..d51092849de 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Spessmann - changes: - - message: Thief objectives for figurines and stamps now require less items - type: Tweak - id: 6992 - time: '2024-07-27T23:11:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30390 - author: metalgearsloth changes: - message: Moved VGRoid from 1,000m away to ~500m. @@ -3910,3 +3903,11 @@ id: 7491 time: '2024-10-06T13:33:02.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32652 +- author: SaphireLattice + changes: + - message: Minibomb is now explosion resistant and will start counting down if damaged + by a C4 + type: Tweak + id: 7492 + time: '2024-10-07T22:42:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32429 From 28c6eb36ec91fc5c2bd46bb914f28a3ebe5c5741 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:05:38 +0200 Subject: [PATCH 37/43] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index f011d89647f..a63ca12df8d 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Added Mothroaches in the vents. - type: Add - id: 107 - time: '2023-10-28T02:00:22.0000000+00:00' - author: Colin-Tel changes: - message: Adjusted event weights so rounds are not as exciting. @@ -3667,3 +3661,12 @@ id: 606 time: '2024-10-13T14:29:01.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1988 +- author: deltanedas + changes: + - message: Merged this week's changes from upstream. + type: Add + - message: Made C4 detonate on signal like it used to. + type: Tweak + id: 607 + time: '2024-10-14T18:05:19.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1982 From 6082d4777883a80cfa50e29b0a23ccb79a19de5e Mon Sep 17 00:00:00 2001 From: Radezolid Date: Mon, 14 Oct 2024 15:06:50 -0300 Subject: [PATCH 38/43] Adds the coordinates to the rattle message. (#1983) Adds the coordinates to the rattle. --- Content.Server/Explosion/EntitySystems/TriggerSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs index 57847551aa7..57e8e9cb62f 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs @@ -212,7 +212,8 @@ private void HandleRattleTrigger(EntityUid uid, RattleComponent component, Trigg return; // Gets location of the implant - var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(uid)); + var position = _transformSystem.GetMapCoordinates(Transform(uid)).Position; // DeltaV + var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(uid) + $" ({(int)position[0]}, {(int)position[1]})"); // DeltaV modified, adds the GPS coordinates on the message. var critMessage = Loc.GetString(component.CritMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText)); var deathMessage = Loc.GetString(component.DeathMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText)); From 59d867c686dfd79fdf852dbc7ad864e359fd15f3 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:07:09 +0200 Subject: [PATCH 39/43] 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 a63ca12df8d..c267c2570cc 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Colin-Tel - changes: - - message: Adjusted event weights so rounds are not as exciting. - type: Tweak - id: 108 - time: '2023-10-28T03:14:19.0000000+00:00' - author: FluffiestFloof changes: - message: Added the classic Moth markings back, still can't be coloured. @@ -3670,3 +3664,11 @@ id: 607 time: '2024-10-14T18:05:19.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1982 +- author: Radezolid + changes: + - message: Now tracking and death rattle implant messages show the coordinates at + the same time as the nearest beacon. + type: Tweak + id: 608 + time: '2024-10-14T18:06:50.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1983 From 6726166aa2a6939a8623776ff5f682cea4ad9956 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Mon, 14 Oct 2024 15:07:40 -0300 Subject: [PATCH 40/43] Add foam toys crate to the cargo request catalog (#1985) * Added foam toys crate. * Raised the price. --- .../Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml | 10 ++++++++++ .../DeltaV/Catalog/Fills/Crates/fun.yml | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml index ddf3ebdb9e1..a7a64686dd5 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml @@ -17,3 +17,13 @@ cost: 1000 category: Fun group: market + +- type: cargoProduct + id: FoamWeapons + icon: + sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi + state: icon + product: CrateFoamWeapons + cost: 1400 + category: Fun + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml index 18185d975e3..c2b42985f41 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml @@ -23,3 +23,18 @@ amount: 2 - id: BoxCartridgeCap amount: 2 + +- type: entity + name: foam toys set + description: Foam weapon kit to play war with the clowns. + id: CrateFoamWeapons + parent: CrateToyBox + components: + - type: StorageFill + contents: + - id: WeaponRifleFoam + amount: 1 + - id: BoxDonkSoftBox + amount: 1 + - id: GrenadeFoamDart + amount: 2 From 7a7a12c11eb8fa8a7b893af37c4312c20ac30a5f Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:07:59 +0200 Subject: [PATCH 41/43] 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 c267c2570cc..9d93237bb1d 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: FluffiestFloof - changes: - - message: Added the classic Moth markings back, still can't be coloured. - type: Add - id: 109 - time: '2023-10-28T19:05:29.0000000+00:00' - author: JJ changes: - message: Add Psionic Antag Objectives @@ -3672,3 +3666,11 @@ id: 608 time: '2024-10-14T18:06:50.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1983 +- author: Radezolid + changes: + - message: Added the foam toys set to the cargo request catalog! Go play war with + the clown or friends in the hallways! + type: Add + id: 609 + time: '2024-10-14T18:07:41.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1985 From a64c71535ee9daf3c174b495e4ed78d6dd45e997 Mon Sep 17 00:00:00 2001 From: Milon Date: Tue, 15 Oct 2024 01:43:16 +0200 Subject: [PATCH 42/43] untroll glimmermobspawnrule (#1980) * fix your shit * take 2 * take 3 --- .../Events/GlimmerMobSpawnRule.cs | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs index f1ec9372897..9acfd3021d5 100644 --- a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs +++ b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Server.Psionics.Glimmer; +using Content.Server.Station.Systems; using Content.Server.StationEvents; using Content.Server.StationEvents.Components; using Content.Server.StationEvents.Events; @@ -15,14 +16,18 @@ namespace Content.Server.DeltaV.StationEvents.Events; public sealed class GlimmerMobRule : StationEventSystem { [Dependency] private readonly GlimmerSystem _glimmer = default!; + [Dependency] private readonly StationSystem _stationSystem = default!; protected override void Started(EntityUid uid, GlimmerMobRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args) { base.Started(uid, comp, gameRule, args); - var glimmerSources = GetCoords(); - var normalSpawns = GetCoords(); - var hiddenSpawns = GetCoords(); + if (!TryGetRandomStation(out var station)) + return; + + var glimmerSources = GetCoords(station.Value); + var normalSpawns = GetCoords(station.Value); + var hiddenSpawns = GetCoords(station.Value); var psionics = EntityQuery().Count(); var baseCount = Math.Max(1, psionics / comp.MobsPerPsionic); @@ -43,15 +48,19 @@ protected override void Started(EntityUid uid, GlimmerMobRuleComponent comp, Gam } } - private List GetCoords() where T : IComponent + private List GetCoords(EntityUid station) where T : IComponent { var coords = new List(); var query = EntityQueryEnumerator(); + while (query.MoveNext(out var xform, out _)) { - coords.Add(xform.Coordinates); - } + if (xform.GridUid == null) + continue; + if (_stationSystem.GetOwningStation(xform.GridUid.Value) == station) + coords.Add(xform.Coordinates); + } return coords; } From 054bd8b7e8584caa40821114d8787f9429f7548c Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Tue, 15 Oct 2024 01:43:35 +0200 Subject: [PATCH 43/43] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 9d93237bb1d..474cc6567cf 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: JJ - changes: - - message: Add Psionic Antag Objectives - type: Add - id: 110 - time: '2023-10-28T19:06:51.0000000+00:00' - author: DebugOk changes: - message: The 10 reserved whitelist slots have been removed until further notice. @@ -3674,3 +3668,10 @@ id: 609 time: '2024-10-14T18:07:41.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1985 +- author: MilonPL + changes: + - message: Glimmer mobs will no longer spawn on CentCom or the evac shuttle. + type: Fix + id: 610 + time: '2024-10-14T23:43:17.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1980