Pulls Upstream Holopad Additions/Fixes (#2702)

* Pulls upstream holopads * dumb spaces * more redundant * I hate these * fixes * poop --------- Co-authored-by: Velcroboy <[email protected]>
DeltaV-Station · Jan 11, 2025 · ad5ebd7 · ad5ebd7
1 parent fe0dec2
commit ad5ebd7
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 2 deletions.
diff --git a/Resources/Locale/en-US/holopad/holopad.ftl b/Resources/Locale/en-US/holopad/holopad.ftl
@@ -72,6 +72,8 @@ holopad-command-hos = Command - HoS
 # Science
 holopad-science-anomaly = Science - Anomaly
 holopad-science-artifact = Science - Artifact
+holopad-science-artifact-north = Science - Artifact North
+holopad-science-artifact-south = Science - Artifact South
 holopad-science-robotics = Science - Robotics
 holopad-science-rnd = Science - R&D
 holopad-science-front = Science - Front
@@ -87,6 +89,7 @@ holopad-medical-paramedic = Medical - Paramedic
 holopad-medical-virology = Medical - Virology
 holopad-medical-front = Medical - Front
 holopad-medical-breakroom = Medical - Breakroom
+holopad-medical-clinic = Medical - Clinic
 
 # Cargo
 holopad-cargo-front = Cargo - Front
@@ -95,6 +98,7 @@ holopad-cargo-salvage-bay = Cargo - Salvage Bay
 holopad-cargo-breakroom  = Cargo - Breakroom
 holopad-cargo-ats = Cargo - ATS
 holopad-cargo-shuttle = Cargo - Shuttle
+holopad-cargo-mailroom = Cargo - Mailroom
 
 # Engineering
 holopad-engineering-atmos-front = Atmos - Front
@@ -105,6 +109,9 @@ holopad-engineering-breakroom = Engineering - Breakroom
 holopad-engineering-front = Engineering - Front
 holopad-engineering-telecoms = Engineering - Telecoms
 holopad-engineering-tech-vault = Engineering - Tech Vault
+holopad-engineering-ame = Engineering - AME
+holopad-engineering-power = Engineering - Power
+holopad-engineering-main = Engineering - Main
 
 # Security
 holopad-security-front = Security - Front
@@ -117,6 +124,10 @@ holopad-security-perma = Security - Perma
 holopad-security-courtroom = Security - Courtroom
 holopad-security-lawyer = Security - Lawyer
 holopad-security-armory = Security - Armory
+holopad-security-locker-room = Security - Locker Room
+holopad-security-brig-med = Security - Brig Med
+holopad-security-evac-checkpoint = Security - Evac Checkpoint
+holopad-security-arrivals-checkpoint = Security - Arrivals Checkpoint
 
 # Service
 holopad-service-janitor = Service - Janitor
@@ -132,6 +143,7 @@ holopad-service-clown = Service - Clown
 holopad-service-musician = Service - Musician
 holopad-service-mime = Service - Mime
 holopad-service-clown-mime = Service - Clown/Mime
+holopad-service-gameroom = Service - Game Room
 
 # AI
 holopad-ai-core = AI - Core
@@ -146,4 +158,4 @@ holopad-station-bridge = Station - Bridge
 holopad-station-cargo-bay = Station - Cargo Bay
 
 # CentComm
-holopad-centcomm-evac = CentComm - Evacuation Shuttle
+holopad-centcomm-evac = CentComm - Evacuation Shuttle
diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
@@ -401,6 +401,22 @@
   - type: Label
     currentLabel: holopad-epistemics-breakroom # DeltaV - Science > Epistemics
 
+- type: entity
+  parent: Holopad
+  id: HolopadScienceArtifactNorth
+  suffix: Artifact North
+  components:
+  - type: Label
+    currentLabel: holopad-science-artifact-north
+
+- type: entity
+  parent: Holopad
+  id: HolopadScienceArtifactSouth
+  suffix: Artifact South
+  components:
+  - type: Label
+    currentLabel: holopad-science-artifact-south
+
 # Medical
 - type: entity
   parent: Holopad
@@ -474,6 +490,8 @@
   - type: Label
     currentLabel: holopad-medical-breakroom
 
+# DeltaV - Skipped med clinic(redundant)
+
 # Cargo
 - type: entity
   parent: Holopad
@@ -507,6 +525,8 @@
   - type: Label
     currentLabel: holopad-logistics-breakroom # DeltaV - Cargo > Logistics
 
+# DeltaV - Skipped mailroom(redundant)
+
 # Engineering
 - type: entity
   parent: Holopad
@@ -572,6 +592,30 @@
   - type: Label
     currentLabel: holopad-engineering-tech-vault
 
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringAME
+  suffix: AME
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-ame
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringPower
+  suffix: Power
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-power
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringMain
+  suffix: Engi Main
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-main
+
 # Security
 - type: entity
   parent: Holopad
@@ -608,7 +652,7 @@
 - type: entity
   parent: Holopad
   id: HolopadSecurityBreakroom
-  suffix: Breakroom
+  suffix: Sec Breakroom
   components:
   - type: Label
     currentLabel: holopad-security-breakroom
@@ -653,6 +697,25 @@
   - type: Label
     currentLabel: holopad-security-armory
 
+# DeltaV - Skipped sec locker room(against SoP)
+# DeltaV - Skipped brig med(redundant)
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityEvacCheckpoint
+  suffix: Sec Evac Checkpoint
+  components:
+  - type: Label
+    currentLabel: holopad-security-evac-checkpoint
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityArrivalsCheckpoint
+  suffix: Sec Arrivals Checkpoint
+  components:
+  - type: Label
+    currentLabel: holopad-security-arrivals-checkpoint
+
 # Service
 - type: entity
   parent: Holopad
@@ -702,6 +765,14 @@
   - type: Label
     currentLabel: holopad-service-library
 
+- type: entity
+  parent: Holopad
+  id: HolopadServiceGameRoom
+  suffix: Service Game Room # DeltaV - Clarification
+  components:
+  - type: Label
+    currentLabel: holopad-service-gameroom
+
 - type: entity
   parent: Holopad
   id: HolopadServiceNewsroom