Skip to content

Commit

Permalink
more renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
DEATHB4DEFEAT committed Nov 17, 2024
1 parent aa8d11e commit bf06cb3
Show file tree
Hide file tree
Showing 48 changed files with 90 additions and 97 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"fileMatch": [ "**/meta.json" ],
"url": "https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/.github/rsi-schema.json"
}
]
],
"git.ignoreLimitWarning": true
}
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/cargo/bounties.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,6 @@ bounty-description-hi-viz-vest = The clown stole the AME controller and won't b
bounty-description-torch = The chef made all the monkeys and kobolds at once, and they rebelled and took over the cargo shuttle. They're demanding supplies and free passage to a jungle planet, and we're giving in to their demands. All they need now is a few torches.
bounty-description-medkit-box = CentComm is putting on a play set in a hospital, and needs some props. Just send us some empty medkit boxes, and the show will go on!
bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premiering tomorrow, and the costuming team is woefully unprepared. Send us some boxes to work with.
bounty-description-wine = The new cataloger and the Logistics Officer are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
bounty-description-wine = The new cataloger and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well.
bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed.
bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/deltav/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve
job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment.
job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed.
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-courier = Deliver mail and other packages from and to Cargo. Avoid dogs.
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/guidebook/guides.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ guide-entry-rtg = RTG
guide-entry-controls = Controls
guide-entry-radio = Radio
guide-entry-jobs = Jobs
guide-entry-cargo = Logistics
guide-entry-cargo = Cargo
guide-entry-cargo-bounties = Cargo Bounties
guide-entry-salvage = Salvage
guide-entry-survival = Survival
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/headset/headset-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chat-radio-medical = Medical
chat-radio-science = Epistemics
chat-radio-security = Security
chat-radio-service = Service
chat-radio-supply = Logistics
chat-radio-supply = Cargo
chat-radio-syndicate = Syndicate
chat-radio-freelance = Freelance
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ job-description-mime = Entertain the crew through non-vocal means, and engage wi
job-description-musician = Entertain the crew with your unique musical talent, and acquire new instruments to mess around with.
job-description-passenger = Enjoy your stay aboard the station with no obligations!
job-description-psychologist = Provide emotional support to traumatized crew.
job-description-qm = Manage the supplies of the station & the logistics department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
job-description-qm = Manage the supplies of the station & the Cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
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.
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ job-name-botanist = Botanist
job-name-bartender = Bartender
job-name-passenger = Passenger
job-name-salvagespec = Salvage specialist
job-name-qm = Logistics Officer
job-name-qm = Quartermaster
job-name-cargotech = Cargo Technician
job-name-chef = Chef
job-name-clown = Clown
Expand Down Expand Up @@ -85,7 +85,7 @@ JobMusician = Musician
JobParamedic = Paramedic
JobPassenger = Passenger
JobPsychologist = Psychologist
JobQuartermaster = Logistics Officer
JobQuartermaster = QuarterMaster
JobReporter = Reporter
JobResearchAssistant = Noviciate
JobResearchDirector = Mystagogue
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ job-supervisors-hos = the head of security
job-supervisors-ce = the chief engineer
job-supervisors-cmo = the chief medical officer
job-supervisors-rd = the mystagogue
job-supervisors-qm = the logistics officer
job-supervisors-qm = the quartermaster
job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
job-supervisors-medicine = medical doctors, chemists, and the chief medical officer
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/loadouts/categories.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ loadout-category-Head = Head
loadout-category-Items = Items
loadout-category-Jobs = Jobs
loadout-category-JobsAUncategorized = Uncategorized
loadout-category-JobsCargo = Logistics
loadout-category-JobsCargo = Cargo
loadout-category-JobsCommand = Command
loadout-category-JobsCommandAUncategorized = Uncategorized
loadout-category-JobsCommandCaptain = Captain
loadout-category-JobsCommandCE = Chief Engineer
loadout-category-JobsCommandCMO = Chief Medical Officer
loadout-category-JobsCommandHOP = Head of Personnel
loadout-category-JobsCommandHOS = Head of Security
loadout-category-JobsCommandQM = Logistics Officer
loadout-category-JobsCommandQM = Quartermaster
loadout-category-JobsCommandRD = Mystagogue
loadout-category-JobsEngineering = Engineering
loadout-category-JobsMedical = Medical
Expand Down
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/loadouts/itemgroups.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ character-item-group-LoadoutBoxKits = Survival Kits
character-item-group-LoadoutWritables = Writing Tools
# Cargo
character-item-group-LoadoutNeckCargo = Logistics Neckwear
character-item-group-LoadoutOuterCargo = Logistics Outerwear
character-item-group-LoadoutShoesCargo = Logistics Shoes
character-item-group-LoadoutNeckCargo = Cargo Neckwear
character-item-group-LoadoutOuterCargo = Cargo Outerwear
character-item-group-LoadoutShoesCargo = Cargo Shoes
# Engineering
character-item-group-LoadoutEyesEngineering = Engineering Eyewear
Expand Down
8 changes: 4 additions & 4 deletions Resources/Locale/en-US/mail/mail.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/
mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive.
mail-unlocked = Anti-tamper system unlocked.
mail-unlocked-by-emag = Anti-tamper system *BZZT*.
mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to logistics' account.
mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-penalty-fragile = INTEGRITY COMPROMISED. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-penalty-expired = DELIVERY PAST DUE. LOGISTICS BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to cargo's account.
mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. CARGO BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-penalty-fragile = INTEGRITY COMPROMISED. CARGO BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-penalty-expired = DELIVERY PAST DUE. CARGO BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
mail-item-name-unaddressed = mail
mail-item-name-addressed = mail ({$recipient})
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stamp-component-stamped-name-denied = DENIED
stamp-component-stamped-name-approved = APPROVED
stamp-component-stamped-name-hop = Head of Personnel
stamp-component-stamped-name-hos = Head of Security
stamp-component-stamped-name-qm = Logistics Officer
stamp-component-stamped-name-qm = Quartermaster
stamp-component-stamped-name-rd = Mystagogue
stamp-component-stamped-name-warden = Warden
stamp-component-stamped-name-trader = Trader
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ id-card-access-level-chemistry = Chemistry
id-card-access-level-paramedic = Paramedic
id-card-access-level-psychologist = Psychologist
id-card-access-level-quartermaster = Logistics Officer
id-card-access-level-cargo = Logistics
id-card-access-level-quartermaster = Quartermaster
id-card-access-level-cargo = Cargo
id-card-access-level-salvage = Salvage
id-card-access-level-bar = Bar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ent-ClothingHeadHelmetHardsuitCombatAdvanced = FPA-99 helmet
ent-ClothingHeadHelmetHardsuitCombatHoS = FPA-99s helmet
.desc = { ent-ClothingHeadHelmetHardsuitCombatAdvanced.desc }
ent-ClothingHeadHelmetHardsuitLuxury = HpI-20c helmet
.desc = A modified helmet for the Minos hardsuit, fashioned after the Logistics Officer's colors. It's been modified for greater mobility at the expense of physical trauma protection.
.desc = A modified helmet for the Minos hardsuit, fashioned after the Quartermaster's colors. It's been modified for greater mobility at the expense of physical trauma protection.
ent-ClothingHeadHelmetHardsuitSyndie = CSA-51a helmet
.desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blood red.
ent-ClothingHeadHelmetHardsuitSyndieReverseEngineered = CSA-51a helmet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ent-ClothingOuterHardsuitCombatHoS = FPA-99s - "Dayicin Mk.II" tacsuit
.desc = A top-of-the-line tactical combat hardsuit produced by Five-Points-Armory, painted with the colors of station security.
The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light.
ent-ClothingOuterHardsuitLuxury = HpI-20c - "Minos" hardsuit
.desc = A modified mining hardsuit from Hephaestus Industries, fashioned after the Logistics Officer's colors.
.desc = A modified mining hardsuit from Hephaestus Industries, fashioned after the Quartermaster's colors.
The labels indicate that it provides slight protection against most forms of damage. It feels incredibly light.
ent-ClothingOuterHardsuitSyndie = CSA-51a - "Shanlin" tacsuit
.desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
Expand Down Expand Up @@ -133,4 +133,4 @@ ent-ClothingOuterHardsuitClown = clown vacsuit
ent-ClothingOuterHardsuitMime = mime vacsuit
.desc = A custom-made mime vacsuit. On closer inspection, it appears to be a normal vacsuit with suspenders and paint applied on top.
ent-ClothingOuterHardsuitSanta = DNK-31 "Jolly" hardsuit
.desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.
.desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/station-events/events/cargo-gifts.ftl
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cargo-gifts-event-announcement = Congratulations! { $sender } has decided to send { $description } to the station { $dest }. Look for it in your next cargo shipment.
cargo-gift-default-description = A bundle of gifts
cargo-gift-default-sender = NanoTrasen
cargo-gift-default-dest = Logistics Dept.
cargo-gift-default-dest = Cargo Dept.
cargo-gift-dest-bar = bar
cargo-gift-dest-eng = Engineering Dept
cargo-gift-dest-supp = Logistics Dept
cargo-gift-dest-supp = Cargo Dept
cargo-gift-dest-janitor = Service Dept
cargo-gift-dest-med = Medical Dept
cargo-gift-dest-sec = Security Dept
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
category: cargoproduct-category-name-hardsuits
group: market

