From b1be8a8f0932205017b3e0b9a37dc06a7bff601e Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 11 Jan 2025 11:15:42 -0600 Subject: [PATCH 1/6] Pulls upstream holopads --- Resources/Locale/en-US/holopad/holopad.ftl | 14 ++- .../Entities/Structures/Machines/holopad.yml | 90 ++++++++++++++++++- 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/holopad/holopad.ftl b/Resources/Locale/en-US/holopad/holopad.ftl index 4708c61424a..a843b6a0e4d 100644 --- 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 \ No newline at end of file +holopad-centcomm-evac = CentComm - Evacuation Shuttle diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml index 303a58b921a..390e7538404 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml @@ -104,7 +104,7 @@ node: machineFrame - !type:DoActsBehavior acts: ["Destruction"] - + - type: entity name: long-range holopad description: "A floor-mounted device for projecting holographic images to similar devices that are far away." @@ -117,7 +117,7 @@ - Map - Unlimited ignoreTelephonesOnSameGrid: true - + - type: entity name: quantum entangling holopad description: "An floor-mounted device for projecting holographic images to similar devices at extreme distances." @@ -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 +# Delta - Skipped med clinic(redundant) + # Cargo - type: entity parent: Holopad @@ -507,6 +525,8 @@ - type: Label currentLabel: holopad-logistics-breakroom # DeltaV - Cargo > Logistics +# Delta - 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,38 @@ - type: Label currentLabel: holopad-security-armory +- type: entity + parent: Holopad + id: HolopadSecurityLockerRoom + suffix: Sec Locker Room + components: + - type: Label + currentLabel: holopad-security-locker-room + +- type: entity + parent: Holopad + id: HolopadSecurityBrigMed + suffix: Brig Med + components: + - type: Label + currentLabel: holopad-security-brig-med + +- 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 +778,14 @@ - type: Label currentLabel: holopad-service-library +- type: entity + parent: Holopad + id: HolopadServiceGameRoom + suffix: Game Room + components: + - type: Label + currentLabel: holopad-service-gameroom + - type: entity parent: Holopad id: HolopadServiceNewsroom From cf06f5ca0e6ee473a68f32d77f7d7dda77f22276 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 11 Jan 2025 11:21:49 -0600 Subject: [PATCH 2/6] dumb spaces --- Resources/Prototypes/Entities/Structures/Machines/holopad.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml index 390e7538404..f99bc535f05 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml @@ -104,7 +104,7 @@ node: machineFrame - !type:DoActsBehavior acts: ["Destruction"] - + - type: entity name: long-range holopad description: "A floor-mounted device for projecting holographic images to similar devices that are far away." @@ -117,7 +117,7 @@ - Map - Unlimited ignoreTelephonesOnSameGrid: true - + - type: entity name: quantum entangling holopad description: "An floor-mounted device for projecting holographic images to similar devices at extreme distances." From 3a129e9736e34092edafcf9be7a704f35e57ced7 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 11 Jan 2025 11:29:08 -0600 Subject: [PATCH 3/6] more redundant --- .../Entities/Structures/Machines/holopad.yml | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml index f99bc535f05..8ff1401b095 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml @@ -104,7 +104,7 @@ node: machineFrame - !type:DoActsBehavior acts: ["Destruction"] - + - type: entity name: long-range holopad description: "A floor-mounted device for projecting holographic images to similar devices that are far away." @@ -117,7 +117,7 @@ - Map - Unlimited ignoreTelephonesOnSameGrid: true - + - type: entity name: quantum entangling holopad description: "An floor-mounted device for projecting holographic images to similar devices at extreme distances." @@ -697,21 +697,8 @@ - type: Label currentLabel: holopad-security-armory -- type: entity - parent: Holopad - id: HolopadSecurityLockerRoom - suffix: Sec Locker Room - components: - - type: Label - currentLabel: holopad-security-locker-room - -- type: entity - parent: Holopad - id: HolopadSecurityBrigMed - suffix: Brig Med - components: - - type: Label - currentLabel: holopad-security-brig-med +# Delta - Skipped sec breakroom(against SoP) +# Delta - Skipped brig med(redundant) - type: entity parent: Holopad @@ -781,7 +768,7 @@ - type: entity parent: Holopad id: HolopadServiceGameRoom - suffix: Game Room + suffix: Service Game Room # Delta V - Clarification components: - type: Label currentLabel: holopad-service-gameroom From 0cfae7fe5d6b67f1f59185c3c7aa7e1c786a653d Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 11 Jan 2025 11:31:05 -0600 Subject: [PATCH 4/6] I hate these --- Resources/Prototypes/Entities/Structures/Machines/holopad.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml index 8ff1401b095..96116d83f24 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml @@ -104,7 +104,7 @@ node: machineFrame - !type:DoActsBehavior acts: ["Destruction"] - + - type: entity name: long-range holopad description: "A floor-mounted device for projecting holographic images to similar devices that are far away." @@ -117,7 +117,7 @@ - Map - Unlimited ignoreTelephonesOnSameGrid: true - + - type: entity name: quantum entangling holopad description: "An floor-mounted device for projecting holographic images to similar devices at extreme distances." From 8a56cec35f567ebe33202b47418015192b0e9d96 Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 11 Jan 2025 11:41:37 -0600 Subject: [PATCH 5/6] fixes --- .../Entities/Structures/Machines/holopad.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml index 96116d83f24..8795ad440df 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml @@ -104,7 +104,7 @@ node: machineFrame - !type:DoActsBehavior acts: ["Destruction"] - + - type: entity name: long-range holopad description: "A floor-mounted device for projecting holographic images to similar devices that are far away." @@ -117,7 +117,7 @@ - Map - Unlimited ignoreTelephonesOnSameGrid: true - + - type: entity name: quantum entangling holopad description: "An floor-mounted device for projecting holographic images to similar devices at extreme distances." @@ -490,7 +490,7 @@ - type: Label currentLabel: holopad-medical-breakroom -# Delta - Skipped med clinic(redundant) +# DeltaV - Skipped med clinic(redundant) # Cargo - type: entity @@ -525,7 +525,7 @@ - type: Label currentLabel: holopad-logistics-breakroom # DeltaV - Cargo > Logistics -# Delta - Skipped mailroom(redundant) +# DeltaV - Skipped mailroom(redundant) # Engineering - type: entity @@ -697,8 +697,8 @@ - type: Label currentLabel: holopad-security-armory -# Delta - Skipped sec breakroom(against SoP) -# Delta - Skipped brig med(redundant) +# DeltaV - Skipped sec locker room(against SoP) +# DeltaV - Skipped brig med(redundant) - type: entity parent: Holopad @@ -768,7 +768,7 @@ - type: entity parent: Holopad id: HolopadServiceGameRoom - suffix: Service Game Room # Delta V - Clarification + suffix: Service Game Room # DeltaV - Clarification components: - type: Label currentLabel: holopad-service-gameroom From 773df74148853c00cc52b40a9326f9d05b51547d Mon Sep 17 00:00:00 2001 From: Velcroboy Date: Sat, 11 Jan 2025 11:42:37 -0600 Subject: [PATCH 6/6] poop --- Resources/Prototypes/Entities/Structures/Machines/holopad.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml index 8795ad440df..46747f18388 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml @@ -104,7 +104,7 @@ node: machineFrame - !type:DoActsBehavior acts: ["Destruction"] - + - type: entity name: long-range holopad description: "A floor-mounted device for projecting holographic images to similar devices that are far away." @@ -117,7 +117,7 @@ - Map - Unlimited ignoreTelephonesOnSameGrid: true - + - type: entity name: quantum entangling holopad description: "An floor-mounted device for projecting holographic images to similar devices at extreme distances."