Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mobsters from prerebase #860

Merged
merged 4 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
67 changes: 65 additions & 2 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,72 @@
state: full
- type: RandomHumanoidSpawner
settings: SyndicateListener

- type: randomHumanoidSettings
id: SyndicateListener
components:
- type: Loadout
prototypes: [SyndicateListenerGear]
prototypes: [SyndicateListenerGear]

# Mobsters

- type: entity
id: RandomHumanoidSpawnerMobster
name: mobster
components:
- type: Sprite
netsync: false
sprite: DeltaV/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: DeltaV/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
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
pocket2: GlowstickBase

#Syndicate Pirate Radio Listener

- type: startingGear
id: SyndicateListenerGear
equipment:
Expand All @@ -63,3 +64,36 @@
shoes: ClothingShoesSlippers
id: SyndiPDA
innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink

# Mobsters

- type: startingGear
id: MobsterGear
equipment:
jumpsuit: ClothingUniformJumpsuitSuitBlackMob
back: ClothingBackpackMafiaFilled
head: ClothingHeadHatFedoraBlack
shoes: ClothingShoesBootsLaceup
neck: ClothingNeckTieBlack
outerClothing: ClothingOuterArmorBasicSlim
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
outerClothing: ClothingOuterArmorBasicSlim
id: PassengerPDA
belt: ClothingBeltSuspendersBlack
pocket1: CombatKnife
innerClothingSkirt: ClothingUniformJumpsuitSuitBrown
satchel: ClothingBackpackMafiaFilled
duffelbag: ClothingBackpackMafiaFilled
3 changes: 3 additions & 0 deletions Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
},
{
"name": "courier"
},
{
"name": "mobster"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading