Skip to content
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/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ job-description-qm = Manage the supplies of the station & the logistics departme
job-description-rd = Manage the epistemics department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics.
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news.
job-description-roboticist = Build a makeshift workshop in epistemics closet and create your own cyborg army.
job-description-salvagespec = Use the salvage magnet to draw in detatched scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way.
job-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently.
job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ job-name-borg = Cyborg
job-name-scientist = Scientist
job-name-research-assistant = Research Assistant
job-name-rd = Mystagogue
job-name-roboticist = Roboticist
job-name-psychologist = Psychologist
job-name-intern = Medical Intern
job-name-doctor = Medical Doctor
Expand Down Expand Up @@ -87,6 +88,7 @@ JobQuartermaster = Logistics Officer
JobReporter = Reporter
JobResearchAssistant = Research Assistant
JobResearchDirector = Mystagogue
JobRoboticist = Roboticist
JobSalvageSpecialist = Salvage Specialist
JobScientist = Scientist
JobSecurityCadet = Security Cadet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@
parent: ClothingBackpackScience
id: ClothingBackpackScienceFilled

- type: entity
noSpawn: true
parent: ClothingBackpackRobotics
id: ClothingBackpackRoboticsFilled

- type: entity
noSpawn: true
parent: ClothingBackpackHydroponics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@
parent: ClothingBackpackDuffelScience
id: ClothingBackpackDuffelScienceFilled

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelRobotics
id: ClothingBackpackDuffelRoboticsFilled

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelHydroponics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@
parent: ClothingBackpackSatchelScience
id: ClothingBackpackSatchelScienceFilled

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelRobotics
id: ClothingBackpackSatchelRoboticsFilled

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelHydroponics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
ClothingHeadsetRobotics: 2
ClothingOuterWinterRobo: 2
ClothingShoesBootsWinterRobo: 2 #Delta V: Add departmental winter boots
ClothingBackpackRobotics: 2
ClothingBackpackSatchelRobotics: 2
ClothingBackpackDuffelRobotics: 2
7 changes: 7 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,19 @@
id: BoxPDAScience
description: A box of spare PDA microcomputers for the epistemics department.
components:
- type: Item
shape:
- 0,0,4,3
- type: Storage
grid:
- 0,0,3,2 # Increased storage space for more PDA types
- type: StorageFill
contents:
- id: SciencePDA
amount: 2
- id: ForensicMantisPDA
- id: ChaplainPDA
- id: RoboticsPDA

- type: entity
name: engineering PDA box
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,15 @@
- type: Sprite
sprite: Clothing/Back/Backpacks/science.rsi

- type: entity
parent: ClothingBackpack
id: ClothingBackpackRobotics
name: robotics backpack
description: A sturdy backpack to store all the tools and parts.
components:
- type: Sprite
sprite: Clothing/Back/Backpacks/robotics.rsi

- type: entity
parent: ClothingBackpack
id: ClothingBackpackVirology
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,15 @@
- type: Sprite
sprite: Clothing/Back/Duffels/science.rsi

- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelRobotics
name: robotics duffel bag
description: A large and sturdy duffel bag to fit everything needed to build a cyborg.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/robotics.rsi

- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelHydroponics
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@
- type: Sprite
sprite: Clothing/Back/Satchels/science.rsi

- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelRobotics
name: robotics satchel
description: A sturdy satchel to store the various tools and duct tape.
components:
- type: Sprite
sprite: Clothing/Back/Satchels/robotics.rsi

- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelSecurity
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,18 @@
- sprite: DeltaV/Markers/jobs.rsi # DeltaV - Epistemics new labcoats
state: scientist

- type: entity
id: SpawnPointRoboticist
parent: SpawnPointJobBase
name: roboticist
components:
- type: SpawnPoint
job_id: Roboticist
- type: Sprite
layers:
- state: green
- state: roboticist

# Security

- type: entity
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,21 @@
- NewsReaderCartridge
- GlimmerMonitorCartridge

- type: entity
parent: SciencePDA
name: robotics PDA
id: RoboticsPDA
description: It has its back panel covered in duct tape.
components:
- type: Pda
id: RoboticsIDCard
state: pda-robotics
- type: PdaBorderColor
borderColor: "#d7d7d0"
accentVColor: "#952004"
- type: Icon
state: pda-robotics

- type: entity
parent: BasePDA
id: HoSPDA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,22 @@
- type: PresetIdCard
job: Scientist

- type: entity
parent: IDCardStandard
id: RoboticsIDCard
name: robotics ID card
components:
- type: Sprite
layers:
- state: default
- state: department
color: "#C96DBF"
- state: subdepartment
color: "#952004"
- state: scientist
- type: PresetIdCard
job: Roboticist

- type: entity
parent: IDCardStandard
id: ClownIDCard
Expand Down
28 changes: 28 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Science/roboticist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
- type: job
id: Roboticist
name: job-name-roboticist
description: job-description-roboticist
playTimeTracker: JobRoboticist
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Epistemics
min: 14400 # 4 hours - same as scientist
startingGear: RoboticistGear
icon: "JobIconRoboticist"
supervisors: job-supervisors-rd
access:
- Research
- Maintenance

- type: startingGear
id: RoboticistGear
equipment:
jumpsuit: ClothingUniformJumpsuitRoboticist
back: ClothingBackpackRoboticsFilled
shoes: ClothingShoesColorBlack
outerClothing: ClothingOuterCoatRobo
id: RoboticsPDA
ears: ClothingHeadsetRobotics
innerClothingSkirt: ClothingUniformJumpskirtRoboticist
satchel: ClothingBackpackSatchelRoboticsFilled
duffelbag: ClothingBackpackDuffelRoboticsFilled
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
- Chaplain # DeltaV - Move Chaplain into Epistemics
- ForensicMantis # Nyanotrasen - ForensicMantis, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
- Librarian
- Roboticist

- type: department
id: Specific
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@
- type: playTimeTracker
id: JobResearchDirector

- type: playTimeTracker
id: JobRoboticist

- type: playTimeTracker
id: JobSalvageSpecialist

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 and recolored by Mnemotechnician.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/Clothing/Back/Duffels/robotics.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/bd91a1b962fe9bd38e346e9fafd4ebb10784fcb3. Other sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 and recolored by Mnemotechnician.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 and recolored by Mnemotechnician.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Devices/pda.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"name": "pda-rd"
},
{
"name": "pda-roboticist"
"name": "pda-robotics"
},
{
"name": "pda-science"
Expand Down