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

The Great Loadout Reorganizing #1230

Merged
merged 29 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
bcc1267
aaaaaaaaaaaaa
VMSolidus Nov 16, 2024
0d32b31
AAAAAAAAAAAAAAAAAAA
VMSolidus Nov 16, 2024
24b82d8
Captain is done now
VMSolidus Nov 16, 2024
bb0eb44
HoP and Command Uncategorized done
VMSolidus Nov 16, 2024
80fe6d7
CE And Atmos Tech Done
VMSolidus Nov 16, 2024
a8e17ab
Engineering Done
VMSolidus Nov 16, 2024
b1dd5ea
aaaaaaaaaaaa
VMSolidus Nov 16, 2024
788401f
aaaaaaaaaaa
VMSolidus Nov 16, 2024
dcc4dd8
More Localizations
VMSolidus Nov 16, 2024
608b117
aaaaaaaaaa
VMSolidus Nov 16, 2024
329aafe
More category fixes
VMSolidus Nov 16, 2024
a75df80
Okay why the hell are my categories not working?
VMSolidus Nov 16, 2024
8fe5be7
More.
VMSolidus Nov 16, 2024
37380bf
Merge branch 'master' into More-Loadout-Bloat
VMSolidus Nov 17, 2024
cdd3b41
aaaaaaaaaaaaaaaaaaaaa
VMSolidus Nov 17, 2024
fc1f2a9
Merge branch 'More-Loadout-Bloat' of https://github.com/VMSolidus/Ein…
VMSolidus Nov 17, 2024
4fe5ce0
It just keeps going.
VMSolidus Nov 17, 2024
606889c
It goes ever onward.
VMSolidus Nov 17, 2024
6100b05
aaaaaaaaa
VMSolidus Nov 18, 2024
5616759
Alright that's it for the night.
VMSolidus Nov 18, 2024
3273dc3
MY FINGERS HURT
VMSolidus Nov 18, 2024
fbbe77d
SHOULD be done by now.
VMSolidus Nov 18, 2024
f26ed01
Stuff missing
VMSolidus Nov 18, 2024
f6affdd
More fixes.
VMSolidus Nov 18, 2024
95312b8
Why is it not nullable?...
VMSolidus Nov 18, 2024
0cba986
Update captain.yml
VMSolidus Nov 18, 2024
21fdfa5
More yml fixes
VMSolidus Nov 18, 2024
babc611
Last fixes
VMSolidus Nov 18, 2024
de90516
LMAO
VMSolidus Nov 18, 2024
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
72 changes: 62 additions & 10 deletions Resources/Locale/en-US/loadouts/categories.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,81 @@ loadout-category-Eyes = Eyes
loadout-category-Hands = Hands
loadout-category-Head = Head
loadout-category-Items = Items

# Jobs
loadout-category-Jobs = Jobs
loadout-category-JobsAUncategorized = Uncategorized
loadout-category-JobsCargo = Logistics

# Command
loadout-category-JobsCommand = Command
loadout-category-JobsCommandAUncategorized = Uncategorized
loadout-category-JobsCommandAUncategorized = All Command
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-JobsCommandRD = Mystagogue
loadout-category-JobsCommandHeadOfPersonnel = Head of Personnel

# Engineering
loadout-category-JobsEngineering = Engineering
loadout-category-JobsEngineeringAAUncategorized = All Engineers
loadout-category-JobsEngineeringAtmosphericTechnician = Atmospheric Technician
loadout-category-JobsEngineeringChiefEngineer = Chief Engineer
loadout-category-JobsEngineeringSeniorEngineer = Senior Engineer
loadout-category-JobsEngineeringStationEngineer = Station Engineer
loadout-category-JobsEngineeringTechnicalAssistant = Technical Assistant

