diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 07a6659b05..abf10217cb 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -5,3 +5,4 @@ id-card-access-level-prosecutor = Prosecutor id-card-access-level-clerk = Clerk id-card-access-level-justice = Justice id-card-access-level-corpsman = Corpsman +id-card-access-level-robotics = Robotics diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 417d2cdb02..4617797bb5 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -49,3 +49,4 @@ - Prosecutor # DeltaV - Add Prosecutor access - Clerk # DeltaV - Add Clerk access - Corpsman # DeltaV - Add Corpsman access + - Robotics # DeltaV: Robotics access diff --git a/Resources/Prototypes/Access/research.yml b/Resources/Prototypes/Access/research.yml index f0de2c93db..70785ce89a 100644 --- a/Resources/Prototypes/Access/research.yml +++ b/Resources/Prototypes/Access/research.yml @@ -12,3 +12,4 @@ - ResearchDirector - Research - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml + - Robotics # DeltaV: Robotics access diff --git a/Resources/Prototypes/DeltaV/Access/epistemics.yml b/Resources/Prototypes/DeltaV/Access/epistemics.yml index 8ccee35e70..2803ccdbaa 100644 --- a/Resources/Prototypes/DeltaV/Access/epistemics.yml +++ b/Resources/Prototypes/DeltaV/Access/epistemics.yml @@ -1,3 +1,7 @@ - type: accessLevel id: Mantis name: id-card-access-level-mantis # Custom access level for the Mantis so they can have their own locker and maybe doors + +- type: accessLevel + id: Robotics + name: id-card-access-level-robotics diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml index 495e4cb456..364b1ab4c2 100644 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ b/Resources/Prototypes/DeltaV/Access/misc.yml @@ -24,6 +24,7 @@ - Salvage - Cargo - Research + - Robotics # would be silly if they couldn't go to robo - Service - Maintenance - External diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index 4f671e14b2..e5d36ce9fd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -79,3 +79,16 @@ state: security - sprite: DeltaV/Mobs/Silicon/chassis.rsi state: security_e + +- type: entity + parent: SpawnPointJobBase + id: SpawnPointRoboticist + name: roboticist + components: + - type: SpawnPoint + job_id: Scientist # TODO: change to Roboticist after merged + - type: Sprite + layers: + - state: green + - sprite: DeltaV/Markers/jobs.rsi + state: roboticist diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml index ce4e63e30f..6f7450cc8f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml @@ -125,3 +125,11 @@ components: - type: AccessReader access: [["Clerk"]] + +- type: entity + parent: DoorElectronics + id: DoorElectronicsRobotics + suffix: Robotics, Locked + components: + - type: AccessReader + access: [["Research"]] # Uses research access until the job is added diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index 753f7cec45..d07778081e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -154,6 +154,15 @@ - type: GridFill path: /Maps/Shuttles/DeltaV/sub_escape_pod.yml +- type: entity + parent: AirlockRobotics + id: AirlockRoboticsLocked + suffix: Robotics, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsRobotics ] + #Add airlocks from upstream roles - type: entity parent: AirlockServiceLocked @@ -360,6 +369,15 @@ containers: board: [ DoorElectronicsPsychologist ] +- type: entity + parent: AirlockRoboticsGlass + id: AirlockRoboticsGlassLocked + suffix: Robotics, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsRobotics ] + # Maintenance Hatches - type: entity parent: AirlockMaintRnDLocked @@ -471,6 +489,15 @@ containers: board: [ DoorElectronicsSecurityLawyer ] +- type: entity + parent: AirlockMaintRnDLocked + id: AirlockMaintRoboticsLocked + suffix: Robotics, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsRobotics ] + # Command-locked External airlocks. These don't exist upstream for some reason. - type: entity parent: AirlockExternal diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml index 93a8cec851..12ec20ec95 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -8,6 +8,12 @@ - type: PaintableAirlock department: Justice +- type: entity + parent: AirlockScience + id: AirlockRobotics + suffix: Robotics + # TODO: make a sprite for it + # Glass - type: entity @@ -20,3 +26,8 @@ - type: PaintableAirlock department: Justice +- type: entity + parent: AirlockScienceGlass + id: AirlockRoboticsGlass + suffix: Robotics + # TODO: make a sprite for it diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Shutter/blast_door.yml index 30f718cf42..c6046ec68a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Shutter/blast_door.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Shutter/blast_door.yml @@ -109,3 +109,19 @@ components: - type: AccessReader access: [["Command"], ["Armory"]] + +- type: entity + parent: BlastDoor + id: BlastDoorUnlinkedRobotics + suffix: Robotics + components: + - type: AccessReader + access: [["Robotics"]] + +- type: entity + parent: BlastDoorOpen + id: BlastDoorUnlinkedRoboticsOpen + suffix: Open, Robotics + components: + - type: AccessReader + access: [["Robotics"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index d770d620c6..3a144cdc20 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -79,6 +79,15 @@ containers: board: [ DoorElectronicsMantis ] +- type: entity + parent: WindoorSecure + id: WindoorSecureRoboticsLocked + suffix: Robotics, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsRobotics ] + #Add windoors from upstream roles - type: entity parent: WindoorSecure diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/switch.yml new file mode 100644 index 0000000000..adb5f1f5b7 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/switch.yml @@ -0,0 +1,7 @@ +- type: entity + parent: LockableButton + suffix: Robotics + id: LockableButtonRobotics + components: + - type: AccessReader + access: [["Robotics"]] diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 7455bc81b7..8a06868ee0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -55,6 +55,7 @@ - Reporter #Delta V: Add Reporter Access - Research - ResearchDirector + - Robotics # DeltaV: Robotics access - Salvage - Security - Service diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 9cbd6a3fde..691778e65b 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -23,6 +23,7 @@ - ResearchDirector - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml - Chapel # DeltaV - Chaplain is in Epistemics + - Robotics # DeltaV - Robotics access - External # DeltaV - AI satellite access - Cryogenics special: # Nyanotrasen - Mystagogue can use the Bible diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 0f1ec0ec7a..193f59bd57 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -14,6 +14,8 @@ access: - Research - Maintenance + extendedAccess: # DeltaV: Scientists get robotics access on lowpop + - Robotics - type: startingGear id: ScientistGear diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json index a7534b9ee5..73c7764df0 100644 --- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by Floofers", + "copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV.", "size": { "x": 32, "y": 32 @@ -45,6 +45,9 @@ }, { "name": "mobster" + }, + { + "name": "roboticist" } ] } diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/roboticist.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/roboticist.png new file mode 100644 index 0000000000..4199496274 Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/roboticist.png differ