diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 604a6f922f..5599b8cbd4 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -117,7 +117,7 @@ public sealed partial class AdminVerbSystem { Text = Loc.GetString("admin-verb-text-make-thief"), Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/ihscombat.rsi"), "icon"), + Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"), "icon"), Act = () => { _thief.AdminMakeThief(args.Target, false); //Midround add pacified is bad diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs index 23c48721fe..8783f14a57 100644 --- a/Content.Server/Body/Systems/InternalsSystem.cs +++ b/Content.Server/Body/Systems/InternalsSystem.cs @@ -241,7 +241,7 @@ public sealed class InternalsSystem : EntitySystem // 3. in-hand tanks // 4. pocket/belt tanks - if (!Resolve(user, ref user.Comp1, ref user.Comp2, ref user.Comp3)) + if (!Resolve(user, ref user.Comp2, ref user.Comp3, false)) // WD EDIT return null; if (_inventory.TryGetSlotEntity(user, "back", out var backEntity, user.Comp2, user.Comp3) && @@ -258,6 +258,9 @@ public sealed class InternalsSystem : EntitySystem return (entity.Value, gasTank); } + if (!Resolve(user, ref user.Comp1, false)) // WD EDIT + return null; + foreach (var item in _inventory.GetHandOrInventoryEntities((user.Owner, user.Comp1, user.Comp2))) { if (TryComp(item, out gasTank) && _gasTank.CanConnectToInternals(gasTank)) diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs index 9c741f864f..77526a43f9 100644 --- a/Content.Server/Store/Systems/StoreSystem.Ui.cs +++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs @@ -278,7 +278,7 @@ public sealed partial class StoreSystem _audio.PlayEntity(component.BuySuccessSound, msg.Session, uid); //cha-ching! //WD START - if (listing.SaleLimit != 0 && listing.SaleAmount > 0 && listing.PurchaseAmount >= listing.SaleLimit && listing.ProductAction.HasValue) + if (listing.SaleLimit != 0 && listing.SaleAmount > 0 && listing.PurchaseAmount >= listing.SaleLimit) { listing.SaleAmount = 0; listing.Cost = listing.OldCost; diff --git a/Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs b/Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs index f2852a95e8..aaea67ab96 100644 --- a/Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs +++ b/Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs @@ -179,6 +179,12 @@ public sealed class WizardSpellsSystem : EntitySystem if (!userHasMind) return; + SwapComponent(uid, target); + SwapComponent(uid, target); + SwapComponent(uid, target); + SwapComponent(uid, target); + SwapComponent(uid, target); + _mindSystem.TransferTo(mindId, target, mind: mind); if (targetHasMind) @@ -193,12 +199,6 @@ public sealed class WizardSpellsSystem : EntitySystem _standing.TryLieDown(target); Cast(msg); - - SwapComponent(uid, target); - SwapComponent(uid, target); - SwapComponent(uid, target); - SwapComponent(uid, target); - SwapComponent(uid, target); } #endregion diff --git a/Content.Server/_White/Wizard/WizardRuleSystem.cs b/Content.Server/_White/Wizard/WizardRuleSystem.cs index da3b3c3289..60b1e3bb92 100644 --- a/Content.Server/_White/Wizard/WizardRuleSystem.cs +++ b/Content.Server/_White/Wizard/WizardRuleSystem.cs @@ -159,7 +159,8 @@ public sealed class WizardRuleSystem : GameRuleSystem var query = QueryActiveRules(); while (query.MoveNext(out _, out _, out var wizardRule, out _)) { - AddRole(mindId, mind, wizardRule); + if (!AddRole(mindId, mind, wizardRule)) + return; if (mind.Session is not { } playerSession) return; @@ -171,10 +172,10 @@ public sealed class WizardRuleSystem : GameRuleSystem } } - private void AddRole(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule) + private bool AddRole(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule) { if (_roles.MindHasRole(mindId)) - return; + return false; wizardRule.WizardMinds.Add(mindId); @@ -182,6 +183,8 @@ public sealed class WizardRuleSystem : GameRuleSystem _roles.MindAddRole(mindId, new WizardRoleComponent {PrototypeId = role}); GiveObjectives(mindId, mind, wizardRule); + + return true; } private void GiveObjectives(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule) diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 1faa9f6572..6ec5abcda0 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -248,6 +248,7 @@ - WetFloorSign - HolosignProjector - Plunger + - Bucket components: - LightReplacer - SmokeOnTrigger diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 2e0ab09cd3..c8010eab34 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1338,8 +1338,6 @@ id: MobMonkeySyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink parent: MobBaseSyndicateMonkey suffix: NukeOps - components: - - type: NukeOperative - type: entity name: kobold diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 5f29bcbab7..57258f598f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -279,7 +279,6 @@ parent: BorgChassisSyndicateAssault suffix: Battery, Module, Operative components: - - type: NukeOperative - type: ContainerFill containers: borg_brain: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 706575f691..3239a001da 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -67,6 +67,9 @@ - type: Item size: Large sprite: Objects/Specific/Janitorial/advmop.rsi + storedRotation: -135 + shape: + - 0, 0, 3, 0 - type: Absorbent pickupAmount: 100 - type: UseDelay diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml index 9e058ee512..b58386aaf9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml @@ -15,7 +15,7 @@ - Belt - type: Gun resetOnHandSelected: false - fireRate: 0.5 + fireRate: 0.4 soundGunshot: path: /Audio/Weapons/click.ogg - type: RechargeBasicEntityAmmo diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml index 7e650d536f..262ca917af 100644 --- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml +++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml @@ -26,6 +26,7 @@ - BaseStationAllEventsEligible - BaseStationNanotrasen - BaseRandomStation + - BaseStationTeleportLocation noSpawn: true components: - type: Transform diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml index 3d4fac8301..69e63b6c6e 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml @@ -45,7 +45,7 @@ min: 1 max: 2 - type: Construction - graph: ClosetSteel + graph: ClosetSteelSecure node: done containers: - entity_storage @@ -71,8 +71,3 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] - - type: Construction - graph: ClosetSteelSecure - node: done - containers: - - entity_storage diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml index 7e450513af..e72c56ff44 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml @@ -19,8 +19,6 @@ conditions: - !type:StorageWelded welded: false - - !type:Locked - locked: false completed: - !type:SpawnPrototype prototype: SheetSteel1 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index 4270145345..8e52b4c3c3 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -3,7 +3,6 @@ name: job-name-cargotech description: job-description-cargotech playTimeTracker: JobCargoTechnician - startingGear: CargoTechGear icon: "JobIconCargoTechnician" supervisors: job-supervisors-qm access: @@ -14,3 +13,10 @@ - type: startingGear id: CargoTechGear + equipment: + jumpsuit: ClothingUniformJumpsuitCargo + back: ClothingBackpackCargoFilled + shoes: ClothingShoesColorBlack + id: CargoPDA + ears: ClothingHeadsetCargo + pocket1: AppraisalTool diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 64e312f239..5ece5e04a3 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -13,7 +13,6 @@ - !type:OverallPlaytimeRequirement time: 108000 weight: 10 - startingGear: QuartermasterGear icon: "JobIconQuarterMaster" arrivalNotificationPrototype: QuartermasterArrivalNotification supervisors: job-supervisors-captain @@ -37,3 +36,10 @@ - type: startingGear id: QuartermasterGear + equipment: + head: ClothingHeadHatQMsoft + jumpsuit: ClothingUniformJumpsuitQM + back: ClothingBackpackQuartermasterFilled + shoes: ClothingShoesColorBrown + id: QuartermasterPDA + ears: ClothingHeadsetQM diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index fc4410d3fc..2f218b7727 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -10,7 +10,6 @@ - !type:OverallPlaytimeRequirement time: 36000 #10 hrs icon: "JobIconShaftMiner" - startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm access: - Cargo @@ -20,3 +19,9 @@ - type: startingGear id: SalvageSpecialistGear + equipment: + jumpsuit: ClothingUniformJumpsuitSalvageSpecialist + back: ClothingBackpackSalvageFilled + shoes: ClothingShoesBootsSalvage + id: SalvagePDA + ears: ClothingHeadsetCargo diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index 4333af2619..fc9b66a48c 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -3,7 +3,6 @@ name: job-name-passenger description: job-description-passenger playTimeTracker: JobPassenger - startingGear: PassengerGear icon: "JobIconPassenger" supervisors: job-supervisors-everyone access: @@ -11,3 +10,9 @@ - type: startingGear id: PassengerGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorGrey + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: PassengerPDA + ears: ClothingHeadsetGrey diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 5c0301413c..9af996fa45 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Civilian time: 1800 - startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop access: @@ -20,3 +19,9 @@ - type: startingGear id: BartenderGear + equipment: + jumpsuit: ClothingUniformJumpsuitBartender + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: BartenderPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index 1472276802..813ada1025 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -3,7 +3,6 @@ name: job-name-botanist description: job-description-botanist playTimeTracker: JobBotanist - startingGear: BotanistGear icon: "JobIconBotanist" supervisors: job-supervisors-hop access: @@ -16,3 +15,9 @@ - type: startingGear id: BotanistGear + equipment: + jumpsuit: ClothingUniformJumpsuitHydroponics + back: ClothingBackpackHydroponicsFilled + shoes: ClothingShoesColorBrown + id: BotanistPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 5ee56901b3..0e4af4377c 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -3,7 +3,9 @@ name: job-name-chaplain description: job-description-chaplain playTimeTracker: JobChaplain - startingGear: ChaplainGear + requirements: + - !type:OverallPlaytimeRequirement + time: 18000 #5 hrs icon: "JobIconChaplain" supervisors: job-supervisors-hop access: @@ -16,3 +18,10 @@ - type: startingGear id: ChaplainGear + equipment: + neck: ClothingNeckNecklaceSilver + jumpsuit: ClothingUniformJumpsuitChaplain + back: ClothingBackpackChaplainFilled + shoes: ClothingShoesColorBlack + id: ChaplainPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 16e1aceb47..3d59c26b47 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Civilian time: 1800 - startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop access: @@ -20,3 +19,9 @@ - type: startingGear id: ChefGear + equipment: + jumpsuit: ClothingUniformJumpsuitChef + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: ChefPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index e2f709f5bf..3322b9a948 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -3,7 +3,6 @@ name: job-name-clown description: job-description-clown playTimeTracker: JobClown - startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop access: @@ -27,3 +26,12 @@ - type: startingGear id: ClownGear + equipment: + jumpsuit: ClothingUniformJumpsuitClown + back: ClothingBackpackClownFilled + shoes: ClothingShoesClown + mask: ClothingMaskClown + pocket1: BikeHorn + pocket2: ClownRecorder + id: ClownPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 26d92839ce..04be6c56df 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -3,7 +3,6 @@ name: job-name-janitor description: job-description-janitor playTimeTracker: JobJanitor - startingGear: JanitorGear icon: "JobIconJanitor" supervisors: job-supervisors-hop access: @@ -17,6 +16,20 @@ - type: startingGear id: JanitorGear + equipment: + jumpsuit: ClothingUniformJumpsuitJanitor + back: ClothingBackpackFilled + shoes: ClothingShoesColorPurple + id: JanitorPDA + ears: ClothingHeadsetService - type: startingGear id: JanitorMaidGear + equipment: + jumpsuit: ClothingUniformJumpskirtJanimaid + back: ClothingBackpackFilled + id: JanitorPDA + gloves: ClothingHandsGlovesJanitor + head: ClothingHeadHatCatEars + ears: ClothingHeadsetService + belt: ClothingBeltJanitorFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index dd591b8631..fcf2e77923 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -3,7 +3,6 @@ name: job-name-librarian description: job-description-librarian playTimeTracker: JobLibrarian - startingGear: LibrarianGear icon: "JobIconLibrarian" supervisors: job-supervisors-hop access: @@ -12,3 +11,11 @@ - type: startingGear id: LibrarianGear + equipment: + jumpsuit: ClothingUniformJumpsuitLibrarian + back: ClothingBackpackLibrarianFilled + shoes: ClothingShoesBootsLaceup + id: LibrarianPDA + ears: ClothingHeadsetService + inhand: + - BriefcaseBrownFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 6776f86a0c..377138701b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -6,7 +6,6 @@ requirements: - !type:OverallPlaytimeRequirement time: 14400 #4 hrs - startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop access: @@ -20,6 +19,16 @@ - type: startingGear id: MimeGear + equipment: + jumpsuit: ClothingUniformJumpsuitMime + back: ClothingBackpackMimeFilled + head: ClothingHeadHatBeret + gloves: ClothingHandsGlovesLatex + shoes: ClothingShoesColorWhite + pocket1: CrayonMime + mask: ClothingMaskMime + id: MimePDA + ears: ClothingHeadsetService - type: entity id: ActionMimeInvisibleWall diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 4f96f362c4..a57a5b09cd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -3,7 +3,6 @@ name: job-name-musician description: job-description-musician playTimeTracker: JobMusician - startingGear: MusicianGear icon: "JobIconMusician" supervisors: job-supervisors-hire access: @@ -16,3 +15,9 @@ - type: startingGear id: MusicianGear + equipment: + jumpsuit: ClothingUniformJumpsuitMusician + back: ClothingBackpackMusicianFilled + shoes: ClothingShoesBootsLaceup + id: MusicianPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 0a562464a7..53b77b8a3c 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -3,7 +3,6 @@ name: job-name-serviceworker description: job-description-serviceworker playTimeTracker: JobServiceWorker - startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service access: @@ -16,3 +15,9 @@ - type: startingGear id: ServiceWorkerGear + equipment: + jumpsuit: ClothingUniformJumpsuitBartender + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: ServiceWorkerPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index ae5fa24a78..e7897558e3 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -17,7 +17,6 @@ department: Command time: 18000 # 15 3 weight: 20 - startingGear: CaptainGear icon: "JobIconCaptain" requireAdminNotify: true joinNotifyCrew: true @@ -38,3 +37,9 @@ - type: startingGear id: CaptainGear + equipment: + jumpsuit: ClothingUniformJumpsuitCaptain + back: ClothingBackpackCaptainFilled + shoes: ClothingShoesBootsLaceup + id: CaptainPDA + ears: ClothingHeadsetAltCommand diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index 3f29e44422..37c73f38e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -27,6 +27,3 @@ belt: WeaponPistolN1984 pocket1: BoxFolderBlack pocket2: PenCentcom - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 422904db4a..29f3a99afe 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -17,7 +17,6 @@ department: Command time: 3600 weight: 20 - startingGear: HoPGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true arrivalNotificationPrototype: HeadOfPersonnelArrivalNotification @@ -60,3 +59,9 @@ - type: startingGear id: HoPGear + equipment: + jumpsuit: ClothingUniformJumpsuitHoP + back: ClothingBackpackHOPFilled + shoes: ClothingShoesColorBrown + id: HoPPDA + ears: ClothingHeadsetAltCommand diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index e33bba35aa..24be7b5358 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Engineering time: 54000 # 15 hrs - startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce canBeAntag: true @@ -19,3 +18,9 @@ - type: startingGear id: AtmosphericTechnicianGear + equipment: + jumpsuit: ClothingUniformJumpsuitAtmos + back: ClothingBackpackAtmosphericsFilled + shoes: ClothingShoesColorWhite + id: AtmosPDA + ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 1035754080..6849bf25e3 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -13,7 +13,6 @@ - !type:OverallPlaytimeRequirement time: 108000 weight: 10 - startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" requireAdminNotify: true arrivalNotificationPrototype: ChiefEngineerArrivalNotification @@ -39,3 +38,9 @@ - type: startingGear id: ChiefEngineerGear + equipment: + jumpsuit: ClothingUniformJumpsuitChiefEngineer + back: ClothingBackpackChiefEngineerFilled + shoes: ClothingShoesColorBrown + id: CEPDA + ears: ClothingHeadsetCE diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index b144755387..5741f8ac01 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -13,7 +13,6 @@ - !type:DepartmentTimeRequirement department: Engineering time: 216000 # 60 hrs - startingGear: SeniorEngineerGear icon: "JobIconSeniorEngineer" supervisors: job-supervisors-ce canBeAntag: false @@ -28,3 +27,9 @@ - type: startingGear id: SeniorEngineerGear + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorEngineer + back: ClothingBackpackEngineeringFilled + shoes: ClothingShoesBootsMag + id: SeniorEngineerPDA + ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 08c01873e4..569f063a2f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Engineering time: 14400 #4 hrs - startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce access: @@ -19,3 +18,9 @@ - type: startingGear id: StationEngineerGear + equipment: + jumpsuit: ClothingUniformJumpsuitEngineering + back: ClothingBackpackEngineeringFilled + shoes: ClothingShoesBootsWork + id: EngineerPDA + ears: ClothingHeadsetEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 3e8148ae26..e014755e86 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: TechnicalAssistant name: job-name-technical-assistant description: job-description-technical-assistant @@ -10,7 +10,6 @@ department: Engineering time: 54000 #15 hrs inverted: true # stop playing intern if you're good at engineering! - startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering canBeAntag: true @@ -21,3 +20,10 @@ - type: startingGear id: TechnicalAssistantGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorYellow + back: ClothingBackpackEngineeringFilled + shoes: ClothingShoesBootsWork + id: TechnicalAssistantPDA + ears: ClothingHeadsetEngineering + pocket1: BookEngineersHandbook diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml b/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml index e85b495f94..512da68e11 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml @@ -8,9 +8,6 @@ id: CluwnePDA gloves: ClothingHandsGlovesCluwne pocket1: CluwneHorn - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: HoloClownGear diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml index a380c57270..7d9074c68d 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml @@ -1,21 +1,15 @@ #Cult outfit startingGear definitions. -- type: startingGear - id: CultLeaderGear - equipment: - jumpsuit: ClothingUniformJumpsuitColorBlack - back: ClothingBackpackFilled - head: ClothingHeadHelmetCult - neck: BedsheetCult - outerClothing: ClothingOuterArmorCult - shoes: ClothingShoesCult - id: PassengerPDA - ears: ClothingHeadsetService - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - innerClothingSkirt: ClothingUniformJumpskirtColorBlack - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + +# - type: startingGear +# id: CultLeaderGear - type: startingGear id: CultistGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorBlack + back: ClothingBackpackFilled + head: ClothingHeadHatHoodCulthood + outerClothing: ClothingOuterRobesCult + shoes: ClothingShoesColorRed + id: PassengerPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 1f9193b58a..22d0a4d77f 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -29,9 +29,6 @@ belt: ClothingBeltSecurityFilled pocket1: WeaponPistolN1984Nonlethal pocket2: FlashlightSeclite - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: ERTLeaderGearEVA @@ -49,9 +46,6 @@ belt: ClothingBeltSecurityFilled pocket1: WeaponPistolN1984Nonlethal pocket2: FlashlightSeclite - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: ERTLeaderGearEVALecter @@ -69,9 +63,6 @@ belt: ClothingBeltSecurityFilled pocket1: MagazineRifle pocket2: MagazineRifle - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear inhand: - AirTankFilled @@ -161,9 +152,6 @@ belt: ClothingBeltChiefEngineerFilled pocket1: Flare pocket2: GasAnalyzer - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: ERTEngineerGearEVA @@ -181,9 +169,6 @@ belt: ClothingBeltChiefEngineerFilled pocket1: Flare pocket2: GasAnalyzer - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear # Security - type: job @@ -216,9 +201,6 @@ belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal pocket2: FlashlightSeclite - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: ERTSecurityGearEVA @@ -236,9 +218,6 @@ belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal pocket2: FlashlightSeclite - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: ERTSecurityGearEVALecter @@ -256,9 +235,6 @@ belt: ClothingBeltSecurityFilled pocket1: MagazineRifle pocket2: MagazineRifle - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear inhand: - AirTankFilled @@ -292,9 +268,6 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltMedicalFilled pocket1: Flare - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: ERTMedicalGearEVA @@ -311,9 +284,6 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltMedicalFilled pocket1: Flare - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear # Janitor - type: job @@ -344,9 +314,6 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled pocket1: Flare - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear - type: startingGear id: ERTJanitorGearEVA @@ -362,6 +329,3 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled pocket1: Flare - underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear - underweart: ClothingUnderwearTopBraWhite # White-Underwear - underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear diff --git a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml index fa5df5d75a..e4fdf5d1c8 100644 --- a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml @@ -12,7 +12,6 @@ - !type:DepartmentTimeRequirement department: Security time: 36000 #10 hrs - startingGear: InspectorGear icon: "JobIconInspector" arrivalNotificationPrototype: InspectorArrivalNotification supervisors: job-supervisors-captain @@ -24,3 +23,11 @@ - type: startingGear id: InspectorGear + equipment: + jumpsuit: ClothingUniformJumpsuitWhiteInspectorFormal + back: ClothingBackpackFilled + shoes: ClothingShoesBootsInspector + id: InspectorPDA + ears: ClothingHeadsetAltSecurity + inhand: + - BriefcaseBrownFilled diff --git a/Resources/Prototypes/Roles/Jobs/Justice/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Justice/lawyer.yml index b09986a17c..ff61c08baf 100644 --- a/Resources/Prototypes/Roles/Jobs/Justice/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Justice/lawyer.yml @@ -9,7 +9,6 @@ - !type:DepartmentTimeRequirement department: Security time: 18000 #5 hr - startingGear: LawyerGear icon: "JobIconLawyer" supervisors: job-supervisors-inspector access: @@ -20,3 +19,11 @@ - type: startingGear id: LawyerGear + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerBlack + back: ClothingBackpackLawyerFilled + shoes: ClothingShoesBootsLaceup + id: LawyerPDA + ears: ClothingHeadsetSecurity + inhand: + - BriefcaseBrownFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 3129564811..cbd5da6cf0 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Medical time: 14400 #4 hrs - startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo access: @@ -17,3 +16,9 @@ - type: startingGear id: ChemistGear + equipment: + jumpsuit: ClothingUniformJumpsuitChemistry + back: ClothingBackpackChemistryFilled + shoes: ClothingShoesColorWhite + id: ChemistryPDA + ears: ClothingHeadsetMedical diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index fcba5438d4..f659057461 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -12,7 +12,6 @@ - !type:OverallPlaytimeRequirement time: 108000 weight: 10 - startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" arrivalNotificationPrototype: ChiefMedicalOfficerArrivalNotification requireAdminNotify: true @@ -36,3 +35,9 @@ - type: startingGear id: CMOGear + equipment: + jumpsuit: ClothingUniformJumpsuitCMO + back: ClothingBackpackCMOFilled + shoes: ClothingShoesColorBrown + id: CMOPDA + ears: ClothingHeadsetCMO diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 68609610ba..f2153a03d8 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Medical time: 14400 #4 hrs - startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo access: @@ -18,3 +17,9 @@ - type: startingGear id: DoctorGear + equipment: + jumpsuit: ClothingUniformJumpsuitMedicalDoctor + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesColorWhite + id: MedicalPDA + ears: ClothingHeadsetMedical diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index c26e7d5b47..c1adec1c37 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: MedicalIntern name: job-name-intern description: job-description-intern @@ -8,7 +8,6 @@ department: Medical time: 54000 # 15 hrs inverted: true # stop playing intern if you're good at med! - startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine canBeAntag: true @@ -18,3 +17,10 @@ - type: startingGear id: MedicalInternGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorWhite + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesColorWhite + id: MedicalInternPDA + ears: ClothingHeadsetMedical + pocket1: BookMedicalReferenceBook diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index f3dc6a9c0f..fb0b971868 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -9,7 +9,6 @@ time: 14400 #4 hrs - !type:OverallPlaytimeRequirement time: 54000 # 15 hrs - startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo access: @@ -20,3 +19,9 @@ - type: startingGear id: ParamedicGear + equipment: + jumpsuit: ClothingUniformJumpsuitParamedic + back: ClothingBackpackParamedicFilled + shoes: ClothingShoesColorBlue + id: ParamedicPDA + ears: ClothingHeadsetMedical diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index 147ca100ca..ddad1b9043 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -13,7 +13,6 @@ - !type:DepartmentTimeRequirement department: Medical time: 216000 # 60 hrs - startingGear: SeniorPhysicianGear icon: "JobIconSeniorPhysician" supervisors: job-supervisors-cmo canBeAntag: false @@ -27,3 +26,9 @@ - type: startingGear id: SeniorPhysicianGear + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorPhysician + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesColorBlack + id: SeniorPhysicianPDA + ears: ClothingHeadsetMedical diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 01637d2121..bb24408c7a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -8,7 +8,6 @@ department: Science time: 54000 #15 hrs inverted: true # stop playing intern if you're good at science! - startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science canBeAntag: true @@ -18,3 +17,10 @@ - type: startingGear id: ResearchAssistantGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorWhite + back: ClothingBackpackScienceFilled + shoes: ClothingShoesColorWhite + id: ResearchAssistantPDA + ears: ClothingHeadsetScience + pocket1: BookScientistsGuidebook diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index e0d7b96483..9498e1a9e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -10,7 +10,6 @@ - !type:OverallPlaytimeRequirement time: 108000 weight: 10 - startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" requireAdminNotify: true arrivalNotificationPrototype: ResearchDirectorArrivalNotification @@ -33,3 +32,9 @@ - type: startingGear id: ResearchDirectorGear + equipment: + jumpsuit: ClothingUniformJumpsuitResearchDirector + back: ClothingBackpackResearchDirectorFilled + shoes: ClothingShoesColorBrown + id: RnDPDA + ears: ClothingHeadsetRD diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index b5d6ff9f81..662473f2f7 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Science time: 14400 #4 hrs - startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd access: @@ -16,3 +15,9 @@ - type: startingGear id: ScientistGear + equipment: + jumpsuit: ClothingUniformJumpsuitScientist + back: ClothingBackpackScienceFilled + shoes: ClothingShoesColorWhite + id: SciencePDA + ears: ClothingHeadsetScience diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index b8219b2361..880579a6c4 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Science time: 216000 #60 hrs - startingGear: SeniorResearcherGear icon: "JobIconSeniorResearcher" supervisors: job-supervisors-rd canBeAntag: false @@ -20,3 +19,9 @@ - type: startingGear id: SeniorResearcherGear + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorResearcher + back: ClothingBackpackScienceFilled + shoes: ClothingShoesColorBlack + id: SeniorResearcherPDA + ears: ClothingHeadsetScience diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 8563e4fe21..4fd6c14a98 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Security time: 54000 # 15 hours - startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos whitelistedSpecies: @@ -27,3 +26,9 @@ - type: startingGear id: DetectiveGear + equipment: + jumpsuit: ClothingUniformJumpsuitDetective + back: ClothingBackpackSecurityFilledDetective + shoes: ClothingShoesBootsCombatFilled + id: DetectivePDA + ears: ClothingHeadsetSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 0699c26725..eb2f6dee42 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -13,7 +13,6 @@ - !type:OverallPlaytimeRequirement time: 108000 weight: 10 - startingGear: HoSGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true arrivalNotificationPrototype: HeadOfSecurityArrivalNotification @@ -41,3 +40,9 @@ - type: startingGear id: HoSGear + equipment: + jumpsuit: ClothingUniformJumpsuitHoS + back: ClothingBackpackHOSFilled + shoes: ClothingShoesBootsCombatFilled + id: HoSPDA + ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index aaea1d2465..c199f9bf06 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -10,7 +10,6 @@ department: Security time: 54000 #15 hrs inverted: true # stop playing intern if you're good at security! - startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security whitelistedSpecies: @@ -29,3 +28,10 @@ - type: startingGear id: SecurityCadetGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorRed + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + id: SecurityCadetPDA + ears: ClothingHeadsetSecurity + pocket1: BookSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index d262cab46e..3fb4fda7db 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -7,7 +7,6 @@ - !type:DepartmentTimeRequirement department: Security time: 36000 #10 hrs - startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos whitelistedSpecies: @@ -26,3 +25,9 @@ - type: startingGear id: SecurityOfficerGear + equipment: + jumpsuit: ClothingUniformJumpsuitSec + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + id: SecurityPDA + ears: ClothingHeadsetSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 3b14f24d16..a519e086dd 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -16,7 +16,6 @@ - !type:DepartmentTimeRequirement department: Security time: 216000 # 60 hrs - startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos whitelistedSpecies: @@ -35,3 +34,9 @@ - type: startingGear id: SeniorOfficerGear + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorOfficer + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + id: SeniorOfficerPDA + ears: ClothingHeadsetSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index f09eef8d4d..aaad42d38a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -7,7 +7,6 @@ - !type:RoleTimeRequirement role: JobSecurityOfficer time: 36000 #10 hrs - startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos whitelistedSpecies: @@ -28,3 +27,9 @@ - type: startingGear id: WardenGear + equipment: + jumpsuit: ClothingUniformJumpsuitWarden + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + id: WardenPDA + ears: ClothingHeadsetSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index d45169a087..f5940185ed 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -3,7 +3,6 @@ name: job-name-boxer description: job-description-boxer playTimeTracker: JobBoxer - startingGear: BoxerGear icon: "JobIconBoxer" supervisors: job-supervisors-hop access: @@ -12,3 +11,11 @@ - type: startingGear id: BoxerGear + equipment: + jumpsuit: UniformShortsRed + back: ClothingBackpackFilled + id: BoxerPDA + ears: ClothingHeadsetService + gloves: ClothingHandsGlovesBoxingRed + shoes: ClothingShoesColorRed + belt: ClothingBeltChampion diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 10001280ea..853f80c3f1 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -3,7 +3,6 @@ name: job-name-psychologist description: job-description-psychologist playTimeTracker: JobPsychologist - startingGear: PsychologistGear icon: "JobIconPsychologist" supervisors: job-supervisors-cmo access: @@ -14,3 +13,9 @@ - type: startingGear id: PsychologistGear + equipment: + jumpsuit: ClothingUniformJumpsuitPsychologist + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesLeather + id: PsychologistPDA + ears: ClothingHeadsetMedical diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index cff1750f50..a379aca94d 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -3,7 +3,6 @@ name: job-name-reporter description: job-description-reporter playTimeTracker: JobReporter - startingGear: ReporterGear icon: "JobIconReporter" supervisors: job-supervisors-hop access: @@ -12,3 +11,9 @@ - type: startingGear id: ReporterGear + equipment: + jumpsuit: ClothingUniformJumpsuitReporter + back: ClothingBackpackFilled + shoes: ClothingShoesColorWhite + id: ReporterPDA + ears: ClothingHeadsetService diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 016f1f7b07..fae96f2755 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -3,7 +3,6 @@ name: job-name-zookeeper description: job-description-zookeeper playTimeTracker: JobZookeeper - startingGear: ZookeeperGear icon: "JobIconZookeeper" supervisors: job-supervisors-hop access: @@ -12,3 +11,10 @@ - type: startingGear id: ZookeeperGear + equipment: + jumpsuit: ClothingUniformJumpsuitSafari + back: ClothingBackpackFilled + head: ClothingHeadSafari + shoes: ClothingShoesColorWhite + id: ZookeeperPDA + ears: ClothingHeadsetService