Den Downstream Merge 02-13-25 (#1773)

# Description ## **!!! DO NOT "Squash and commit", ONLY "Create a merge commit" !!!** Merges some PRs from The Den, YML changes only: - TheDenSS14/TheDen#168 - Change: Added the new Loadout items to the appropriate CharacterItemGroup prototypes. - TheDenSS14/TheDen#202 - Change: Converted owl hooting from stereo to mono to fix console errors. - TheDenSS14/TheDen#203 - TheDenSS14/TheDen#205 - TheDenSS14/TheDen#220 - TheDenSS14/TheDen#224 - TheDenSS14/TheDen#236 - TheDenSS14/TheDen#246 Mapper-only PRs: - TheDenSS14/TheDen#247 - TheDenSS14/TheDen#250 ## Changelog :cl: The Den Contributors - add: Added a Trooper Uniform and Hat for Security use. (by Rosycup) - add: Harpies have gained the ability to hoot. (by KyuPolaris) - add: Added ability for Arachne to produce silk. (by KyuPolaris) - tweak: Tweaked tool belts to take more tools and mantis belts to be able to fit certain epistemics tools. (by Rosycup) - add: Hopping, that's it. *hop and *hops now triggers the jump emote. (by KyuPolaris) - fix: Shadowkin are now able to select Psionic Power traits without taking the Latent Psychic trait. (by Rosycup) --------- Co-authored-by: Rosycup <[email protected]> Co-authored-by: sleepyyapril <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: Tabitha <[email protected]> Co-authored-by: KyuPolaris <[email protected]>
Simple-Station · Feb 13, 2025 · 19ea863 · 19ea863
1 parent 972a936
commit 19ea863
Show file tree

Hide file tree

Showing 94 changed files with 1,682 additions and 8 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -90,6 +90,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "ChiefJustice",  // DeltaV - Add Chief Justice access
         "Justice",  // DeltaV - Add Justice access
         "Prosecutor", // Delta V - Add Prosecutor access
+        "Clerk", // Delta V - Add Clerk access
     };
 
     [Serializable, NetSerializable]

diff --git a/Resources/Audio/Effects/Emotes/attributions.yml b/Resources/Audio/Effects/Emotes/attributions.yml
@@ -23,3 +23,11 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from https://github.com/infinitystation/Baystation12/commit/e639451bef42230a3838c085a6c782376e693499. No changes were made"
   source: "https://github.com/infinitystation/Baystation12"
+- files:
+    - harpyHoot1.ogg
+    - harpyHoot2.ogg
+    - harpyHoot3.ogg
+    - harpyHoot4.ogg
+  license: "CC-BY-NC-4.0"
+  copyright: "Taken from https://pixabay.com/sound-effects/owl-hooting-223549/ & https://pixabay.com/sound-effects/owl-humanatone-102805/. Volume lowered for audio balancing purposes and converted to mono."
+  source: "https://pixabay.com/sound-effects/"
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot1.ogg b/Resources/Audio/Effects/Emotes/harpyHoot1.ogg
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot2.ogg b/Resources/Audio/Effects/Emotes/harpyHoot2.ogg
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot3.ogg b/Resources/Audio/Effects/Emotes/harpyHoot3.ogg
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot4.ogg b/Resources/Audio/Effects/Emotes/harpyHoot4.ogg
diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
@@ -38,6 +38,7 @@ chat-emote-name-harpypew = Pew
 chat-emote-name-harpybang = Bang
 chat-emote-name-harpyrev = Rev
 chat-emote-name-harpycaw = Caw
+chat-emote-name-harpyhoot = Hoot
 # Vulp
 chat-emote-name-tailwag = Wag Tail
 chat-emote-name-vulpbark = Bark

diff --git a/Resources/Locale/en-US/deltav/holopad/holopad.ftl b/Resources/Locale/en-US/deltav/holopad/holopad.ftl
@@ -0,0 +1,61 @@
+# Command
+holopad-command-lo = Command - LO
+holopad-command-mysta = Command - Mysta
+holopad-command-cj = Command - CJ
+holopad-command-evac = Command - Evac
+
+# Epistemics
+holopad-epistemics-anomaly = Epistemics - Anomaly
+holopad-epistemics-artifact = Epistemics - Artifact
+holopad-epistemics-robotics = Epistemics - Robotics
+holopad-epistemics-rnd = Epistemics - R&D
+holopad-epistemics-front = Epistemics - Front
+holopad-epistemics-breakroom = Epistemics - Breakroom
+holopad-epistemics-mantis = Epistemics - Mantis
+holopad-epistemics-oracle = Epistemics - Oracle
+
+# Logistics
+holopad-logistics-front = Logistics - Front
+holopad-logistics-cargo-bay = Logistics - Cargo Bay
+holodpad-logistics-mailroom = Logistics - Mailroom
+holodpad-logistics-mailfront = Logistics - Mail Front
+holopad-logistics-salvage-bay = Logistics - Salvage Bay
+holopad-logistics-breakroom  = Logistics - Breakroom
+holopad-logistics-ats = Logistics - ATS
+holopad-logistics-shuttle = Logistics - Shuttle
+
+# Justice
+holopad-justice-prosecutor = Justice - Prosecutor
+holopad-justice-attorney = Justice - Attorney
+holopad-justice-clerk = Justice - Clerk
+
+# Security
+holopad-security-corpsman = Security - Corpsman
+
+# General
+holopad-general-park = General - Park
+holopad-general-nitrogen-lounge = General - Nitrogen Lounge
+holopad-general-shipyard-dock = General - Shipyard Dock
+
+# Medical
+holopad-medical-psychologist = Medical - Psychologist
+holopad-medical-outpost = Medical - Outpost
+
+# Engineering
+holopad-engineering-pa-control = Engineering - PA Control
+
+# Service
+holopad-service-toolroom = Service - Toolroom
+holopad-service-barber-shop = Service - Barber Shop
+
+# Station Specific
+holopad-security-perma-kitchen = Security - Perma Kitchen
+holopad-security-perma-botany = Security - Perma Botany
+holopad-security-perma-yard-one = Security - Perma Yard One
+holopad-security-perma-yard-two = Security - Perma Yard Two
+holopad-security-perma-workshop = Security - Perma Workshop
+holopad-security-perma-guard-complex = Security - Perma Guard Complex
+holopad-security-perma-mineshaft = Security - Perma Mineshaft
+holopad-security-perma-arena = Security - Arena
+holopad-security-perma-gladiator-lounge = Security - Gladiator Lounge
+holopad-general-spesscar-track = General - Spesscar Track
diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -34,3 +34,4 @@ station-beacon-corpsman = Corpsman
 station-beacon-justice = Justice
 station-beacon-chiefjustice = Chief Justice
 station-beacon-prosecutor = Prosecutor
