From 12621627dfbbff404e613995245ec553801966c4 Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Mon, 3 Jun 2024 19:52:15 -0400 Subject: [PATCH] :trollface: --- .../Tests/Roles/StartingGearStorageTests.cs | 2 +- .../Station/Systems/StationSpawningSystem.cs | 15 +- .../Station/SharedStationSpawningSystem.cs | 20 +- .../en-US/preferences/loadout-groups.ftl | 20 - Resources/Migrations/migration.yml | 8 +- .../Fills/Backpacks/StarterGear/backpack.yml | 422 ------------------ .../Fills/Backpacks/StarterGear/duffelbag.yml | 275 ------------ .../Fills/Backpacks/StarterGear/satchel.yml | 300 ------------- .../Catalog/Fills/Backpacks/duffelbag.yml | 49 -- .../Entities/Clothing/Back/backpacks.yml | 10 + .../Prototypes/Entities/Mobs/NPCs/human.yml | 2 +- .../Loadouts/Jobs/Cargo/cargo_technician.yml | 6 +- .../Loadouts/Jobs/Cargo/quartermaster.yml | 34 +- .../Jobs/Cargo/salvage_specialist.yml | 10 +- .../Loadouts/Jobs/Civilian/botanist.yml | 6 +- .../Loadouts/Jobs/Civilian/chaplain.yml | 28 -- .../Loadouts/Jobs/Civilian/clown.yml | 6 +- .../Loadouts/Jobs/Civilian/mime.yml | 6 +- .../Loadouts/Jobs/Civilian/musician.yml | 28 -- .../Loadouts/Jobs/Civilian/passenger.yml | 38 +- .../Loadouts/Jobs/Command/captain.yml | 6 +- .../Jobs/Command/head_of_personnel.yml | 29 +- .../Engineering/atmospheric_technician.yml | 6 +- .../Jobs/Engineering/chief_engineer.yml | 28 -- .../Jobs/Engineering/station_engineer.yml | 6 +- .../Loadouts/Jobs/Medical/chemist.yml | 30 +- .../Jobs/Medical/chief_medical_officer.yml | 32 -- .../Loadouts/Jobs/Medical/medical_doctor.yml | 10 +- .../Loadouts/Jobs/Medical/paramedic.yml | 32 -- .../Jobs/Science/research_director.yml | 38 +- .../Loadouts/Jobs/Science/scientist.yml | 6 +- .../Loadouts/Jobs/Security/detective.yml | 28 -- .../Jobs/Security/head_of_security.yml | 10 +- .../Jobs/Security/security_officer.yml | 22 +- .../Loadouts/Miscellaneous/glasses.yml | 4 - .../Prototypes/Loadouts/loadout_groups.yml | 82 +--- .../Prototypes/Loadouts/role_loadouts.yml | 16 +- .../Loadouts/Jobs/Cargo/mail_carrier.yml | 20 +- .../Jobs/Epistemics/forensicmantis.yml | 60 +-- .../Loadouts/Jobs/Security/prisonguard.yml | 12 +- .../Loadouts/Jobs/Wildcards/gladiator.yml | 12 +- .../Loadouts/Jobs/Wildcards/martialartist.yml | 18 +- .../Loadouts/Jobs/Wildcards/prisoner.yml | 12 +- Resources/Prototypes/Roles/Antags/pirate.yml | 16 +- .../Prototypes/Roles/Antags/revolutionary.yml | 7 + Resources/Prototypes/Roles/Antags/traitor.yml | 6 + .../Roles/Jobs/Civilian/assistant.yml | 3 + .../Roles/Jobs/Civilian/bartender.yml | 3 + .../Roles/Jobs/Civilian/botanist.yml | 3 + .../Roles/Jobs/Civilian/chaplain.yml | 4 + .../Prototypes/Roles/Jobs/Civilian/chef.yml | 3 + .../Prototypes/Roles/Jobs/Civilian/clown.yml | 4 + .../Roles/Jobs/Civilian/janitor.yml | 3 + .../Roles/Jobs/Civilian/librarian.yml | 4 + .../Prototypes/Roles/Jobs/Civilian/mime.yml | 4 + .../Roles/Jobs/Civilian/musician.yml | 3 - .../Roles/Jobs/Civilian/service_worker.yml | 3 + .../Prototypes/Roles/Jobs/Command/captain.yml | 5 + .../Roles/Jobs/Command/head_of_personnel.yml | 4 + .../Engineering/atmospheric_technician.yml | 3 + .../Roles/Jobs/Engineering/chief_engineer.yml | 4 + .../Jobs/Engineering/station_engineer.yml | 3 + .../Roles/Jobs/Fun/cult_startinggear.yml | 10 +- .../Roles/Jobs/Fun/wizard_startinggear.yml | 22 +- .../Jobs/Medical/chief_medical_officer.yml | 4 + .../Roles/Jobs/Medical/medical_doctor.yml | 3 + .../Roles/Jobs/Medical/paramedic.yml | 4 +- .../Roles/Jobs/Science/research_assistant.yml | 3 + .../Roles/Jobs/Science/research_director.yml | 3 + .../Roles/Jobs/Science/scientist.yml | 4 +- .../Roles/Jobs/Security/detective.yml | 6 + .../Roles/Jobs/Security/head_of_security.yml | 4 + .../Roles/Jobs/Security/security_cadet.yml | 4 + .../Roles/Jobs/Security/security_officer.yml | 4 + .../Prototypes/Roles/Jobs/Security/warden.yml | 4 + .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 3 + .../Roles/Jobs/Wildcards/reporter.yml | 3 + .../Roles/Jobs/Wildcards/zookeeper.yml | 3 + 78 files changed, 244 insertions(+), 1729 deletions(-) delete mode 100644 Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml delete mode 100644 Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml delete mode 100644 Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml diff --git a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs index f8060edb2b..0f15a02eaa 100644 --- a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs +++ b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs @@ -35,7 +35,7 @@ public sealed class StartingGearPrototypeStorageTest { foreach (var gearProto in protos) { - var backpackProto = ((IEquipmentLoadout) gearProto).GetGear("back"); + var backpackProto = gearProto.GetGear("back"); if (backpackProto == string.Empty) continue; diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 3170151e05..1e18354751 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -191,13 +191,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem profile = HumanoidCharacterProfile.RandomWithSpecies(speciesId); } - if (prototype?.StartingGear != null) - { - var startingGear = _prototypeManager.Index(prototype.StartingGear); - EquipStartingGear(entity.Value, startingGear, raiseEvent: false); - } - - // Run loadouts after so stuff like storage loadouts can get var jobLoadout = LoadoutSystem.GetJobPrototype(prototype?.ID); if (_prototypeManager.TryIndex(jobLoadout, out RoleLoadoutPrototype? roleProto)) @@ -215,6 +208,12 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem EquipRoleLoadout(entity.Value, loadout, roleProto); } + if (prototype?.StartingGear != null) + { + var startingGear = _prototypeManager.Index(prototype.StartingGear); + EquipStartingGear(entity.Value, startingGear, raiseEvent: false); + } + var gearEquippedEv = new StartingGearEquippedEvent(entity.Value); RaiseLocalEvent(entity.Value, ref gearEquippedEv); @@ -330,4 +329,4 @@ public sealed class PlayerSpawningEvent : EntityEventArgs Station = station; DesiredSpawnPointType = spawnPointType; } -} +} \ No newline at end of file diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index 0f78216044..8d960ca448 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -15,9 +15,9 @@ public abstract class SharedStationSpawningSystem : EntitySystem { [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; [Dependency] protected readonly InventorySystem InventorySystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; + [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private readonly SharedStorageSystem _storage = default!; + [Dependency] private readonly SharedTransformSystem _xformSystem = default!; private EntityQuery _handsQuery; private EntityQuery _inventoryQuery; @@ -98,7 +98,7 @@ public abstract class SharedStationSpawningSystem : EntitySystem if (!string.IsNullOrEmpty(equipmentStr)) { var equipmentEntity = EntityManager.SpawnEntity(equipmentStr, xform.Coordinates); - InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force:true); + InventorySystem.TryEquip(entity, equipmentEntity, slot.Name, silent: true, force: true); } } } @@ -129,15 +129,15 @@ public abstract class SharedStationSpawningSystem : EntitySystem if (entProtos.Count == 0) continue; - foreach (var ent in entProtos) - { - ents.Add(Spawn(ent, coords)); - } - if (inventoryComp != null && InventorySystem.TryGetSlotEntity(entity, slot, out var slotEnt, inventoryComponent: inventoryComp) && _storageQuery.TryComp(slotEnt, out var storage)) { + foreach (var ent in entProtos) + { + ents.Add(Spawn(ent, coords)); + } + foreach (var ent in ents) { _storage.Insert(slotEnt.Value, ent, out _, storageComp: storage, playSound: false); @@ -152,4 +152,4 @@ public abstract class SharedStationSpawningSystem : EntitySystem RaiseLocalEvent(entity, ref ev); } } -} +} \ No newline at end of file diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 5592fcc6ba..181d43803d 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -7,16 +7,6 @@ loadout-group-glasses = Glasses loadout-group-backpack = Backpack loadout-group-instruments = Instruments -loadout-group-survival-basic = Survival Box -loadout-group-survival-extended = Extended Survival Box -loadout-group-survival-clown = Clown Survival Box -loadout-group-survival-medical = Medical Survival Box -loadout-group-survival-security = Security Survival Box -loadout-group-survival-syndicate = Github is forcing me to write text that is literally twice-impossible for the player to ever see, send help -loadout-group-breath-tool = Species-dependent breath tools -loadout-group-tank-harness = Species-specific survival equipment -loadout-group-EVA-tank = Species-specific gas tank - # Command loadout-group-captain-head = Captain head loadout-group-captain-jumpsuit = Captain jumpsuit @@ -34,7 +24,6 @@ loadout-group-hop-outerclothing = Head of Personnel outer clothing loadout-group-passenger-jumpsuit = Passenger jumpsuit loadout-group-passenger-mask = Passenger mask loadout-group-passenger-gloves = Passenger gloves -loadout-group-passenger-backpack = Passenger backpack loadout-group-passenger-outerclothing = Passenger outer clothing loadout-group-passenger-shoes = Passenger shoes @@ -51,12 +40,10 @@ loadout-group-librarian-jumpsuit = Librarian jumpsuit loadout-group-lawyer-jumpsuit = Lawyer jumpsuit loadout-group-lawyer-neck = Lawyer neck -loadout-group-lawyer-backpack = Lawyer backpack loadout-group-chaplain-head = Chaplain head loadout-group-chaplain-mask = Chaplain mask loadout-group-chaplain-jumpsuit = Chaplain jumpsuit -loadout-group-chaplain-backpack = Chaplain backpack loadout-group-chaplain-outerclothing = Chaplain outer clothing loadout-group-chaplain-neck = Chaplain neck @@ -83,14 +70,12 @@ loadout-group-mime-jumpsuit = Mime jumpsuit loadout-group-mime-backpack = Mime backpack loadout-group-mime-outerclothing = Mime outer clothing -loadout-group-musician-backpack = Musician backpack loadout-group-musician-jumpsuit = Musician jumpsuit loadout-group-musician-outerclothing = Musician outer clothing # Cargo loadout-group-quartermaster-head = Logistics Officer head loadout-group-quartermaster-jumpsuit = Logistics Officer jumpsuit -loadout-group-quartermaster-backpack = Logistics Officer backpack loadout-group-quartermaster-neck = Logistics Officer neck loadout-group-quartermaster-outerclothing = Logistics Officer outer clothing loadout-group-quartermaster-shoes = Logistics Officer shoes @@ -108,7 +93,6 @@ loadout-group-salvage-specialist-shoes = Salvage Specialist shoes # Engineering loadout-group-chief-engineer-head = Chief Engineer head loadout-group-chief-engineer-jumpsuit = Chief Engineer jumpsuit -loadout-group-chief-engineer-backpack = Chief Engineer backpack loadout-group-chief-engineer-outerclothing = Chief Engineer outer clothing loadout-group-chief-engineer-neck = Chief Engineer neck loadout-group-chief-engineer-shoes = Chief Engineer shoes @@ -131,7 +115,6 @@ loadout-group-atmospheric-technician-shoes = Atmospheric Technician shoes loadout-group-research-director-head = Mystagogue head loadout-group-research-director-neck = Mystagogue neck loadout-group-research-director-jumpsuit = Mystagogue jumpsuit -loadout-group-research-director-backpack = Mystagogue backpack loadout-group-research-director-outerclothing = Mystagogue outer clothing loadout-group-research-director-shoes = Mystagogue shoes @@ -167,7 +150,6 @@ loadout-group-security-id = Security ID loadout-group-detective-head = Detective head loadout-group-detective-neck = Detective neck loadout-group-detective-jumpsuit = Detective jumpsuit -loadout-group-detective-backpack = Detective backpack loadout-group-detective-outerclothing = Detective outer clothing loadout-group-security-cadet-jumpsuit = Security cadet jumpsuit @@ -179,7 +161,6 @@ loadout-group-medical-mask = Medical mask loadout-group-chief-medical-officer-head = Chief Medical Officer head loadout-group-chief-medical-officer-jumpsuit = Chief Medical Officer jumpsuit loadout-group-chief-medical-officer-outerclothing = Chief Medical Officer outer clothing -loadout-group-chief-medical-officer-backpack = Chief Medical Officer backpack loadout-group-chief-medical-officer-shoes = Chief Medical Officer shoes loadout-group-chief-medical-officer-neck = Chief Medical Officer neck @@ -200,7 +181,6 @@ loadout-group-paramedic-head = Paramedic head loadout-group-paramedic-jumpsuit = Paramedic jumpsuit loadout-group-paramedic-outerclothing = Paramedic outer clothing loadout-group-paramedic-shoes = Paramedic shoes -loadout-group-paramedic-backpack = Paramedic backpack # Wildcards loadout-group-reporter-jumpsuit = Reporter jumpsuit diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 85e1034bb1..1b85698b6e 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -237,12 +237,12 @@ AirlockExternalGlassEasyPryLocked: AirlockExternalGlassLocked AirlockGlassShuttleEasyPryLocked: AirlockExternalGlassShuttleLocked AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked -#2024-03-10 -#ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective -#ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective -#ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective +# 2024-03-10 FoodChili: FoodChiliPepper FoodChilly: FoodChillyPepper +# ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective +# ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective +# ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective # 2024-03-11 ImprovisedExplosive: FireBomb diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml deleted file mode 100644 index 749818310e..0000000000 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ /dev/null @@ -1,422 +0,0 @@ -- type: entity - parent: ClothingBackpack - id: ClothingBackpackFilled - noSpawn: true - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackClown - id: ClothingBackpackClownFilled - components: - - type: StorageFill - contents: - - id: BoxHug - - id: RubberStampClown - - id: CrayonRainbow - -- type: entity - noSpawn: true - parent: ClothingBackpackSecurity - id: ClothingBackpackSecurityFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash -# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag - -- type: entity - noSpawn: true - parent: ClothingBackpackSecurity - id: ClothingBackpackSecurityFilledDetective - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: ForensicPad - - id: ForensicScanner - -- type: entity - noSpawn: true - parent: ClothingBackpackMedical - id: ClothingBackpackMedicalFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - -- type: entity - noSpawn: true - parent: ClothingBackpackMedical - id: ClothingBackpackParamedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: EmergencyRollerBedSpawnFolded - -- type: entity - noSpawn: true - parent: ClothingBackpackCaptain - id: ClothingBackpackCaptainFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- name: StationCharter - #- name: TelescopicBaton -- type: entity - noSpawn: true - parent: ClothingBackpackEngineering - id: ClothingBackpackChiefEngineerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackScience - id: ClothingBackpackResearchDirectorFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackHOPFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackIan - id: ClothingBackpackHOPIanFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackMedical - id: ClothingBackpackCMOFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackCargo - id: ClothingBackpackQuartermasterFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackSecurity - id: ClothingBackpackHOSFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: MagazinePistol - -- type: entity - noSpawn: true - parent: ClothingBackpackEngineering - id: ClothingBackpackEngineeringFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - -- type: entity - noSpawn: true - parent: ClothingBackpackAtmospherics - id: ClothingBackpackAtmosphericsFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - -- type: entity - noSpawn: true - parent: ClothingBackpackScience - id: ClothingBackpackScienceFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackHydroponics - id: ClothingBackpackHydroponicsFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackMime - id: ClothingBackpackMimeFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampMime - -- type: entity - noSpawn: true - parent: ClothingBackpackChemistry - id: ClothingBackpackChemistryFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackChaplainFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Bible - - id: RubberStampChaplain - -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackLawyerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampLawyer - -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackMusicianFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: AcousticGuitarInstrument - - id: SaxophoneInstrument - -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackLibrarianFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: BookRandom - -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackDetectiveFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Lighter - - id: CigPackBlack - - id: HandLabeler - - id: BoxForensicPad - -# ERT - -- type: entity - noSpawn: true - parent: ClothingBackpackERTLeader - id: ClothingBackpackERTLeaderFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: WeaponDisabler - - id: MedicatedSuture - - id: RegenerativeMesh - - id: BoxZiptie - - id: CrowbarRed - - id: MagazineMagnum - -- type: entity - noSpawn: true - parent: ClothingBackpackERTSecurity - id: ClothingBackpackERTSecurityFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: WeaponDisabler - - id: MedicatedSuture - - id: RegenerativeMesh - - id: BoxZiptie - - id: CrowbarRed - - id: MagazinePistol - -- type: entity - noSpawn: true - parent: ClothingBackpackERTMedical - id: ClothingBackpackERTMedicalFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: Hypospray - - id: MedkitAdvancedFilled - - id: CrowbarRed - - id: OmnizineChemistryBottle - - id: EpinephrineChemistryBottle - - id: EpinephrineChemistryBottle - -- type: entity - noSpawn: true - parent: ClothingBackpackERTEngineer - id: ClothingBackpackERTEngineerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: trayScanner - - id: RCD - - id: RCDAmmo - amount: 2 - - id: CableMVStack - - id: CableHVStack - - id: CableApcStack - - id: SheetPlasteel - - id: SheetSteel - - id: SheetGlass - -- type: entity - noSpawn: true - parent: ClothingBackpackERTJanitor - id: ClothingBackpackERTJanitorFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: LightReplacer - - id: BoxLightMixed - - id: BoxLightMixed - - id: Soap - - id: CrowbarRed - - id: AdvMopItem - -- type: entity - noSpawn: true - parent: ClothingBackpackERTChaplain - id: ClothingBackpackERTChaplainFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: BoxCandle - - id: BoxBodyBag - - id: DrinkWaterMelonJuiceJug - - id: Lantern - - id: Lantern - - id: Bible - - id: CrowbarRed - - id: FoodBakedBunHotX - - id: FoodBakedBunHotX - - id: FoodBakedBunHotX - - id: FoodBakedBunHotX - - id: Lighter - -# Death Squad - -- type: entity - noSpawn: false - parent: ClothingBackpackERTSecurity - id: ClothingBackpackDeathSquadFilled - name: death squad backpack - description: Holds the kit of CentComm's most feared agents. - components: - - type: Storage - grid: - - 0,0,7,6 - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: WeaponPulseRifle - - id: WeaponPulsePistol - - id: WeaponRevolverMateba - - id: SpeedLoaderMagnumAP - - id: SpeedLoaderMagnumAP - - id: BoxFlashbang - - id: ToolDebug # spanish army knife - - id: WelderExperimental - - id: Hypospray - - id: DeathAcidifierImplanter # crew will try to steal their amazing hardsuits - - id: FreedomImplanter - -# Cargo - -- type: entity - noSpawn: true - parent: ClothingBackpackCargo - id: ClothingBackpackCargoFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSalvage - id: ClothingBackpackSalvageFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -# Pirate - -- type: entity - parent: ClothingBackpackSatchelLeather - id: ClothingBackpackPirateFilled - suffix: Filled, Pirate - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Cutlass - - id: WeaponRevolverPirate - - id: ClothingEyesEyepatch diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml deleted file mode 100644 index fc49adcd21..0000000000 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ /dev/null @@ -1,275 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelClown - id: ClothingBackpackDuffelClownFilled - components: - - type: StorageFill - contents: - - id: BoxHug - - id: RubberStampClown - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelSecurity - id: ClothingBackpackDuffelSecurityFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash -# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelSecurity - id: ClothingBackpackDuffelSecurityFilledDetective - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: ForensicPad - - id: ForensicScanner - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelBrigmedic - id: ClothingBackpackDuffelBrigmedicFilled - components: - - type: StorageFill - contents: - - id: Flash - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMedical - id: ClothingBackpackDuffelMedicalFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMedical - id: ClothingBackpackDuffelParamedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: EmergencyRollerBedSpawnFolded - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelCaptain - id: ClothingBackpackDuffelCaptainFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- name: StationCharter - #- name: TelescopicBaton -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelEngineering - id: ClothingBackpackDuffelChiefEngineerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelScience - id: ClothingBackpackDuffelResearchDirectorFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelHOPFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMedical - id: ClothingBackpackDuffelCMOFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelCargo - id: ClothingBackpackDuffelQuartermasterFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelSecurity - id: ClothingBackpackDuffelHOSFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: MagazinePistol - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelEngineering - id: ClothingBackpackDuffelEngineeringFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelAtmospherics - id: ClothingBackpackDuffelAtmosphericsFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelScience - id: ClothingBackpackDuffelScienceFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelHydroponics - id: ClothingBackpackDuffelHydroponicsFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMime - id: ClothingBackpackDuffelMimeFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampMime - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelChemistry - id: ClothingBackpackDuffelChemistryFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelChaplainFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Bible - - id: RubberStampChaplain - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelLawyerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampLawyer - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelMusicianFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: AcousticGuitarInstrument - - id: SaxophoneInstrument - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelLibrarianFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: BookRandom - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelDetectiveFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Lighter - - id: CigPackBlack - - id: BoxForensicPad - - id: HandLabeler - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelCargo - id: ClothingBackpackDuffelCargoFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelSalvage - id: ClothingBackpackDuffelSalvageFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml deleted file mode 100644 index 665fcc182e..0000000000 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ /dev/null @@ -1,300 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelTools - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Crowbar - - id: Wrench - - id: Screwdriver - - id: Wirecutter - - id: Welder - - id: Multitool - -- type: entity - parent: ClothingBackpackSatchelClown - id: ClothingBackpackSatchelClownFilled - components: - - type: StorageFill - contents: - - id: BoxHug - - id: RubberStampClown - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelSecurity - id: ClothingBackpackSatchelSecurityFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash -# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelSecurity - id: ClothingBackpackSatchelSecurityFilledDetective - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: ForensicPad - - id: ForensicScanner - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelBrigmedic - id: ClothingBackpackSatchelBrigmedicFilled - components: - - type: StorageFill - contents: - - id: Flash - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMedical - id: ClothingBackpackSatchelMedicalFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMedical - id: ClothingBackpackSatchelParamedicFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: EmergencyRollerBedSpawnFolded - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelCaptain - id: ClothingBackpackSatchelCaptainFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- name: StationCharter - #- name: TelescopicBaton -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelEngineering - id: ClothingBackpackSatchelChiefEngineerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelScience - id: ClothingBackpackSatchelResearchDirectorFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelHOPFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMedical - id: ClothingBackpackSatchelCMOFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelCargo - id: ClothingBackpackSatchelQuartermasterFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Flash - #- id: TelescopicBaton - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelSecurity - id: ClothingBackpackSatchelHOSFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: Flash - - id: MagazinePistol - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelEngineering - id: ClothingBackpackSatchelEngineeringFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelAtmospherics - id: ClothingBackpackSatchelAtmosphericsFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelScience - id: ClothingBackpackSatchelScienceFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelHydroponics - id: ClothingBackpackSatchelHydroponicsFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelChemistry - id: ClothingBackpackSatchelChemistryFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelChaplainFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: Bible - - id: RubberStampChaplain - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelLawyerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampLawyer - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelMusicianFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: AcousticGuitarInstrument - - id: SaxophoneInstrument - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelLibrarianFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: BookRandom - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelDetectiveFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: BoxForensicPad - - id: Lighter - - id: CigPackBlack - - id: HandLabeler - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelCargo - id: ClothingBackpackSatchelCargoFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelSalvage - id: ClothingBackpackSatchelSalvageFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMime - id: ClothingBackpackSatchelMimeFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampMime - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelHolding - id: ClothingBackpackSatchelHoldingAdmin - components: - - type: StorageFill - contents: - - id: GasAnalyzer - - id: trayScanner - - id: AccessConfiguratorUniversal - - type: Unremoveable diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 6d76234381..4dc965eb8d 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -13,23 +13,6 @@ - id: Retractor - id: Scalpel -- type: entity - id: ClothingBackpackDuffelCBURNFilled - parent: ClothingBackpackDuffelCBURN - suffix: Filled - components: - - type: StorageFill - contents: - - id: BoxSurvivalEngineering - - id: WeaponShotgunDoubleBarreled - - id: BoxShotgunIncendiary - amount: 2 - - id: GrenadeFlashBang - amount: 2 - - id: PillAmbuzolPlus - - id: PillAmbuzol - amount: 4 - - type: entity parent: ClothingBackpackDuffelSyndicateMedicalBundle id: ClothingBackpackDuffelSyndicateFilledMedical @@ -333,38 +316,6 @@ - id: PillAmbuzol amount: 3 -- type: entity - parent: ClothingBackpackDuffelSyndicateBundle - id: ClothingBackpackDuffelSyndicateOperative - name: operative duffelbag - components: - - type: StorageFill - contents: - - id: BoxSurvivalSyndicate - - id: WeaponPistolViper - - id: PinpointerSyndicateNuclear - - id: DeathAcidifierImplanter - - -- type: entity - parent: ClothingBackpackDuffelSyndicateMedicalBundle - id: ClothingBackpackDuffelSyndicateOperativeMedic - name: operative medic duffelbag - description: A large duffel bag for holding extra medical supplies. - components: - - type: StorageFill - contents: - - id: SyndiHypo - - id: BoxSurvivalSyndicate - - id: SawAdvanced - - id: Cautery - - id: CombatKnife - - id: WeaponPistolViper - - id: PinpointerSyndicateNuclear - - id: HandheldHealthAnalyzer - - id: CombatMedipen - - id: DeathAcidifierImplanter - - type: entity parent: ClothingBackpackDuffelSyndicateMedicalBundle id: ClothingBackpackDuffelSyndicateMedicalBundleFilled diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 107a6938ee..304323c097 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -258,6 +258,16 @@ - type: Sprite sprite: Clothing/Back/Backpacks/ertchaplain.rsi +- type: entity + parent: ClothingBackpackERTSecurity + id: ClothingBackpackDeathSquad + name: death squad backpack + description: Holds the kit of CentComm's most feared agents. + components: + - type: Storage + grid: + - 0,0,7,6 + #Syndicate - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml index 7c1f2fde4b..78d747069c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml @@ -7,7 +7,7 @@ - type: InputMover - type: MobMover - type: Loadout - prototypes: [PassengerGear] + prototypes: [LimitedPassengerGear] - type: NpcFactionMember factions: - NanoTrasen diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index 1d789f111e..fb823fdcb9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -19,17 +19,17 @@ - type: loadout id: CargoTechnicianBackpack equipment: - back: ClothingBackpackCargoFilled + back: ClothingBackpackCargo - type: loadout id: CargoTechnicianSatchel equipment: - back: ClothingBackpackSatchelCargoFilled + back: ClothingBackpackSatchelCargo - type: loadout id: CargoTechnicianDuffel equipment: - back: ClothingBackpackDuffelCargoFilled + back: ClothingBackpackDuffelCargo # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index 0d9eefdf30..febb4e513c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -35,15 +35,11 @@ equipment: head: ClothingHeadHatBeretQM -- type: startingGear # DeltaV +- type: loadout # DeltaV id: LogiOfficerBeret equipment: head: ClothingHeadHatBeretLogi -- type: loadout # DeltaV - id: LogiOfficerBeret - equipment: LogiOfficerBeret - # Neck - type: loadout id: QuartermasterCloak @@ -55,34 +51,6 @@ equipment: neck: ClothingNeckMantleQM -# Back -- type: loadout - id: QuartermasterBackpack - equipment: QuartermasterBackpack - -- type: startingGear - id: QuartermasterBackpack - equipment: - back: ClothingBackpackQuartermasterFilled - -- type: loadout - id: QuartermasterSatchel - equipment: QuartermasterSatchel - -- type: startingGear - id: QuartermasterSatchel - equipment: - back: ClothingBackpackSatchelQuartermasterFilled - -- type: loadout - id: QuartermasterDuffel - equipment: QuartermasterDuffel - -- type: startingGear - id: QuartermasterDuffel - equipment: - back: ClothingBackpackDuffelQuartermasterFilled - # OuterClothing - type: loadout id: QuartermasterWintercoat diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index 340d07b9eb..fca3d4eb5f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -2,17 +2,17 @@ - type: loadout id: SalvageSpecialistBackpack equipment: - back: ClothingBackpackSalvageFilled + back: ClothingBackpackSalvage - type: loadout id: SalvageSpecialistSatchel equipment: - back: ClothingBackpackSatchelSalvageFilled + back: ClothingBackpackSatchelSalvage - type: loadout id: SalvageSpecialistDuffel equipment: - back: ClothingBackpackDuffelSalvageFilled + back: ClothingBackpackDuffelSalvage # OuterClothing - type: loadout @@ -33,10 +33,6 @@ # Neck - DeltaV - type: loadout # DeltaV - id: SalvageCloak - equipment: SalvageCloak - -- type: startingGear # DeltaV id: SalvageCloak equipment: neck: ClothingNeckSalvager diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml index e3c5f8adb7..95838d7241 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml @@ -29,17 +29,17 @@ - type: loadout id: BotanistBackpack equipment: - back: ClothingBackpackHydroponicsFilled + back: ClothingBackpackHydroponics - type: loadout id: BotanistSatchel equipment: - back: ClothingBackpackSatchelHydroponicsFilled + back: ClothingBackpackSatchelHydroponics - type: loadout id: BotanistDuffel equipment: - back: ClothingBackpackDuffelHydroponicsFilled + back: ClothingBackpackDuffelHydroponics # Outer clothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml index 643fb9fb91..27e41e6461 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml @@ -51,34 +51,6 @@ equipment: jumpsuit: ClothingUniformJumpsuitMonasticRobeLight -# Back -- type: loadout - id: ChaplainBackpack - equipment: ChaplainBackpack - -- type: startingGear - id: ChaplainBackpack - equipment: - back: ClothingBackpackChaplainFilled - -- type: loadout - id: ChaplainSatchel - equipment: ChaplainSatchel - -- type: startingGear - id: ChaplainSatchel - equipment: - back: ClothingBackpackSatchelChaplainFilled - -- type: loadout - id: ChaplainDuffel - equipment: ChaplainDuffel - -- type: startingGear - id: ChaplainDuffel - equipment: - back: ClothingBackpackDuffelChaplainFilled - # Neck - type: loadout id: ChaplainNeck diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml index 7fbd2170fb..161d49c1ed 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml @@ -19,17 +19,17 @@ - type: loadout id: ClownBackpack equipment: - back: ClothingBackpackClownFilled + back: ClothingBackpackClown - type: loadout id: ClownSatchel equipment: - back: ClothingBackpackSatchelClownFilled + back: ClothingBackpackSatchelClown - type: loadout id: ClownDuffel equipment: - back: ClothingBackpackDuffelClownFilled + back: ClothingBackpackDuffelClown # Shoes - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml index e8075a6618..0d137b488b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml @@ -45,17 +45,17 @@ - type: loadout id: MimeBackpack equipment: - back: ClothingBackpackMimeFilled + back: ClothingBackpackMime - type: loadout id: MimeSatchel equipment: - back: ClothingBackpackSatchelMimeFilled + back: ClothingBackpackSatchelMime - type: loadout id: MimeDuffel equipment: - back: ClothingBackpackDuffelMimeFilled + back: ClothingBackpackDuffelMime # Outerclothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index c38de98694..2d3e6bd0fe 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -9,34 +9,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtMusician -# Back -- type: loadout - id: MusicianBackpack - equipment: MusicianBackpack - -- type: startingGear - id: MusicianBackpack - equipment: - back: ClothingBackpackMusicianFilled - -- type: loadout - id: MusicianSatchel - equipment: MusicianSatchel - -- type: startingGear - id: MusicianSatchel - equipment: - back: ClothingBackpackSatchelMusicianFilled - -- type: loadout - id: MusicianDuffel - equipment: MusicianDuffel - -- type: startingGear - id: MusicianDuffel - equipment: - back: ClothingBackpackDuffelMusicianFilled - # Outerclothing - type: loadout id: MusicianWintercoat diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index 4a9e28bf61..6134d67289 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -40,39 +40,23 @@ # Rose Hoodie w/ Skirt - DeltaV - type: loadout - id: MioSkirt - equipment: MioSkirt - -- type: startingGear id: MioSkirt equipment: jumpsuit: ClothingCostumeMioSkirt # Turqoise Hoodie w/ Shorts - DeltaV - type: loadout - id: NaotaHoodie - equipment: NaotaHoodie - -- type: startingGear id: NaotaHoodie equipment: jumpsuit: ClothingCostumeNaota # Casual Blue - DeltaV - type: loadout - id: CasualRedSkirt - equipment: CasualRedSkirt - -- type: startingGear id: CasualRedSkirt equipment: jumpsuit: ClothingUniformJumpskirtCasualRed - type: loadout - id: CasualRedSuit - equipment: CasualRedSuit - -- type: startingGear id: CasualRedSuit equipment: jumpsuit: ClothingUniformJumpsuitCasualRed @@ -80,38 +64,22 @@ # Casual Blue - DeltaV - type: loadout - id: CasualBlueSkirt - equipment: CasualBlueSkirt - -- type: startingGear id: CasualBlueSkirt equipment: jumpsuit: ClothingUniformJumpskirtCasualBlue - type: loadout - id: CasualBlueSuit - equipment: CasualBlueSuit - -- type: startingGear id: CasualBlueSuit equipment: jumpsuit: ClothingUniformJumpsuitCasualBlue # Casual Purple - DeltaV - type: loadout - id: CasualPurpleSkirt - equipment: CasualPurpleSkirt - -- type: startingGear id: CasualPurpleSkirt equipment: jumpsuit: ClothingUniformJumpskirtCasualPurple - type: loadout - id: CasualPurpleSuit - equipment: CasualPurpleSuit - -- type: startingGear id: CasualPurpleSuit equipment: jumpsuit: ClothingUniformJumpsuitCasualPurple @@ -129,17 +97,17 @@ - type: loadout id: CommonBackpack equipment: - back: ClothingBackpackFilled + back: ClothingBackpack - type: loadout id: CommonSatchel equipment: - back: ClothingBackpackSatchelFilled + back: ClothingBackpackSatchel - type: loadout id: CommonDuffel equipment: - back: ClothingBackpackDuffelFilled + back: ClothingBackpackDuffel # Gloves - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 3e00450b1d..1604b1356b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -55,17 +55,17 @@ - type: loadout id: CaptainBackpack equipment: - back: ClothingBackpackCaptainFilled + back: ClothingBackpackCaptain - type: loadout id: CaptainSatchel equipment: - back: ClothingBackpackSatchelCaptainFilled + back: ClothingBackpackSatchelCaptain - type: loadout id: CaptainDuffel equipment: - back: ClothingBackpackDuffelCaptainFilled + back: ClothingBackpackDuffelCaptain # Outer clothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index f70764610a..76c46d7d1a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -37,40 +37,13 @@ neck: ClothingNeckMantleHOP # Back -- type: loadout - id: HoPBackpack - equipment: HoPBackpack - -- type: startingGear - id: HoPBackpack - equipment: - back: ClothingBackpackHOPFilled - -- type: loadout - id: HoPSatchel - equipment: HoPSatchel - -- type: startingGear - id: HoPSatchel - equipment: - back: ClothingBackpackSatchelHOPFilled - -- type: loadout - id: HoPDuffel - equipment: HoPDuffel - -- type: startingGear - id: HoPDuffel - equipment: - back: ClothingBackpackDuffelHOPFilled - - type: loadout id: HoPBackpackIan effects: - !type:GroupLoadoutEffect proto: ProfessionalHoP equipment: - back: ClothingBackpackHOPIanFilled + back: ClothingBackpackIan # Outerclothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml index ef37feb0bc..b3f1ae3cd6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -18,17 +18,17 @@ - type: loadout id: AtmosphericTechnicianBackpack equipment: - back: ClothingBackpackAtmosphericsFilled + back: ClothingBackpackAtmospherics - type: loadout id: AtmosphericTechnicianSatchel equipment: - back: ClothingBackpackSatchelAtmosphericsFilled + back: ClothingBackpackSatchelAtmospherics - type: loadout id: AtmosphericTechnicianDuffel equipment: - back: ClothingBackpackDuffelAtmosphericsFilled + back: ClothingBackpackDuffelAtmospherics # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 649686cd07..f60f1ea84c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -40,34 +40,6 @@ equipment: neck: ClothingNeckMantleCE -# Back -- type: loadout - id: ChiefEngineerBackpack - equipment: ChiefEngineerBackpack - -- type: startingGear - id: ChiefEngineerBackpack - equipment: - back: ClothingBackpackChiefEngineerFilled - -- type: loadout - id: ChiefEngineerSatchel - equipment: ChiefEngineerSatchel - -- type: startingGear - id: ChiefEngineerSatchel - equipment: - back: ClothingBackpackSatchelChiefEngineerFilled - -- type: loadout - id: ChiefEngineerDuffel - equipment: ChiefEngineerDuffel - -- type: startingGear - id: ChiefEngineerDuffel - equipment: - back: ClothingBackpackDuffelChiefEngineerFilled - # OuterClothing - type: loadout id: ChiefEngineerWintercoat diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 2d1bcac9c3..38c3909d7c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -83,17 +83,17 @@ - type: loadout id: StationEngineerBackpack equipment: - back: ClothingBackpackEngineeringFilled + back: ClothingBackpackEngineering - type: loadout id: StationEngineerSatchel equipment: - back: ClothingBackpackSatchelEngineeringFilled + back: ClothingBackpackSatchelEngineering - type: loadout id: StationEngineerDuffel equipment: - back: ClothingBackpackDuffelEngineeringFilled + back: ClothingBackpackDuffelEngineering # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index 044473a044..cea3ca94b7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -1,9 +1,5 @@ # Neck - DeltaV - type: loadout # DeltaV - id: ChemistTie - equipment: ChemistTie - -- type: startingGear # DeltaV id: ChemistTie equipment: neck: ClothingNeckTieChem @@ -20,10 +16,6 @@ jumpsuit: ClothingUniformJumpskirtChemistry - type: loadout # DeltaV - id: ChemistFormalSuit - equipment: ChemistFormalSuit - -- type: startingGear # DeltaV id: ChemistFormalSuit equipment: jumpsuit: ClothingUniformJumpsuitChemShirt @@ -32,17 +24,17 @@ - type: loadout id: ChemistBackpack equipment: - back: ClothingBackpackChemistryFilled + back: ClothingBackpackChemistry - type: loadout id: ChemistSatchel equipment: - back: ClothingBackpackSatchelChemistryFilled + back: ClothingBackpackSatchelChemistry - type: loadout id: ChemistDuffel equipment: - back: ClothingBackpackDuffelChemistryFilled + back: ClothingBackpackDuffelChemistry # Outer clothing - type: loadout @@ -57,39 +49,23 @@ ## Start DeltaV Changes - type: loadout - id: ChemistApron - equipment: ChemistApron - -- type: startingGear id: ChemistApron equipment: outerClothing: ClothingOuterApronChemist # Gloves - DeltaV - type: loadout - id: ChemistGloves - equipment: ChemistGloves - -- type: startingGear id: ChemistGloves equipment: gloves: ClothingHandsGlovesChemist # Shoes - DeltaV - type: loadout - id: ChemistWinterBoots - equipment: ChemistWinterBoots - -- type: startingGear id: ChemistWinterBoots equipment: shoes: ClothingShoesBootsWinterChem - type: loadout - id: ChemistShoes - equipment: ChemistShoes - -- type: startingGear id: ChemistShoes equipment: shoes: ClothingShoesEnclosedChem diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index bda0bf18db..c0e95cf5c0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -41,34 +41,6 @@ equipment: neck: ClothingNeckMantleCMO -# Back -- type: loadout - id: ChiefMedicalOfficerBackpack - equipment: ChiefMedicalOfficerBackpack - -- type: startingGear - id: ChiefMedicalOfficerBackpack - equipment: - back: ClothingBackpackCMOFilled - -- type: loadout - id: ChiefMedicalOfficerSatchel - equipment: ChiefMedicalOfficerSatchel - -- type: startingGear - id: ChiefMedicalOfficerSatchel - equipment: - back: ClothingBackpackSatchelCMOFilled - -- type: loadout - id: ChiefMedicalOfficerDuffel - equipment: ChiefMedicalOfficerDuffel - -- type: startingGear - id: ChiefMedicalOfficerDuffel - equipment: - back: ClothingBackpackDuffelCMOFilled - # Outer clothing - type: loadout id: ChiefMedicalOfficerLabCoat @@ -82,10 +54,6 @@ # Shoes - DeltaV - type: loadout - id: ChiefMedicalOfficerWinterBoots - equipment: ChiefMedicalOfficerWinterBoots - -- type: startingGear id: ChiefMedicalOfficerWinterBoots equipment: shoes: ClothingShoesBootsWinterChiefMedicalOfficer diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index da05c8e134..d715f0ede6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -74,10 +74,6 @@ # Neck - DeltaV - type: loadout # DeltaV - id: Stethoscope - equipment: Stethoscope - -- type: startingGear # DeltaV id: Stethoscope equipment: neck: ClothingNeckStethoscope @@ -128,17 +124,17 @@ - type: loadout id: MedicalDoctorBackpack equipment: - back: ClothingBackpackMedicalFilled + back: ClothingBackpackMedical - type: loadout id: MedicalDoctorSatchel equipment: - back: ClothingBackpackSatchelMedicalFilled + back: ClothingBackpackSatchelMedical - type: loadout id: MedicalDoctorDuffel equipment: - back: ClothingBackpackDuffelMedicalFilled + back: ClothingBackpackDuffelMedical # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index 06bddebfd3..9347e0c4b1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -15,34 +15,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtParamedic -# Back -- type: loadout - id: ParamedicBackpack - equipment: ParamedicBackpack - -- type: startingGear - id: ParamedicBackpack - equipment: - back: ClothingBackpackParamedicFilledDV - -- type: loadout - id: ParamedicSatchel - equipment: ParamedicSatchel - -- type: startingGear - id: ParamedicSatchel - equipment: - back: ClothingBackpackSatchelParamedicFilledDV - -- type: loadout - id: ParamedicDuffel - equipment: ParamedicDuffel - -- type: startingGear - id: ParamedicDuffel - equipment: - back: ClothingBackpackDuffelParamedicFilledDV - # Outer clothing - type: loadout id: ParamedicWindbreaker @@ -61,10 +33,6 @@ shoes: ClothingShoesColorBlue - type: loadout # DeltaV - id: ParamedicWinterBoots - equipment: ParamedicWinterBoots - -- type: startingGear # DeltaV id: ParamedicWinterBoots equipment: shoes: ClothingShoesBootsWinterParamedic diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index 07a7d6c45f..fabfc96404 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -4,15 +4,11 @@ id: ResearchDirectorBeret startingGear: ScientificBeret -- type: startingGear # DeltaV +- type: loadout # DeltaV id: ResearchDirectorHood equipment: head: ClothingHeadHoodMysta -- type: loadout # DeltaV - id: ResearchDirectorHood - equipment: ResearchDirectorHood - # Neck - type: loadout @@ -36,34 +32,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtResearchDirector -# Back -- type: loadout - id: ResearchDirectorBackpack - equipment: ResearchDirectorBackpack - -- type: startingGear - id: ResearchDirectorBackpack - equipment: - back: ClothingBackpackResearchDirectorFilled - -- type: loadout - id: ResearchDirectorSatchel - equipment: ResearchDirectorSatchel - -- type: startingGear - id: ResearchDirectorSatchel - equipment: - back: ClothingBackpackSatchelResearchDirectorFilled - -- type: loadout - id: ResearchDirectorDuffel - equipment: ResearchDirectorDuffel - -- type: startingGear - id: ResearchDirectorDuffel - equipment: - back: ClothingBackpackDuffelResearchDirectorFilled - # OuterClothing - type: loadout id: ResearchDirectorLabCoat @@ -82,10 +50,6 @@ # Shoes - DeltaV - type: loadout # DeltaV - id: ResearchDirectorWinterBoots - equipment: ResearchDirectorWinterBoots - -- type: startingGear # DeltaV id: ResearchDirectorWinterBoots equipment: shoes: ClothingShoesBootsWinterMystagogue diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index bfd66a917b..5a9d775fe4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -80,17 +80,17 @@ - type: loadout id: ScientistBackpack equipment: - back: ClothingBackpackScienceFilled + back: ClothingBackpackScience - type: loadout id: ScientistSatchel equipment: - back: ClothingBackpackSatchelScienceFilled + back: ClothingBackpackSatchelScience - type: loadout id: ScientistDuffel equipment: - back: ClothingBackpackDuffelScienceFilled + back: ClothingBackpackDuffelScience # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index adc7186ce0..e8afa5a203 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -36,34 +36,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtDetectiveGrey -# Back -- type: loadout - id: DetectiveBackpack - equipment: DetectiveBackpack - -- type: startingGear - id: DetectiveBackpack - equipment: - back: ClothingBackpackSecurityFilledDetective - -- type: loadout - id: DetectiveSatchel - equipment: DetectiveSatchel - -- type: startingGear - id: DetectiveSatchel - equipment: - back: ClothingBackpackSatchelSecurityFilledDetective - -- type: loadout - id: DetectiveDuffel - equipment: DetectiveDuffel - -- type: startingGear - id: DetectiveDuffel - equipment: - back: ClothingBackpackDuffelSecurityFilledDetective - # OuterClothing - type: loadout id: DetectiveArmorVest diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 870babdf7c..6f2d205be0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -28,21 +28,13 @@ id: HeadofSecurityFormalSkirt equipment: jumpsuit: ClothingUniformJumpskirtHosFormal - -- type: loadout # DeltaV - id: HeadofSecurityParadeSuit - equipment: HeadofSecurityParadeSuit -- type: startingGear # DeltaV +- type: loadout # DeltaV id: HeadofSecurityParadeSuit equipment: jumpsuit: ClothingUniformJumpsuitHoSParadeMale - type: loadout # DeltaV - id: HeadofSecurityParadeSkirt - equipment: HeadofSecurityParadeSkirt - -- type: startingGear # DeltaV id: HeadofSecurityParadeSkirt equipment: jumpsuit: ClothingUniformJumpskirtHoSParadeMale diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 2fcf9f2bcf..66ceceffd8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -52,19 +52,11 @@ jumpsuit: ClothingUniformJumpskirtSecGrey - type: loadout # DeltaV - id: SecurityJumpsuitBlue - equipment: SecurityJumpsuitBlue - -- type: startingGear # DeltaV id: SecurityJumpsuitBlue equipment: jumpsuit: ClothingUniformJumpsuitSecBlue - type: loadout # DeltaV - id: SecurityJumpskirtBlue - equipment: SecurityJumpskirtBlue - -- type: startingGear # DeltaV id: SecurityJumpskirtBlue equipment: jumpsuit: ClothingUniformJumpskirtSecBlue @@ -89,17 +81,17 @@ - type: loadout id: SecurityBackpack equipment: - back: ClothingBackpackSecurityFilled + back: ClothingBackpackSecurity - type: loadout id: SecuritySatchel equipment: - back: ClothingBackpackSatchelSecurityFilled + back: ClothingBackpackSatchelSecurity - type: loadout id: SecurityDuffel equipment: - back: ClothingBackpackDuffelSecurityFilled + back: ClothingBackpackDuffelSecurity # Belt - type: loadout @@ -119,19 +111,11 @@ outerClothing: ClothingOuterArmorBasic - type: loadout # DeltaV - id: PlateCarrier - equipment: PlateCarrier - -- type: startingGear # DeltaV id: PlateCarrier equipment: outerClothing: ClothingOuterArmorPlateCarrier - type: loadout # DeltaV - id: DuraVest - equipment: DuraVest - -- type: startingGear # DeltaV id: DuraVest equipment: outerClothing: ClothingOuterArmorDuraVest diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml index a46139c94b..41cad93a21 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -55,12 +55,8 @@ # Cheap Sunglasses - DeltaV - type: loadout # DeltaV id: GlassesCheapSunglasses - equipment: GlassesCheapSunglasses effects: - !type:GroupLoadoutEffect proto: CheapSunglassesTimer - -- type: startingGear # DeltaV - id: GlassesCheapSunglasses equipment: eyes: ClothingEyesGlassesCheapSunglasses diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index a86fef3465..885809db49 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -161,9 +161,9 @@ id: HoPBackpack name: loadout-group-hop-backpack loadouts: - - HoPBackpack - - HoPSatchel - - HoPDuffel + - CommonBackpack + - CommonSatchel + - CommonDuffel - HoPBackpackIan - type: loadoutGroup @@ -200,8 +200,8 @@ - CasualRedSuit - CasualPurpleSkirt - CasualPurpleSuit # End DeltaV Changes - - RainbowJumpsuit - AncientJumpsuit + - RainbowJumpsuit - type: loadoutGroup id: PassengerFace @@ -219,7 +219,7 @@ - type: loadoutGroup id: CommonBackpack - name: loadout-group-passenger-backpack + name: loadout-group-backpack loadouts: - CommonBackpack - CommonSatchel @@ -353,14 +353,6 @@ - ScarfBlack # Delta V - ScarfPurple # Delta V -- type: loadoutGroup - id: LawyerBackpack - name: loadout-group-lawyer-backpack - loadouts: - - LawyerBackpack - - LawyerSatchel - - LawyerDuffel - - type: loadoutGroup id: ChaplainHead name: loadout-group-chaplain-head @@ -388,14 +380,6 @@ - ChaplainRobesLight - ChaplainRobesDark -- type: loadoutGroup - id: ChaplainBackpack - name: loadout-group-chaplain-backpack - loadouts: - - ChaplainBackpack - - ChaplainSatchel - - ChaplainDuffel - - type: loadoutGroup id: ChaplainOuterClothing name: loadout-group-chaplain-outerclothing @@ -601,14 +585,6 @@ - ScarfPurple - ScarfZebra -- type: loadoutGroup - id: MusicianBackpack - name: loadout-group-musician-backpack - loadouts: - - MusicianBackpack - - MusicianSatchel - - MusicianDuffel - - type: loadoutGroup id: MusicianJumpsuit name: loadout-group-musician-jumpsuit @@ -678,14 +654,6 @@ - QuartermasterTurtleneckSkirt - QuartermasterFormalSuit -- type: loadoutGroup - id: QuartermasterBackpack - name: loadout-group-quartermaster-backpack - loadouts: - - QuartermasterBackpack - - QuartermasterSatchel - - QuartermasterDuffel - - type: loadoutGroup id: QuartermasterNeck name: loadout-group-quartermaster-neck @@ -802,14 +770,6 @@ - ChiefEngineerTurtleneck - ChiefEngineerTurtleneckSkirt -- type: loadoutGroup - id: ChiefEngineerBackpack - name: loadout-group-chief-engineer-backpack - loadouts: - - ChiefEngineerBackpack - - ChiefEngineerSatchel - - ChiefEngineerDuffel - - type: loadoutGroup id: ChiefEngineerNeck name: loadout-group-chief-engineer-neck @@ -975,14 +935,6 @@ - ResearchDirectorJumpsuit - ResearchDirectorJumpskirt -- type: loadoutGroup - id: ResearchDirectorBackpack - name: loadout-group-research-director-backpack - loadouts: - - ResearchDirectorBackpack - - ResearchDirectorSatchel - - ResearchDirectorDuffel - - type: loadoutGroup id: ResearchDirectorOuterClothing name: loadout-group-research-director-outerclothing @@ -1244,14 +1196,6 @@ - NoirJumpsuit - NoirJumpskirt -- type: loadoutGroup - id: DetectiveBackpack - name: loadout-group-detective-backpack - loadouts: - - DetectiveBackpack - - DetectiveSatchel - - DetectiveDuffel - - type: loadoutGroup id: DetectiveOuterClothing name: loadout-group-detective-outerclothing @@ -1303,14 +1247,6 @@ - ChiefMedicalOfficerLabCoat - ChiefMedicalOfficerWintercoat -- type: loadoutGroup - id: ChiefMedicalOfficerBackpack - name: loadout-group-chief-medical-officer-backpack - loadouts: - - ChiefMedicalOfficerBackpack - - ChiefMedicalOfficerSatchel - - ChiefMedicalOfficerDuffel - - type: loadoutGroup id: ChiefMedicalOfficerNeck name: loadout-group-chief-medical-officer-neck @@ -1494,14 +1430,6 @@ - ParamedicWindbreaker - ParamedicWintercoat -- type: loadoutGroup - id: ParamedicBackpack - name: loadout-group-paramedic-backpack - loadouts: - - ParamedicBackpack - - ParamedicSatchel - - ParamedicDuffel - - type: loadoutGroup id: ParamedicShoes name: loadout-group-paramedic-shoes diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 31f3a46c3f..150e6abc58 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -115,7 +115,7 @@ - ChaplainMask - ChaplainNeck - ChaplainJumpsuit - - ChaplainBackpack + - CommonBackpack - ChaplainOuterClothing - Glasses - Trinkets @@ -182,7 +182,7 @@ - GroupTankHarness - MusicianJumpsuit - MusicianNeck - - MusicianBackpack + - CommonBackpack - MusicianOuterClothing - Glasses - Trinkets @@ -197,7 +197,7 @@ - QuartermasterHead - QuartermasterNeck - QuartermasterJumpsuit - - QuartermasterBackpack + - CargoTechnicianBackpack - QuartermasterOuterClothing - QuartermasterShoes - Glasses @@ -239,7 +239,7 @@ - GroupTankHarness - ChiefEngineerHead - ChiefEngineerJumpsuit - - ChiefEngineerBackpack + - StationEngineerBackpack - ChiefEngineerNeck - ChiefEngineerOuterClothing - ChiefEngineerShoes @@ -291,7 +291,7 @@ - ResearchDirectorHead - ResearchDirectorNeck - ResearchDirectorJumpsuit - - ResearchDirectorBackpack + - ScientistBackpack - ResearchDirectorOuterClothing - ScientistGloves - ResearchDirectorShoes @@ -374,7 +374,7 @@ - DetectiveHead - DetectiveNeck - DetectiveJumpsuit - - DetectiveBackpack + - SecurityBackpack - DetectiveOuterClothing - SecurityShoes - Trinkets @@ -399,7 +399,7 @@ - MedicalMask - ChiefMedicalOfficerJumpsuit - MedicalGloves - - ChiefMedicalOfficerBackpack + - MedicalBackpack - ChiefMedicalOfficerOuterClothing - ChiefMedicalOfficerNeck - ChiefMedicalOfficerShoes @@ -460,7 +460,7 @@ - MedicalDoctorNeck # DeltaV - ParamedicJumpsuit - MedicalGloves - - ParamedicBackpack + - MedicalBackpack - ParamedicOuterClothing - ParamedicShoes - Glasses diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml index 54b678b68c..ab7eda5741 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Cargo/mail_carrier.yml @@ -1,38 +1,22 @@ # Head - type: loadout - id: MailCarrierHead - equipment: MailCarrierHead - -- type: startingGear id: MailCarrierHead equipment: head: ClothingHeadMailCarrier # Jumpsuit - type: loadout - id: MailCarrierJumpsuit - equipment: MailCarrierJumpsuit - -- type: startingGear id: MailCarrierJumpsuit equipment: jumpsuit: ClothingUniformMailCarrier - type: loadout - id: MailCarrierJumpskirt - equipment: MailCarrierJumpskirt - -- type: startingGear id: MailCarrierJumpskirt equipment: - jumpsuit: ClothingUniformSkirtMailCarrier + jumpsuit: ClothingUniformSkirtMailCarrier # OuterClothing - type: loadout - id: MailCarrierWintercoat - equipment: MailCarrierWintercoat - -- type: startingGear id: MailCarrierWintercoat equipment: - coat: ClothingOuterWinterCoatMail + coat: ClothingOuterWinterCoatMail diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml index 9c8bfa6d93..ae76b0b7f6 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml @@ -1,95 +1,55 @@ # Head - type: loadout - id: MantisFezHat - equipment: MantisFezHat - -- type: startingGear id: MantisFezHat equipment: - head: ClothingHeadHatFezMantis + head: ClothingHeadHatFezMantis # Jumpsuit - type: loadout - id: MantisJumpsuit - equipment: MantisJumpsuit - -- type: startingGear id: MantisJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitMantis + jumpsuit: ClothingUniformJumpsuitMantis - type: loadout - id: MantisJumpskirt - equipment: MantisJumpskirt - -- type: startingGear id: MantisJumpskirt equipment: - jumpsuit: ClothingUniformSkirtMantis + jumpsuit: ClothingUniformSkirtMantis # Back - type: loadout - id: MantisBackpack - equipment: MantisBackpack - -- type: startingGear id: MantisBackpack equipment: - back: ClothingBackpackMantisFilled + back: ClothingBackpackMantisFilled - type: loadout - id: MantisSatchel - equipment: MantisSatchel - -- type: startingGear id: MantisSatchel equipment: - back: ClothingBackpackSatchelMantisFilled + back: ClothingBackpackSatchelMantisFilled - type: loadout - id: MantisDuffel - equipment: MantisDuffel - -- type: startingGear id: MantisDuffel equipment: - back: ClothingBackpackDuffelMantisFilled + back: ClothingBackpackDuffelMantisFilled # OuterClothing - type: loadout - id: MantisCoat - equipment: MantisCoat - -- type: startingGear id: MantisCoat equipment: - coat: ClothingOuterCoatMantis + coat: ClothingOuterCoatMantis - type: loadout - id: MantisWintercoat - equipment: MantisWintercoat - -- type: startingGear id: MantisWintercoat equipment: - coat: ClothingOuterWinterCoatMantis + coat: ClothingOuterWinterCoatMantis # Shoes - type: loadout - id: MantisBoots - equipment: MantisBoots - -- type: startingGear id: MantisBoots equipment: - shoes: ClothingShoesBootsMantis + shoes: ClothingShoesBootsMantis # Gloves - type: loadout - id: WhiteGloves - equipment: WhiteGloves - -- type: startingGear id: WhiteGloves equipment: - gloves: ClothingHandsGlovesColorWhite + gloves: ClothingHandsGlovesColorWhite diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml index b383645edb..55fd7e3158 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Security/prisonguard.yml @@ -1,19 +1,11 @@ # Head - type: loadout - id: PrisonGuardHead - equipment: PrisonGuardHead - -- type: startingGear id: PrisonGuardHead equipment: - head: ClothingHeadPrisonGuard + head: ClothingHeadPrisonGuard # Jumpsuit - type: loadout - id: PrisonGuardJumpsuit - equipment: PrisonGuardJumpsuit - -- type: startingGear id: PrisonGuardJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitPrisonGuard + jumpsuit: ClothingUniformJumpsuitPrisonGuard diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml index 9200607f06..d161887040 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/gladiator.yml @@ -1,19 +1,11 @@ # Jumpsuits - type: loadout - id: GladiatorJumpsuit - equipment: GladiatorJumpsuit - -- type: startingGear id: GladiatorJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitGladiator + jumpsuit: ClothingUniformJumpsuitGladiator # OuterClothing - type: loadout - id: ClothingOuterArmorGladiator - equipment: ClothingOuterArmorGladiator - -- type: startingGear id: ClothingOuterArmorGladiator equipment: - outerClothing: ClothingOuterArmorGladiator + outerClothing: ClothingOuterArmorGladiator diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml index c277895630..25d861202e 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/martialartist.yml @@ -1,29 +1,17 @@ # Jumpsuits - type: loadout - id: MartialArtistJumpsuit - equipment: MartialArtistJumpsuit - -- type: startingGear id: MartialArtistJumpsuit equipment: - jumpsuit: ClothingUniformMartialGi + jumpsuit: ClothingUniformMartialGi # Belts - type: loadout - id: MartialBlackBelt - equipment: MartialBlackBelt - -- type: startingGear id: MartialBlackBelt equipment: - belt: ClothingBeltMartialBlack + belt: ClothingBeltMartialBlack # Shoes - type: loadout - id: MartialArtistShoes - equipment: MartialArtistShoes - -- type: startingGear id: MartialArtistShoes equipment: - shoes: ClothingShoesGeta + shoes: ClothingShoesGeta diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml index 9040003c0c..4e667bec59 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Wildcards/prisoner.yml @@ -1,18 +1,10 @@ # Jumpsuit - type: loadout - id: PrisonerJumpsuit - equipment: PrisonerJumpsuit - -- type: startingGear id: PrisonerJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitPrisoner + jumpsuit: ClothingUniformJumpsuitPrisoner - type: loadout - id: PrisonerJumpskirt - equipment: PrisonerJumpskirt - -- type: startingGear id: PrisonerJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtPrisoner + jumpsuit: ClothingUniformJumpskirtPrisoner diff --git a/Resources/Prototypes/Roles/Antags/pirate.yml b/Resources/Prototypes/Roles/Antags/pirate.yml index 235ccfdab8..849e9dc1f2 100644 --- a/Resources/Prototypes/Roles/Antags/pirate.yml +++ b/Resources/Prototypes/Roles/Antags/pirate.yml @@ -2,7 +2,7 @@ id: PirateGear equipment: jumpsuit: ClothingUniformJumpsuitPirate - back: ClothingBackpackPirateFilled + back: ClothingBackpackSatchelLeather head: ClothingHeadBandBlack shoes: ClothingShoesBootsLaceup id: PiratePDA @@ -11,25 +11,15 @@ - type: startingGear id: PirateCaptainGear + parent: PirateGear equipment: - jumpsuit: ClothingUniformJumpsuitPirate - back: ClothingBackpackPirateFilled head: ClothingHeadHatPirate - shoes: ClothingShoesBootsLaceup - id: PiratePDA - belt: ClothingBeltUtility - pocket1: AppraisalTool pocket2: EnergyCutlass outerClothing: ClothingOuterCoatPirate - type: startingGear id: PirateFirstmateGear + parent: PirateGear equipment: - jumpsuit: ClothingUniformJumpsuitPirate - back: ClothingBackpackPirateFilled head: ClothingHeadHatPirateTricord - shoes: ClothingShoesBootsLaceup - id: PiratePDA - belt: ClothingBeltUtility - pocket1: AppraisalTool outerClothing: ClothingOuterCoatGentle diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index cc3abc5e13..7e764c4f30 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -19,3 +19,10 @@ setPreference: false objective: roles-antag-rev-objective guides: [ Revolutionaries ] + +- type: startingGear + id: HeadRevGear + storage: + back: + - Flash + - ClothingEyesGlassesSunglasses diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index bbcb42826b..76d2f148db 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -73,6 +73,8 @@ back: - SyndicateJawsOfLife +======= +>>>>>>> 7d22897d02 (Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)) #Syndicate Operative Outfit - Basic - type: startingGear id: SyndicateOperativeGearBasic @@ -81,4 +83,8 @@ ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat pocket1: BaseUplinkRadio40TC +<<<<<<< HEAD id: SyndiPDA +======= + id: SyndiPDA +>>>>>>> 7d22897d02 (Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605)) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index 5c4e2edfea..010bf280e4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -14,3 +14,6 @@ equipment: #id: PassengerPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetGrey + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 0e41aa5edc..2f0862f2a5 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -25,3 +25,6 @@ shoes: ClothingShoesColorBlack #id: BartenderPDA # DeltaV - different PDAs in loadouts ears: ClothingHeadsetService + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index feed9e7e6b..e8cda18914 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -21,3 +21,6 @@ id: BotanistPDA ears: ClothingHeadsetService belt: ClothingBeltPlantFilled + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 655bd29ed4..face6c2310 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -30,3 +30,7 @@ shoes: ClothingShoesColorBlack id: ChaplainPDA ears: ClothingHeadsetScience # DeltaV - Move Chaplain into Epistemics + storage: + back: + - Bible + - RubberStampChaplain diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index f430526231..786e12202a 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -29,3 +29,6 @@ #id: ChefPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetService belt: ClothingBeltChefFilled + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 6cd8ff655c..6c53530b18 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -38,3 +38,7 @@ pocket2: ClownRecorder #id: ClownPDA # DeltaV: different PDAs in loadouts ears: ClothingHeadsetService + storage: + back: + - RubberStampClown + - CrayonRainbow diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 83fd9ae5d2..ceb7c19e23 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -35,3 +35,6 @@ head: ClothingHeadHatCatEars ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 7200bfa94f..5b008832e8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -22,3 +22,7 @@ ears: ClothingHeadsetService pocket1: d10Dice pocket2: HandLabeler # for making named bestsellers + storage: + back: + - BoxSurvival + - BookRandom diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 252b43460c..e550d73119 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -30,6 +30,10 @@ pocket2: Paper id: MimePDA ears: ClothingHeadsetService + storage: + back: + - BoxSurvival + - RubberStampMime - type: entity id: ActionMimeInvisibleWall diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index d382e494dc..631bab9166 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -25,6 +25,3 @@ shoes: ClothingShoesBootsLaceup id: MusicianPDA ears: ClothingHeadsetService - storage: - back: - - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 2c51cbfd3b..15757cedfb 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -21,3 +21,6 @@ shoes: ClothingShoesColorBlack id: ServiceWorkerPDA ears: ClothingHeadsetService + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 5518aa65d2..4ccc787c52 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -55,3 +55,8 @@ #gloves: ClothingHandsGlovesCaptain - DeltaV - Commented out for loadout options id: CaptainPDA ears: ClothingHeadsetAltCommand + storage: + back: + - BoxSurvival + - Flash + # - StationCharter \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 04c0fad3f1..80ae184e63 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -81,3 +81,7 @@ #gloves: ClothingHandsGlovesHop # DeltaV - Commented for Loadouts ears: ClothingHeadsetHoP # DeltaV - HoP is now a service role, replaces their all channels headset. belt: BoxFolderClipboard + storage: + back: + - BoxSurvival + - Flash \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index ef969f9b84..53da53ca51 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -24,3 +24,6 @@ #id: AtmosPDA # DeltaV: different PDAs in loadouts belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering + storage: + back: + - BoxSurvivalEngineering \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 651abbcaa5..614a949027 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -49,3 +49,7 @@ eyes: ClothingEyesGlassesMeson ears: ClothingHeadsetCE belt: ClothingBeltUtilityEngineering + storage: + back: + - BoxSurvivalEngineering + - Flash \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 15aabc4ab8..1985c4a09d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -24,3 +24,6 @@ eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering + storage: + back: + - BoxSurvivalEngineering \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml index 8748367830..5542a7a69d 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml @@ -3,21 +3,27 @@ id: CultLeaderGear equipment: jumpsuit: ClothingUniformJumpsuitColorBlack - back: ClothingBackpackFilled + back: ClothingBackpack head: ClothingHeadHelmetCult neck: BedsheetCult outerClothing: ClothingOuterArmorCult shoes: ClothingShoesCult id: PassengerPDA ears: ClothingHeadsetService + storage: + back: + - BoxSurvival - type: startingGear id: CultistGear equipment: jumpsuit: ClothingUniformJumpsuitColorBlack - back: ClothingBackpackFilled + back: ClothingBackpack head: ClothingHeadHatHoodCulthood outerClothing: ClothingOuterRobesCult shoes: ClothingShoesColorRed id: PassengerPDA ears: ClothingHeadsetService + storage: + back: + - BoxSurvival diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml index 596e42776b..d053d8da1c 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml @@ -3,41 +3,33 @@ id: WizardBlueGear equipment: jumpsuit: ClothingUniformJumpsuitColorDarkBlue - back: ClothingBackpackFilled head: ClothingHeadHatWizard outerClothing: ClothingOuterWizard shoes: ClothingShoesWizard id: PassengerPDA ears: ClothingHeadsetService + storage: + back: + - BoxSurvival - type: startingGear id: WizardRedGear + parent: WizardBlueGear equipment: jumpsuit: ClothingUniformJumpsuitColorRed - back: ClothingBackpackFilled head: ClothingHeadHatRedwizard outerClothing: ClothingOuterWizardRed - shoes: ClothingShoesWizard - id: PassengerPDA - ears: ClothingHeadsetService - type: startingGear id: WizardVioletGear + parent: WizardBlueGear equipment: jumpsuit: ClothingUniformJumpsuitColorPurple - back: ClothingBackpackFilled head: ClothingHeadHatVioletwizard outerClothing: ClothingOuterWizardViolet - shoes: ClothingShoesWizard - id: PassengerPDA - ears: ClothingHeadsetService - type: startingGear id: WizardHardsuitGear + parent: WizardVioletGear equipment: - jumpsuit: ClothingUniformJumpsuitColorPurple - back: ClothingBackpackFilled - outerClothing: ClothingOuterHardsuitWizard - shoes: ClothingShoesWizard - id: PassengerPDA - ears: ClothingHeadsetService + outerClothing: ClothingOuterHardsuitWizard \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 99aa3de733..a2f8bfd4c6 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -53,3 +53,7 @@ id: CMOPDA ears: ClothingHeadsetCMO belt: ClothingBeltMedicalFilled + storage: + back: + - BoxSurvivalMedical + - Flash diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index daed73984f..3083d413e8 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -22,3 +22,6 @@ equipment: ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled + storage: + back: + - BoxSurvivalMedical \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 5988ff7c35..27b21dd28a 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -32,4 +32,6 @@ belt: ClothingBeltMedicalEMTFilled pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn - + storage: + back: + - EmergencyRollerBedSpawnFolded diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 9480ace15b..12b56a9b96 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -27,3 +27,6 @@ id: ResearchAssistantPDA ears: ClothingHeadsetScience pocket2: BookScientistsGuidebook + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index a3d07ddd44..3893679ca1 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -44,3 +44,6 @@ id: RnDPDA ears: ClothingHeadsetRD belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit + storage: + back: + - Flash diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index b005accc79..d7f1bee1fd 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -19,4 +19,6 @@ id: ScientistGear equipment: ears: ClothingHeadsetScience - + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index d3ae13d79f..daa44258b2 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -29,3 +29,9 @@ id: DetectivePDA ears: ClothingHeadsetSecurity belt: ClothingBeltHolsterFilled + storage: + back: + - BoxSurvivalSecurity + - Flash + - ForensicPad + - ForensicScanner \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index a1de6148ac..de57faadd7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -55,3 +55,7 @@ gloves: ClothingHandsGlovesCombat ears: ClothingHeadsetAltSecurity pocket1: WeaponPistolMk58Nonlethal + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 2eac551ac3..b3a4087f46 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -35,3 +35,7 @@ belt: ClothingBeltSecurityFilled # pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun pocket2: BookSecurity + storage: + back: + - Flash +# - MagazinePistol # DeltaV - no diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 166d2a0b8b..dc8da68f50 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -28,3 +28,7 @@ eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetSecurity pocket1: WeaponPistolMk58Nonlethal + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index c3b8e42cea..92cfe00602 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -35,3 +35,7 @@ id: WardenPDA ears: ClothingHeadsetSecurity pocket1: WeaponPistolMk58Nonlethal + storage: + back: + - Flash + - MagazinePistol diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index 11df8ac2e9..e517aa3f15 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -30,3 +30,6 @@ ears: ClothingHeadsetService shoes: ClothingShoesColorRed belt: ClothingBeltChampion + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index 28c5945c22..7de8aed9d0 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -21,3 +21,6 @@ shoes: ClothingShoesColorWhite id: ReporterPDA ears: ClothingHeadsetService + storage: + back: + - BoxSurvival \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 5a4a965ead..4a599b384f 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -22,3 +22,6 @@ shoes: ClothingShoesColorWhite id: ZookeeperPDA ears: ClothingHeadsetService + storage: + back: + - BoxSurvival \ No newline at end of file