# Logistics
# Cargo
- type: cargoProduct
id: LogisticsKritiHardsuit
id: CargoKritiHardsuit
icon:
sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
state: icon
product: CrateLogisticsKritiHardsuit
product: CrateCargoKritiHardsuit
cost: 1250
category: cargoproduct-category-name-hardsuits
group: market

- type: cargoProduct
id: LogisticsLavrionHardsuit
id: CargoLavrionHardsuit
icon:
sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
state: icon
product: CrateLogisticsLavrionHardsuit
product: CrateCargoLavrionHardsuit
cost: 3500
category: cargoproduct-category-name-hardsuits
group: market
Expand Down
4 changes: 1 addition & 3 deletions Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
id: CrateCargoLuxuryHardsuit
parent: CratePirate
name: luxury mining hardsuit crate
# DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
description: Finally, a hardsuit the Logistics Officer could call their own. Centcomm has heard you, now stop asking.
# End of modified code
description: Finally, a hardsuit the Quartermaster could call their own. Centcomm has heard you, now stop asking.
components:
- type: StorageFill
contents:
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Crates/hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
contents:
- id: ClothingOuterHardsuitAtmos

# Logistics
# Cargo
- type: entity
id: CrateLogisticsKritiHardsuit
id: CrateCargoKritiHardsuit
parent: CrateGenericSteel
name: kriti hardsuit crate
description: Contains a single HpI-20s "Kriti" hardsuit.
Expand All @@ -31,7 +31,7 @@
- id: ClothingOuterHardsuitSpatio