# Epistemics
loadout-category-JobsEpistemics = Epistemics
loadout-category-JobsEpistemicsAAUncategorized = All Epistemiologists
loadout-category-JobsEpistemicsAcolyte = Acolyte
loadout-category-JobsEpistemicsCataloger = Cataloger
loadout-category-JobsEpistemicsChaplain = Chaplain
loadout-category-JobsEpistemicsGolemancer = Golemancer
loadout-category-JobsEpistemicsMystagogue = Mystagogue
loadout-category-JobsEpistemicsMystic = Mystic
loadout-category-JobsEpistemicsNoviciate = Noviciate
loadout-category-JobsEpistemicsPsionicMantis = Psionic Mantis

# Logistics
loadout-category-JobsLogistics = Logistics
loadout-category-JobsLogisticsAUncategorized = All Logistics
loadout-category-JobsLogisticsCargoTechnician = Cargo Technician
loadout-category-JobsLogisticsCourier = Courier
loadout-category-JobsLogisticsLogisticsOfficer = Logistics Officer
loadout-category-JobsLogisticsSalvageSpecialist = Salvage Specialist

# Medical
loadout-category-JobsMedical = Medical
loadout-category-JobsScience = Epistemics
loadout-category-JobsMedicalAUncategorized = All Medical
loadout-category-JobsMedicalChemist = Chemist
loadout-category-JobsMedicalChiefMedicalOfficer = Chief Medical Officer
loadout-category-JobsMedicalMedicalDoctor = Medical Doctor
loadout-category-JobsMedicalMedicalIntern = Medical Intern
loadout-category-JobsMedicalParamedic = Paramedic
loadout-category-JobsMedicalPsychologist = Psychologist
loadout-category-JobsMedicalSeniorPhysician = Senior Physician

# Security
loadout-category-JobsSecurity = Security
loadout-category-JobsSecurityAUncategorized = All Security
loadout-category-JobsSecurityCadet = Cadet
loadout-category-JobsSecurityCorpsman = Corpsman
loadout-category-JobsSecurityDetective = Detective
loadout-category-JobsSecurityHeadOfSecurity = Head of Security
loadout-category-JobsSecuritySecurityOfficer = Security Officer
loadout-category-JobsSecuritySeniorOfficer = Senior Officer
loadout-category-JobsSecurityWarden = Warden

# Service
loadout-category-JobsService = Service
loadout-category-JobsServiceUncategorized = Uncategorized
loadout-category-JobsServiceAUncategorized = All Service
loadout-category-JobsServiceBartender = Bartender
loadout-category-JobsServiceBotanist = Botanist
loadout-category-JobsServiceChef = Chef
loadout-category-JobsServiceClown = Clown
loadout-category-JobsServiceJanitor = Janitor
loadout-category-JobsServiceLawyer = Lawyer
loadout-category-JobsServiceMime = Mime
loadout-category-JobsServiceMusician = Musician
loadout-category-JobsServiceReporter = Reporter

loadout-category-Mask = Mask
loadout-category-Neck = Neck
loadout-category-Outer = Outer
Expand Down
774 changes: 724 additions & 50 deletions Resources/Locale/en-US/loadouts/itemgroups.ftl

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions Resources/Locale/en-US/loadouts/jobs/engineering.ftl

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
loadout-name-LoadoutEngineeringChickenSuit = eggmospheric technician suit
loadout-description-LoadoutEngineeringChickenSuit = For the Eggmos tech who always knows where home is...
loadout-description-LoadoutEngineeringUniformJumpskirtSenior = A skirt fit for the best of the best.
loadout-description-LoadoutEngineeringUniformJumpsuitSenior = A suit fit for the best of the best.
loadout-description-LoadoutEngineeringItemInflatable = A box containing inflatable walls and doors, for quickly patching up breaches.

loadout-name-LoadoutAtmosphericTechnicianBeltUtility = utility belt (empty)
loadout-name-LoadoutAtmosphericTechnicianBeltUtilityAtmos = utility belt (filled, Atmospheric Tools)
loadout-description-LoadoutAtmosphericTechnicianBeltUtilityAtmos =
This standard engineering belt includes a holofan emitter, as well as a gas analyzer instead of a multitool.

