Skip to content

Commit

Permalink
rename to logistics & give brown jumpsuits
Browse files Browse the repository at this point in the history
  • Loading branch information
mqole committed Feb 10, 2025
1 parent 3d8baee commit 1bd7705
Show file tree
Hide file tree
Showing 19 changed files with 70 additions and 60 deletions.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_DV/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
job-description-cargo-assistant = Learn the basics of the logistics department, deliver crates and take buy orders from the rest of the station.
job-description-logistics-assistant = Learn the basics of the logistics department, deliver crates and take buy orders from the rest of the station.
job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/_DV/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
job-name-cargo-assistant = Cargo Assistant
job-name-logistsc-assistant = Logistics Assistant
job-name-admin-assistant = Administrative Assistant
10 changes: 5 additions & 5 deletions Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
loadout-group-chemistry-gloves = Chemist gloves
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-logistics-assistant-head = Logistics Assistant head
loadout-group-logistics-assistant-jumpsuit = Logistics Assistant jumpsuit
loadout-group-logistics-assistant-backpack = Logistics Assistant backpack
loadout-group-logistics-assistant-outerclothing = Logistics Assistant outer clothing
loadout-group-logistics-assistant-shoes = Logistics Assistant shoes
loadout-group-admin-assistant-head = Administrative Assistant head
loadout-group-admin-assistant-jumpsuit = Administrative Assistant jumpsuit
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- Courier # Imp
- Quartermaster
- SalvageSpecialist
#- CargoAssistant # DeltaV - Uncomment once ready to deploy.
#- LogisticsAssistant # DeltaV - Uncomment once ready to deploy.

- type: department
id: Civilian
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- type: entity
parent: SpawnPointJobBase
id: SpawnPointCargoAssistant
name: cargo assistant
id: SpawnPointLogisticsAssistant
name: logistics assistant
components:
- type: SpawnPoint
job_id: CargoTechnician # Change to CargoAssistant once it's mapped on every map
job_id: CargoTechnician # Change to LogisticsAssistant once it's mapped on every map
- type: Sprite
layers:
- state: green
- sprite: _DV/Markers/jobs.rsi
state: cargoassistant
state: logisticsassistant

- type: entity
parent: SpawnPointJobBase
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

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

- type: entity
parent: BasePDA
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- type: entity
parent: IDCardStandard
id: CargoAssistantIDCard
name: cargo assistant ID card
id: LogisticsAssistantIDCard
name: logistics assistant ID card
components:
- type: Sprite
layers:
- state: default
- sprite: _DV/Objects/Misc/id_cards.rsi
state: idcargoassistant
state: idlogisticsassistant
- type: PresetIdCard
job: CargoAssistant
job: LogisticsAssistant

- type: entity
parent: IDCardStandard
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: loadout
id: LightBrownJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitColorLightBrown

- type: loadout
id: LightBrownJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtColorLightBrown
38 changes: 19 additions & 19 deletions Resources/Prototypes/_DV/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,42 @@
- NitrileGloves
- ChemistryGloves

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

- type: loadoutGroup
id: CargoAssistantJumpsuit
name: loadout-group-cargo-assistant-jumpsuit
id: LogisticsAssistantJumpsuit
name: loadout-group-logistics-assistant-jumpsuit
loadouts:
- CargoTechnicianJumpsuit
- CargoTechnicianJumpskirt
- LightBrownJumpsuit
- LightBrownJumpskirt

- type: loadoutGroup
id: CargoAssistantBackpack
name: loadout-group-cargo-assistant-backpack
id: LogisticsAssistantBackpack
name: loadout-group-logistics-assistant-backpack
loadouts:
- CargoTechnicianBackpack
- CargoTechnicianSatchel
- CargoTechnicianDuffel
- LogisticsTechnicianBackpack
- LogisticsTechnicianSatchel
- LogisticsTechnicianDuffel

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

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

# Command
## Administrative Assistant
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- type: roleLoadout
id: JobCargoAssistant
id: JobLogisticsAssistant
groups:
- GroupTankHarness
- CargoAssistantHead
- CargoAssistantJumpsuit
- CargoAssistantBackpack
- CargoAssistantOuterClothing
- CargoAssistantShoes
- LogisticsAssistantHead
- LogisticsAssistantJumpsuit
- LogisticsAssistantBackpack
- LogisticsAssistantOuterClothing
- LogisticsAssistantShoes
- Glasses
- Survival
- Trinkets
Expand Down
13 changes: 7 additions & 6 deletions Resources/Prototypes/_DV/Roles/Jobs/Cargo/cargo_assistant.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
- type: job
id: CargoAssistant
id: LogisticsAssistant
name: job-name-cargo-assistant
description: job-description-cargo-assistant
startingGear: CargoAssistantGear
playTimeTracker: JobCargoAssistant
icon: "JobIconCargoAssistant"
startingGear: LogisticsAssistantGear
playTimeTracker: JobLogisticsAssistant
icon: "JobIconLogisticsAssistant"
supervisors: job-supervisors-qm
access:
- Cargo
- Maintenance
- Logistics #imp

- type: startingGear
id: CargoAssistantGear
id: LogisticsAssistantGear
equipment:
id: CargoAssistantPDA
id: LogisticsAssistantPDA
ears: ClothingHeadsetCargo
pocket1: BookLogistics
2 changes: 1 addition & 1 deletion Resources/Prototypes/_DV/Roles/play_time_trackers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- type: playTimeTracker
id: JobCargoAssistant
id: JobLogisticsAssistant

- type: playTimeTracker
id: JobAdminAssistant
6 changes: 3 additions & 3 deletions Resources/Prototypes/_DV/StatusIcon/job.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
- type: jobIcon
parent: JobIcon
id: JobIconCargoAssistant
id: JobIconLogisticsAssistant
icon:
sprite: /Textures/_DV/Interface/Misc/job_icons.rsi
state: CargoAssistant
jobName: job-name-cargo-assistant
state: LogisticsAssistant
jobName: job-name-logistics-assistant

- type: jobIcon
parent: JobIcon
Expand Down
4 changes: 2 additions & 2 deletions Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | LogisticsAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github)",
"size": {
"x": 8,
"y": 8
},
"states": [
{
"name": "CargoAssistant"
"name": "LogisticsAssistant"
},
{
"name": "AdminAssistant"
Expand Down
4 changes: 2 additions & 2 deletions Resources/Textures/_DV/Markers/jobs.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "cargoassistant made by Radezolid, adminassistant made by noctyrnal (github)",
"copyright": "logisticsassistant made by Radezolid, adminassistant made by noctyrnal (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "cargoassistant"
"name": "logisticsassistant"
},
{
"name": "adminassistant"
Expand Down
4 changes: 2 additions & 2 deletions Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": 1,
"license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github)",
"license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idlogisticsassistant made by Radezolid, idadminassistant by noctyrnal (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "idcargoassistant"
"name": "idlogisticsassistant"
},
{
"name": "idadminassistant"
Expand Down

0 comments on commit 1bd7705

Please sign in to comment.