- type: entity
id: CrateLogisticsLavrionHardsuit
id: CrateCargoLavrionHardsuit
parent: CrateGenericSteel
name: lavrion hardsuit crate
description: Contains a single HpI-20a "Lavrion" hardsuit.
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
prob: 0.3
- id: ClothingNeckSalvager # DeltaV - salvage cloak
prob: 0.2
- id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
- id: LunchboxCargoFilledRandom # DeltaV - Lunchboxes!
prob: 0.3

- type: entity
Expand Down Expand Up @@ -56,5 +56,5 @@
prob: 0.3
- id: ClothingNeckSalvager # DeltaV - salvage cloak
prob: 0.2
- id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
prob: 0.3
- id: LunchboxCargoFilledRandom # DeltaV - Lunchboxes!
prob: 0.3
4 changes: 1 addition & 3 deletions Resources/Prototypes/Datasets/ion_storm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,7 @@
- NON-CREW
- PARAMEDICS
- PASSENGERS
# DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
- LOGISTICS OFFICERS
# End of modified code
- CARGO TECHNICIANS
# DeltaV - Epistemics Department - Replace Research Director with Mystagogue
- MYSTAGOGUES
# End of modified code
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@
- type: WarpPoint
location: Epistemics

#Logistics
#Cargo
- type: entity
id: WarpPointLogistics
id: WarpPointCargo
parent: WarpPoint
suffix: Logistics
suffix: Cargo
components:
- type: WarpPoint
location: Logistics
location: Cargo

