Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add the roboticist job #2029

Merged
merged 10 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ job-description-clerk = Organize trials, notarize documents, review charges, and
job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes.
job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
job-description-security-borg = Purpose-built to ensure the right of every crew member to liberty, justice and freedom, ensure the peace aboard the space station by following your laws and patrolling the halls.
job-description-roboticist = Fabricate borgs and other robots, repair and upgrade the station's silicon life, and scream "State Laws" when the AI takes too long to open a door.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/deltav/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ job-alt-title-excavator = Excavator
job-alt-title-senior-researcher = Senior Researcher
job-alt-title-lab-technician = Lab Technician
job-alt-title-xenoarch = Xenoarchaeologist
job-alt-title-roboticist = Roboticist

job-alt-title-senior-officer = Senior Officer

Expand All @@ -61,3 +60,4 @@ JobChiefJustice = Chief Justice
JobClerk = Clerk
JobProsecutor = Prosecutor
JobSecurityBorg = Security Cyborg
JobRoboticist = Roboticist
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ loadout-group-mantis-outerclothing = Mantis outer clothing
loadout-group-mantis-shoes = Mantis shoes
loadout-group-mantis-gloves = Mantis gloves

loadout-group-roboticist-head = Roboticist head
loadout-group-roboticist-jumpsuit = Roboticist jumpsuit
loadout-group-roboticist-gloves = Roboticist gloves
loadout-group-roboticist-shoes = Roboticist shoes
loadout-group-roboticist-outerclothing = Roboticist outer clothing
loadout-group-roboticist-id = Roboticist PDA

# Engineering
loadout-group-station-engineer-neck = Station Engineer neck

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
name: roboticist
components:
- type: SpawnPoint
job_id: Scientist # TODO: change to Roboticist after merged
job_id: Roboticist
- type: Sprite
layers:
- state: green
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@
suffix: Robotics, Locked
components:
- type: AccessReader
access: [["Research"]] # Uses research access until the job is added
access: [["Robotics"]]
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,12 @@
id: RoboticistIDCard
name: roboticist ID card
components:
- type: IdCard
jobTitle: job-alt-title-roboticist
- type: Sprite
layers:
- state: default
- state: idroboticist
- type: PresetIdCard
job: Roboticist

# Clown

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Senior Time
- type: loadoutEffectGroup
id: SeniorRoboticist
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobRoboticist
time: 36000 # 10 hours

# Head
- type: loadout
id: CardborgHelmet
effects:
- !type:GroupLoadoutEffect
proto: SeniorRoboticist
equipment:
head: ClothingHeadHatCardborg

# OuterClothing
- type: loadout
id: CardborgCostume
effects:
- !type:GroupLoadoutEffect
proto: SeniorRoboticist
equipment:
head: ClothingOuterCardborg

# Shoes
- type: loadout
id: RoboticsWinterBoots
equipment:
shoes: ClothingShoesBootsWinterRobo

# PDA
- type: loadout
id: RoboticistPDA
equipment:
id: RoboticistPDA
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,3 @@
id: XenoarchPDA
equipment:
id: XenoarchPDA

- type: loadout
id: RoboticistPDA
equipment:
id: RoboticistPDA
56 changes: 56 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,56 @@
loadouts:
- ProsecutorOvercoat

# Epistemics
## Roboticist
- type: loadoutGroup
id: RoboticistHead
name: loadout-group-roboticist-head
minLimit: 0
loadouts:
- RoboticistCap
- SkullBandana
- ScientificBeret
- CardborgHelmet

- type: loadoutGroup
id: RoboticistJumpsuit
name: loadout-group-roboticist-jumpsuit
loadouts:
- RoboticistJumpsuit
- RoboticistJumpskirt
- ScientistJumpsuit
- ScientistJumpskirt

- type: loadoutGroup
id: RoboticistOuterClothing
name: loadout-group-roboticist-outerclothing
minLimit: 0
loadouts:
- RoboticistLabCoat
- RoboticistWintercoat
- RegularLabCoat
- ScienceLabCoat
- CardborgCostume

