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 cargo assistant job and spawner #2453

Merged
merged 13 commits into from
Dec 21, 2024
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 @@ -5,3 +5,4 @@ job-description-prosecutor = Take statements from security and prepare cases aga
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.
job-description-cargo-assistant = Learn the basics of the logistics department, deliver crates and take buy orders from the rest of the station.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ job-name-clerk = Clerk
job-name-prosecutor = Prosecutor
job-name-lawyer = Attorney
job-name-courier = Courier
job-name-cargo-assistant = Cargo Assistant
job-name-security-borg = Security Cyborg
# Used by the Agent ID
job-name-senior-physician = Senior Physician
Expand Down Expand Up @@ -63,3 +64,4 @@ JobClerk = Clerk
JobProsecutor = Prosecutor
JobSecurityBorg = Security Cyborg
JobRoboticist = Roboticist
JobCargoAssistant = Cargo Assistant
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ loadout-group-mail-carrier-head = Mail Carrier head
loadout-group-mail-carrier-jumpsuit = Mail Carrier jumpsuit
loadout-group-mail-carrier-outerclothing = Mail Carrier outer clothing

loadout-group-cargo-assistant-head = Cargo Assistant head
loadout-group-cargo-assistant-jumpsuit = Cargo Assistant jumpsuit
loadout-group-cargo-assistant-backpack = Cargo Assistant backpack
loadout-group-cargo-assistant-outerclothing = Cargo Assistant outer clothing
loadout-group-cargo-assistant-shoes = Cargo Assistant shoes

loadout-group-salvage-specialist-neck = Salvage Specialist neck

loadout-group-salvage-id-delta = Salvage Specialist PDA
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,16 @@
- state: green
- sprite: DeltaV/Markers/jobs.rsi
state: roboticist

- type: entity
parent: SpawnPointJobBase
id: SpawnPointCargoAssistant
name: cargo assistant
components:
- type: SpawnPoint
job_id: CargoTechnician # Change to CargoAssistant once it's mapped on every map
- type: Sprite
layers:
- state: green
- sprite: DeltaV/Markers/jobs.rsi
state: cargoassistant
10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,16 @@
- MailMetricsCartridge
- NanoChatCartridge

- type: entity
parent: CargoPDA
id: CargoAssistantPDA
name: cargo assistant PDA
description: It smells like cardboard.
components:
- type: Pda
id: CargoAssistantIDCard
state: pda-cargo-assistant

## Alternate Job Titles

# Passenger
Expand Down
24 changes: 24 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Misc/books.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,27 @@
damage:
types:
Blunt: 1


- type: entity
id: BookLogistics
parent: BaseGuidebook
name: logistics 101
description: A Nanotrasen guide book for a new cargo assistant still on training
components:
- type: Sprite
layers:
- state: paper
- state: cover_strong
color: "#785214"
- state: decor_wingette
color: "#a8741e"
- state: decor_spine
color: "#a8741e"
- state: icon_diamond
- state: icon_text3
color: "#ffffff"
- type: GuideHelp
guides:
- Cargo
- Salvage
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,19 @@
- type: PresetIdCard
job: Courier

- type: entity
parent: IDCardStandard
id: CargoAssistantIDCard
name: cargo assistant ID card
components:
- type: Sprite
layers:
- state: default
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: idcargoassistant
- type: PresetIdCard
job: CargoAssistant

## Alternate Job Titles

# Passenger
Expand Down
41 changes: 39 additions & 2 deletions Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
Radezolid marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,43 @@
- CourierPDA
- MailCarrierPDA

## Cargo Assistant
- type: loadoutGroup
id: CargoAssistantHead
name: loadout-group-cargo-assistant-head
minLimit: 0
loadouts:
- CargoTechnicianHead

- type: loadoutGroup
id: CargoAssistantJumpsuit
name: loadout-group-cargo-assistant-jumpsuit
loadouts:
- CargoTechnicianJumpsuit
- CargoTechnicianJumpskirt

- type: loadoutGroup
id: CargoAssistantBackpack
name: loadout-group-cargo-assistant-backpack
loadouts:
- CargoTechnicianBackpack
- CargoTechnicianSatchel
- CargoTechnicianDuffel