loadout-name-LoadoutChiefEngineerBelt = advanced utility belt (empty)
loadout-name-LoadoutChiefEngineerBeltFilled = advanced utility belt (filled)

loadout-name-LoadoutSeniorEngineerBeltUtility = utility belt (empty)
loadout-name-LoadoutSeniorEngineerBeltUtilityEngineering = utility belt (filled)
loadout-name-LoadoutSeniorEngineerBeltUtilityAtmos = utility belt (filled, Atmospheric Tools)
loadout-description-LoadoutSeniorEngineerBeltUtilityAtmos =
This standard engineering belt includes a holofan emitter, as well as a gas analyzer instead of a multitool.

loadout-name-LoadoutEngineeringBeltUtilityAtmos = utility belt (filled, Atmospheric Tools)

3 changes: 0 additions & 3 deletions Resources/Locale/en-US/loadouts/jobs/medical.ftl

This file was deleted.

19 changes: 19 additions & 0 deletions Resources/Locale/en-US/loadouts/jobs/medical/medical.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
loadout-description-LoadoutMedicalUniformJumpskirtSenior = A skirt fit for the best of the best.
loadout-description-LoadoutMedicalUniformJumpsuitSenior = A suit fit for the best of the best.
loadout-description-LoadoutMedicalHeadBeretSeniorPhysician = A beret fit for the best of the best.

loadout-name-LoadoutMedicalDoctorBeltMedical = medical belt (empty)
loadout-name-LoadoutMedicalDoctorBeltMedicalFilled = medical belt (filled)
loadout-name-LoadoutMedicalDoctorBeltMedicalAdvancedFilled = medical belt (filled, advanced)
loadout-description-LoadoutMedicalDoctorBeltMedicalAdvancedFilled =
The standard alotment of topical medicines in this pouch have been replaced with their advanced varieties, such as medicated sutures and regenerative mesh.

loadout-name-LoadoutChiefMedicalOfficerBeltMedical = medical belt (empty)
loadout-name-LoadoutChiefMedicalOfficerBeltMedicalAdvancedFilled = medical belt (filled, advanced)
loadout-description-LoadoutChiefMedicalOfficerBeltMedicalAdvancedFilled =
The standard alotment of topical medicines in this pouch have been replaced with their advanced varieties, such as medicated sutures and regenerative mesh.

loadout-name-LoadoutSeniorPhysicianBeltMedical = medical belt (empty)
loadout-name-LoadoutSeniorPhysicianBeltMedicalAdvancedFilled = medical belt (filled, advanced)
loadout-description-LoadoutSeniorPhysicianBeltMedicalAdvancedFilled =
The standard alotment of topical medicines in this pouch have been replaced with their advanced varieties, such as medicated sutures and regenerative mesh.
3 changes: 3 additions & 0 deletions Resources/Migrations/eeMigration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,6 @@ MailPAI: MailNFPAI
# 2024-08-27
Oracle: OracleSpawner
SophicScribe: SophicScribeSpawner

# 2024-11-16
GlassBoxLaser: null #Captain's Laser was moved to Loadouts.
34 changes: 34 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Items/belt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@
- id: Welder
- id: Multitool

- type: entity
id: ClothingBeltUtilityAtmos
parent: ClothingBeltUtility
suffix: Engineering
components:
- type: StorageFill
contents:
- id: Crowbar
- id: Wrench
- id: Screwdriver
- id: Wirecutter
- id: Welder
- id: Multitool
- id: GasAnalyzer
- id: HolofanProjector

- type: entity
id: ClothingBeltChiefEngineerFilled
parent: ClothingBeltChiefEngineer
Expand Down Expand Up @@ -83,6 +99,24 @@
- id: Gauze
- id: EmergencyMedipen #You never know what people are going to latejoin into