- type: loadoutGroup
id: RoboticistGloves
name: loadout-group-roboticist-gloves
minLimit: 0
loadouts:
- LatexGloves
- PurpleGloves
- RobohandsGloves

- type: loadoutGroup
id: RoboticistShoes
name: loadout-group-roboticist-shoes
loadouts:
- BlackShoes
- RoboticsWinterBoots
- WhiteShoes
- ScienceWinterBoots

# PDAs
- type: loadoutGroup
id: PassengerPDADelta
Expand Down Expand Up @@ -312,6 +362,12 @@
- JesterPDA
- FoolPDA

- type: loadoutGroup
id: RoboticistPDA
name: loadout-group-roboticist-id
loadouts:
- RoboticistPDA

# Misc
- type: loadoutGroup
id: Scarfs
Expand Down
18 changes: 18 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,21 @@
- Survival
- Trinkets
- GroupSpeciesBreathTool

# Epistemics
- type: roleLoadout
id: JobRoboticist
groups:
- GroupTankHarness
- RoboticistHead
- ScientistNeck
- RoboticistJumpsuit
- ScientistBackpack
- RoboticistOuterClothing
- RoboticistGloves
- RoboticistShoes
- RoboticistPDA
- Glasses
- Survival
- Trinkets
- GroupSpeciesBreathTool
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: job
id: Roboticist
name: job-name-roboticist
description: job-description-roboticist
playTimeTracker: JobRoboticist
antagAdvantage: 6 # The shadow factory + scientist advantage
requirements:
- !type:DepartmentTimeRequirement
department: Epistemics
time: 14400 # 4 hours
- !type:OverallPlaytimeRequirement
time: 43200 # 12 hours
startingGear: RoboticistGear
icon: JobIconRoboticist
supervisors: job-supervisors-rd
access:
- Research
- Robotics
- Maintenance

- type: startingGear
id: RoboticistGear
equipment:
ears: ClothingHeadsetRobotics
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@

- type: playTimeTracker
id: JobSecurityBorg

- type: playTimeTracker
id: JobRoboticist
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: AccessReader
access: [["Research"]]
access: [["Robotics"]] # DeltaV: Robotics access instead of Research
- type: PointLight
radius: 1.5
energy: 1.6
Expand Down Expand Up @@ -1973,7 +1973,7 @@
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: AccessReader
access: [["Research"]]
access: [["Robotics"]] # DeltaV: Robotics access instead of Research

- type: entity
parent: VendingMachine
Expand Down
10 changes: 4 additions & 6 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@
name: loadout-group-scientist-head
minLimit: 0
loadouts:
- RoboticistCap
#- RoboticistCap # DeltaV: Moved to RoboticistHead
- SkullBandana
- ScientificBeret

Expand All @@ -1034,8 +1034,8 @@
loadouts:
- ScientistJumpsuit
- ScientistJumpskirt
- RoboticistJumpsuit
- RoboticistJumpskirt
#- RoboticistJumpsuit # DeltaV: Moved to RoboticistJumpsuit
#- RoboticistJumpskirt # DeltaV: Moved to RoboticistJumpsuit
- SeniorResearcherJumpsuit
- SeniorResearcherJumpskirt

Expand All @@ -1054,7 +1054,6 @@
loadouts:
- RegularLabCoat
- ScienceLabCoat
- RoboticistLabCoat # DeltaV
- ScienceWintercoat
- SeniorResearcherLabCoat

Expand All @@ -1065,7 +1064,7 @@
loadouts:
- LatexGloves
- PurpleGloves
- RobohandsGloves
#- RobohandsGloves # DeltaV: Moved to RoboticistGloves

- type: loadoutGroup
id: ScientistShoes
Expand All @@ -1082,7 +1081,6 @@
- SeniorResearcherPDA
- LabTechPDA # DeltaV
- XenoarchPDA # DeltaV
- RoboticistPDA # DeltaV

- type: loadoutGroup
id: ResearchAssistantJumpsuit
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
- ResearchAssistant
- Chaplain # DeltaV - Move Chaplain into Epistemics
- ForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
- Roboticist # DeltaV: Roboticist job

- type: department
id: Silicon
Expand Down
Loading