- type: loadoutGroup
id: CargoAssistantOuterClothing
name: loadout-group-cargo-assistant-outerclothing
minLimit: 0
loadouts:
- CargoTechnicianWintercoat

- type: loadoutGroup
id: CargoAssistantShoes
name: loadout-group-cargo-assistant-shoes
loadouts:
- BlackShoes
- CargoWinterBoots

# Security
## Brig Medic
- type: loadoutGroup
Expand Down Expand Up @@ -228,7 +265,7 @@
- ChiefJusticeJumpskirt
- ChiefJusticeFormalJumpsuit
- ChiefJusticeWhiteJumpsuit

- type: loadoutGroup
id: ChiefJusticeNeck
name: loadout-group-chiefjustice-neck
Expand Down Expand Up @@ -257,7 +294,7 @@
loadouts:
- ClerkJumpsuit
- ClerkJumpskirt

- type: loadoutGroup
id: ClerkNeck
name: loadout-group-clerk-neck
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@
- Trinkets
- GroupSpeciesBreathTool

- type: roleLoadout
id: JobCargoAssistant
groups:
- GroupTankHarness
- CargoAssistantHead
- CargoAssistantJumpsuit
- CargoAssistantBackpack
- CargoAssistantOuterClothing
- CargoAssistantShoes
- Glasses
- Survival
- Trinkets
- GroupSpeciesBreathTool

# Security
- type: roleLoadout
id: JobBrigmedic
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- type: job
id: CargoAssistant
name: job-name-cargo-assistant
description: job-description-cargo-assistant
startingGear: CargoAssistantGear
playTimeTracker: JobCargoAssistant
icon: "JobIconCargoAssistant"
supervisors: job-supervisors-qm
access:
- Cargo
- Maintenance

- type: startingGear
id: CargoAssistantGear
equipment:
id: CargoAssistantPDA
ears: ClothingHeadsetCargo
pocket1: BookLogistics
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 @@ -21,3 +21,6 @@

- type: playTimeTracker
id: JobRoboticist

- type: playTimeTracker
id: JobCargoAssistant
8 changes: 8 additions & 0 deletions Resources/Prototypes/DeltaV/StatusIcon/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,11 @@
sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
state: SecurityBorg
jobName: job-name-security-borg

- type: jobIcon
parent: JobIcon
id: JobIconCargoAssistant
icon:
sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
state: CargoAssistant
jobName: job-name-cargo-assistant
7 changes: 7 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
name: job-name-cargotech
description: job-description-cargotech
playTimeTracker: JobCargoTechnician
# Begin DeltaV modifications - Add time requirement to cargo tech
# Uncomment once ready to deploy Cargo Assistant
#requirements:
#- !type:DepartmentTimeRequirement
# department: Logistics # DeltaV - Logistics Department replacing Cargo
# time: 21600 # 6 hrs ~3 shifts.
# End DeltaV modifications
startingGear: CargoTechGear
icon: "JobIconCargoTechnician"
supervisors: job-supervisors-qm
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 @@ -8,6 +8,7 @@
- Quartermaster
- SalvageSpecialist
- Courier # DeltaV - Courier, see Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml
#- CargoAssistant # DeltaV - Uncomment once ready to deploy.

- type: department
id: Civilian
Expand Down
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
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid",
"size": {
"x": 8,
"y": 8
Expand Down Expand Up @@ -42,6 +42,9 @@
},
{
"name": "SecurityBorg"
},
{
"name": "CargoAssistant"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV.",
"copyright": "made by Floofers. roboticist.png created by deltanedas (github) for DeltaV. cargoassistant made by Radezolid",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -48,6 +48,9 @@
},
{
"name": "roboticist"
},
{
"name": "cargoassistant"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician version by Radezolid",
"copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician version by Radezolid, modified interntech and added the cargo assistant version by Radezolid",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -50,6 +50,9 @@
{
"name": "pda-cargo"
},
{
"name": "pda-cargo-assistant"
},
{
"name": "pda-ce"
},
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.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -39,6 +39,9 @@
},
{
"name": "idlawyer"
},
{
"name": "idcargoassistant"
}
]
}
Loading