- type: entity
id: ClothingBeltMedicalAdvancedFilled
parent: ClothingBeltMedical
suffix: Filled
components:
- type: StorageFill
contents:
- id: MedicatedSuture
amount: 2
- id: RegenerativeMesh
amount: 1
- id: Bloodpack
amount: 1
- id: Gauze
- id: EmergencyMedipen
- id: BruteAutoInjector
- id: BurnAutoInjector

- type: entity
id: ClothingBeltMedicalEMTFilled
parent: ClothingBeltMedicalEMT
Expand Down
48 changes: 6 additions & 42 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,55 +32,38 @@
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorCaptainCarapace
- id: NukeDisk
- id: PinpointerNuclear
# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system
- id: CaptainIDCard
- id: ClothingOuterHardsuitCap
- id: WeaponDisabler
- id: CommsComputerCircuitboard
- id: ClothingHeadsetAltCommand
- id: SpaceCash1000
- id: PlushieNuke
prob: 0.1
- id: CigarGoldCase
prob: 0.25
- id: ClothingBeltSheathFilled
- id: DoorRemoteCommand
- id: RubberStampCaptain
# - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box
- id: JetpackCaptainFilled
- id: MedalCase
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3

- type: entity
id: LockerCaptainFilled
suffix: Filled, AntiqueLaser
suffix: Filled, AntiqueLaser # Deprecated, Antique laser is now part of Captain's Loadouts.
parent: LockerCaptain
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorCaptainCarapace
- id: NukeDisk
- id: PinpointerNuclear
# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system
- id: WeaponDisabler
- id: CaptainIDCard
- id: CommsComputerCircuitboard
- id: ClothingHeadsetAltCommand
- id: SpaceCash1000
- id: PlushieNuke
prob: 0.1
- id: CigarGoldCase
prob: 0.25
- id: ClothingBeltSheathFilled
- id: DoorRemoteCommand
- id: RubberStampCaptain
- id: WeaponAntiqueLaser
- id: JetpackCaptainFilled
- id: MedalCase
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
- id: LunchboxCommandFilledRandom
prob: 0.3

- type: entity
Expand All @@ -90,25 +73,17 @@
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorCaptainCarapace
- id: NukeDisk
- id: PinpointerNuclear
# - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat.
- id: WeaponDisabler
- id: CaptainIDCard
- id: CommsComputerCircuitboard
- id: ClothingHeadsetAltCommand
- id: SpaceCash1000
- id: PlushieNuke
prob: 0.1
- id: CigarGoldCase
prob: 0.25
- id: ClothingBeltSheathFilled
- id: DoorRemoteCommand
- id: RubberStampCaptain
- id: JetpackCaptainFilled
- id: MedalCase
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
- id: LunchboxCommandFilledRandom
prob: 0.3

- type: entity
Expand All @@ -124,23 +99,13 @@
- id: BoxID
- id: BoxHeadset
- id: IDComputerCircuitboard
- id: WeaponDisabler
- id: ClothingOuterCoatHoPArmored # DeltaV
- id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite
- id: CigarGoldCase
prob: 0.25
# Fuck the HoP they don't deserve fucking cigars.
# Yes they do fuck you.
- id: DoorRemoteService
- id: ClothingNeckGoldmedal
- id: RubberStampHop
- id: RubberStampDenied
- id: RubberStampApproved
- id: BoxEncryptionKeyPassenger
- id: BoxEncryptionKeyService
- id: AccessConfigurator
- id: BookIanDossier # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml
- id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP.
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3

Expand All @@ -154,7 +119,6 @@
- id: ClothingOuterHardsuitEngineeringWhite
- id: ClothingMaskBreath
- id: ClothingEyesGlassesMeson
- id: ClothingBeltChiefEngineerFilled
- id: ClothingShoesBootsMagAdv
- id: ClothingHandsGlovesColorYellow
- id: CigarCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
- type: loadout
id: LoadoutBackpackSatchel
- type: loadout
id: LoadoutBackpackClown
id: LoadoutItemBackpackSatchelLeather
- type: loadout
id: LoadoutBackpackMerc
Loading
Loading