- type: entity
id: WarpPointSalvage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@

- type: entity
parent: LunchboxGeneric
id: LunchboxLogistics
suffix: Logistics
id: LunchboxCargo
suffix: Cargo
components:
- type: Sprite
layers:
Expand All @@ -295,8 +295,8 @@

- type: entity
parent: LunchboxGenericFilledRandom
id: LunchboxLogisticsFilledRandom
suffix: Logistics, Filled, Random
id: LunchboxCargoFilledRandom
suffix: Cargo, Filled, Random
components:
- type: Sprite
layers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
- type: NavMapBeacon
text: station-beacon-forensic-mantis

#Logistics
#Cargo
- type: entity
parent: DefaultStationBeaconSupply
id: DefaultStationBeaconMailroom
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Objectives/traitor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity # Logistics Officer steal objective.
- type: entity # Quartermaster steal objective.
noSpawn: true
parent: BaseTraitorStealObjective
id: LOLuckyBillStealObjective
Expand Down
6 changes: 2 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretQM
# DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
name: logistics officer's beret
description: A beret with the logistics department's insignia emblazoned on it. For logistics officers that are more inclined towards style.
# End of modified code
name: quartermaster's beret
description: A beret with the Cargo department's insignia emblazoned on it. For Quartermasters that are more inclined towards style.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_qm.rsi
Expand Down
6 changes: 2 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -686,10 +686,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitQMFormal
# DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
name: logistics officer's formal suit
description: Inspired by the logistics officers of military's past, the perfect outfit for supplying a formal occasion.
# End of modified code
name: quartermaster's formal suit
description: Inspired by the Quartermaster of military's past, the perfect outfit for supplying a formal occasion.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,10 @@
- MailMetricsCartridge

- type: entity
name: LO special PDA unit # DeltaV - Logistics Department replacing Cargo
name: QM special PDA unit
parent: BasePDA
id: QuartermasterNTPDA
description: PDA for the guy that directs logistics.it says in gold "special unit unique to the best logistics officer in the sector". # DeltaV - Logistics Department replacing Cargo
description: PDA for the guy that directs Cargo. It says in gold "special unit unique to the best Quartermaster in the sector".
components:
- type: Pda
id: QuartermasterIDCard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,19 +351,19 @@
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconSupply
suffix: Logistics #Delta V - Renamed
suffix: Cargo
components:
- type: NavMapBeacon
defaultText: station-beacon-logistics #Delta V - Renamed
defaultText: station-beacon-cargo
color: "#A46106"

- type: entity
parent: DefaultStationBeaconSupply
id: DefaultStationBeaconCargoReception
suffix: Logistics Reception #Delta V - Renamed
suffix: Cargo Reception
components:
- type: NavMapBeacon
defaultText: station-beacon-logistics-reception #Delta V - Renamed
defaultText: station-beacon-cargo-lobby

- type: entity
parent: DefaultStationBeaconSupply
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: entity
id: CargoPallet
name: cargo pallet
description: Common fixture of logistics and cargo. Subtle reminder where crates go during transport to avoid bruised shins.
description: Common fixture of Cargo. Subtle reminder where crates go during transport to avoid bruised shins.
parent: BaseStructure
components:
- type: InteractionOutline
Expand Down
Loading

0 comments on commit bf06cb3

Please sign in to comment.