+station-beacon-clerk = Clerk
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -2,5 +2,6 @@ id-card-access-level-orders = Orders
 id-card-access-level-mantis = Mantis
 id-card-access-level-cj = Chief Justice
 id-card-access-level-prosecutor = Prosecutor
+id-card-access-level-clerk = Clerk
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -47,6 +47,7 @@
   - Justice # DeltaV - Add Justice dept access
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
+  - Clerk # DeltaV - Add Clerk access
   - Corpsman # DeltaV - Add Corpsman access
   - BlueshieldOfficer # Goobstation - Add BSO Access
   - NanotrasenRepresentative # Goobstation - Add NTR Access

diff --git a/Resources/Prototypes/Actions/emotes.yml b/Resources/Prototypes/Actions/emotes.yml
@@ -32,4 +32,6 @@
   chatTriggers:
   - jump
   - jumps
+  - hop # TheDen
+  - hops # TheDen
   event: !type:AnimationJumpEmoteEvent
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -12,7 +12,7 @@
     ClothingUniformJumpsuitLawyerGood: 1
     ClothingUniformJumpskirtLawyerGood: 1
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetService: 2
+    ClothingHeadsetJustice: 2 # DeltaV - Justice dept
     ClothingNeckLawyerbadge: 2
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
     RubberStampLawyer: 1 # DeltaV

diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml
@@ -174,6 +174,8 @@
       id: LoadoutClothingHeadHelmetBasic
     - type: loadout
       id: LoadoutSecurityHeadHelmetInsulated
+    - type: loadout
+      id: LoadoutSecurityHeadHatSeniorTrooper
 
 #- type: characterItemGroup
 #  id: LoadoutSecurityId
@@ -232,6 +234,8 @@
       id: LoadoutUniformJumpsuitSecFormal
     - type: loadout
       id: LoadoutUniformJumpsuitSecSummer
+    - type: loadout
+      id: LoadoutSecurityUniformJumpsuitSeniorTrooper
     - type: loadout
       id: LoadoutSecurityUniformEnvirosuitBlue
     - type: loadout

diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml
@@ -9,12 +9,17 @@
 - type: accessLevel
   id: Prosecutor
   name: id-card-access-level-prosecutor
+
+- type: accessLevel
+  id: Clerk
+  name: id-card-access-level-clerk
 
 - type: accessGroup
   id: Justice
   tags:
   - Justice
   - Prosecutor
+  - Clerk
   - ChiefJustice
   - Lawyer
 
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -49,4 +49,5 @@
     - Zookeeper
     - Justice
     - Prosecutor
+    - Clerk
 
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -54,7 +54,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
   - type: Sprite
@@ -73,7 +72,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
       - EncryptionKeyCommand

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
@@ -159,3 +159,11 @@
   components:
   - type: NavMapBeacon
     text: station-beacon-prosecutor
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconClerk
+  suffix: Clerk
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-clerk
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -81,6 +81,24 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockJustice
+  id: AirlockClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockClerkGlassLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 # Maintenance
 - type: entity
   parent: AirlockMaint
@@ -109,6 +127,15 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 - type: entity
   parent: AirlockSecurity
   id: AirlockCorpsmanLocked
@@ -379,3 +406,44 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsSecurityLawyer ]
+
+# Command-locked External airlocks. These don't exist upstream for some reason.
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalCommandLocked
+  suffix: External, Command, Locked
+  components:
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassCommandLocked
+  suffix: External, Glass, Command, Locked
+  components:
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalSecurityLocked
+  suffix: External, Security, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassSecurityLocked
+  suffix: External, Glass, Security, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -8,6 +8,14 @@
   - type: PaintableAirlock
     department: Justice
 
+- type: entity
+  parent: AirlockScience
+  id: AirlockRobotics
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi
+
 # Glass
 
 - type: entity
@@ -20,3 +28,10 @@
   - type: PaintableAirlock
     department: Justice
 
+- type: entity
+  parent: AirlockScienceGlass
+  id: AirlockRoboticsGlass
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -0,0 +1,18 @@
+#Roboticist - Delta-V Creation
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyRoboticist
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi 
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyRoboticistGlass
+  suffix: Robotics, Glass
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi 
+    state: "assembly"
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -49,6 +49,15 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureLawyerLocked
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,4 +49,5 @@ @@
         - Zookeeper
         - Justice
         - Prosecutor
+        - Clerk