From 28866829fbdec6dfbc3be7ea12ead8340cb3c8af Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 19 Feb 2024 15:07:59 +0100 Subject: [PATCH] Mobster stuff --- .../Fills/Backpacks/StarterGear/backpack.yml | 23 +++---- .../DeltaV/Entities/Mobs/Player/humanoid.yml | 67 ++++++++++++++++++- .../Roles/Jobs/Fun/misc_startinggear.yml | 34 +++++++++- 3 files changed, 106 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 5b49434bef5..cd66a97facb 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -2,21 +2,14 @@ parent: ClothingBackpackSatchelLeather id: ClothingBackpackMafiaFilled suffix: Filled, Mafia -# components: -# - type: StorageFill -# contents: -# - id: BoxSurvival -# amount: 1 -# - id: ClothingOuterArmorBasic -# amount: 1 -## - id: WeaponSubMachineGunTypewriter # That dont fit >:( -## amount: 1 -# - id: WeaponPistolViperWood -# amount: 1 -## - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails) -## amount: 1 -## - id: BaseBallBat # THIS BAT IS TOO DAMN BIG! -## amount: 1 + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: WeaponSubMachineGunTypewriter + - id: WeaponPistolViperWood + - id: MagazinePistol + - id: BaseBallBat - type: entity noSpawn: true diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml index 9e12dc31c44..ea6f5f88811 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml @@ -7,9 +7,72 @@ state: full - type: RandomHumanoidSpawner settings: SyndicateListener - + - type: randomHumanoidSettings id: SyndicateListener components: - type: Loadout - prototypes: [SyndicateListenerGear] \ No newline at end of file + prototypes: [SyndicateListenerGear] + +# Mobsters + +- type: entity + id: RandomHumanoidSpawnerMobster + name: mobster + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: mobster + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last + - type: RandomHumanoidSpawner + settings: Mobster + +- type: randomHumanoidSettings + id: Mobster + randomizeName: false + components: + - type: GhostRole + name: Mobster + description: Break kneecaps, spray lead, keep your mouth shut. + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ MobsterGear ] + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last + +- type: entity + id: RandomHumanoidSpawnerMobsterAlt + name: mobster + suffix: alt + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: mobster + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last + - type: RandomHumanoidSpawner + settings: MobsterAlt + +- type: randomHumanoidSettings + id: MobsterAlt + randomizeName: false + components: + - type: GhostRole + name: Mobster + description: Break kneecaps, spray lead, keep your mouth shut. + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ MobsterGearAlt ] + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml index 0ee34c282fd..43aed80fd51 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml @@ -54,6 +54,7 @@ pocket2: GlowstickBase #Syndicate Pirate Radio Listener + - type: startingGear id: SyndicateListenerGear equipment: @@ -63,4 +64,35 @@ gloves: ClothingHandsGlovesCombat shoes: ClothingShoesSlippers id: SyndiPDA - innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink \ No newline at end of file + innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink + +# Mobsters + +- type: startingGear + id: MobsterGear + equipment: + jumpsuit: ClothingUniformJumpsuitSuitBlackMob + back: ClothingBackpackMafiaFilled + head: ClothingHeadHatFedoraBlack + shoes: ClothingShoesBootsLaceup + neck: ClothingNeckTieBlack + id: PassengerPDA + belt: ClothingBeltHolster + innerclothingskirt: ClothingUniformJumpsuitSuitBlackMob + satchel: ClothingBackpackMafiaFilled + duffelbag: ClothingBackpackMafiaFilled + +- type: startingGear + id: MobsterGearAlt + equipment: + jumpsuit: ClothingUniformJumpsuitSuitBrown + back: ClothingBackpackMafiaFilled + head: ClothingHeadHatFlatBrown + shoes: ClothingShoesLeather + neck: ClothingNeckTieBrown + id: PassengerPDA + belt: ClothingBeltSuspendersBlack + pocket1: CombatKnife + innerclothingskirt: ClothingUniformJumpsuitSuitBrown + satchel: ClothingBackpackMafiaFilled + duffelbag: ClothingBackpackMafiaFilled