Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

get that crap outta here (completely rewrites inventorysystem) (#5807)

Browse Source 
* some work

* equip: done
unequip: todo

* unequipping done & refactored events

* workin

* movin

* reee namespaces

* stun

* mobstate

* fixes

* some work on events

* removes serverside itemcomp & misc fixes

* work

* smol merge fix

* ports template to prototype & finishes ui

* moves relay & adds containerenumerator

* actions & cuffs

* my god what is actioncode

* more fixes

* im loosing my grasp on reality

* more fixes

* more work

* explosions

* yes

* more work

* more fixes

* merge master & misc fixed because i forgot to commit before merging master

* more fixes

* fixes

* moar

* more work

* moar fixes

* suffixmap

* more work on client

* motivation low

* no. no containers

* mirroring client to server

* fixes

* move serverinvcomp

* serverinventorycomponent is dead

* gaming

* only strippable & ai left...

* only ai and richtext left

* fixes ai

* fixes

* fixes sprite layers

* more fixes

* resolves optional

* yes

* stable™️

* fixes

* moar fixes

* moar

* fix some tests

* lmao

* no comment

* good to merge™️

* fixes build but for real

* adresses some reviews

* adresses some more reviews

* nullables, yo

* fixes lobbyscreen

* timid refactor to differentiate actor & target

* adresses more reviews

* more

* my god what a mess

* removed the rest of duplicates

* removed duplicate slotflags and renamed shoes to feet

* removes another unused one

* yes

* fixes lobby & makes tryunequip return unequipped item

* fixes

* some funny renames

* fixes

* misc improvements to attemptevents

* fixes

* merge fixes

Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
This commit is contained in:
Paul Ritter
2021-12-30 22:56:10 +01:00
committed by GitHub
parent 7a5adb47a1
commit 512d6a38c3
199 changed files with 2493 additions and 3300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Prototypes/Entities/Clothing/Back/duffel.yml
View File

@@ -127,7 +127,7 @@
state: icon-ammo
- type: Clothing
sprite: Clothing/Back/Duffels/syndicate.rsi
ClothingPrefix: ammo
HeldPrefix: ammo
- type: entity
parent: ClothingBackpackDuffelSyndicate
@@ -139,7 +139,7 @@
state: icon-med
- type: Clothing
sprite: Clothing/Back/Duffels/syndicate.rsi
ClothingPrefix: med
HeldPrefix: med
- type: entity
parent: ClothingBackpackDuffel

3
Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
View File

@@ -36,7 +36,6 @@
- type: Clothing
sprite: Clothing/Eyes/Glasses/gar.rsi
HeldPrefix: alt
ClothingPrefix: alt
- type: MeleeWeapon
damage:
types:
@@ -53,7 +52,7 @@
state: icon-super
- type: Clothing
sprite: Clothing/Eyes/Glasses/gar.rsi
ClothingPrefix: super
HeldPrefix: super
- type: MeleeWeapon
damage:
types:

5
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
View File

@@ -5,7 +5,7 @@
components:
- type: Clothing
Slots:
- Helmet
- HEAD
- type: Sprite
state: icon
@@ -16,7 +16,7 @@
components:
- type: Clothing
Slots:
- Helmet
- HEAD
- type: Sprite
state: icon
@@ -56,7 +56,6 @@
visible: false
- type: Clothing
HeldPrefix: off
ClothingPrefix: off
- type: PointLight
enabled: false
radius: 3

1
Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
View File

@@ -11,7 +11,6 @@
visible: false
- type: Clothing
HeldPrefix: off
ClothingPrefix: off
- type: PointLight
enabled: false
radius: 3

2
Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
View File

@@ -5,7 +5,7 @@
components:
- type: Clothing
Slots:
- shoes
- FEET
- type: Sprite
state: icon
- type: Extractable

5
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -419,9 +419,8 @@
QuickEquip: false
sprite: Mobs/Animals/mouse.rsi
HeldPrefix: 0
ClothingPrefix: 0
Slots:
- Helmet
- HEAD
- type: Physics
- type: Fixtures
fixtures:
@@ -478,7 +477,6 @@
sprite: Mobs/Animals/mouse.rsi
- type: Clothing
HeldPrefix: 1
ClothingPrefix: 1
- type: Appearance
visuals:
- type: DamageStateVisualizer
@@ -498,7 +496,6 @@
sprite: Mobs/Animals/mouse.rsi
- type: Clothing
HeldPrefix: 1
ClothingPrefix: 2
- type: Appearance
visuals:
- type: DamageStateVisualizer

1
Resources/Prototypes/Entities/Mobs/Player/human.yml
View File

@@ -20,7 +20,6 @@
- type: Eye
- type: CameraRecoil
- type: Examiner
- type: HumanInventoryController
- type: CanHostGuardian
- type: AiFactionTag
factions:

1
Resources/Prototypes/Entities/Mobs/Player/slime.yml
View File

@@ -15,7 +15,6 @@
- type: Eye
- type: CameraRecoil
- type: Examiner
- type: HumanInventoryController
- type: AiFactionTag
factions:
- NanoTrasen

1
Resources/Prototypes/Entities/Mobs/Player/vox.yml
View File

@@ -16,7 +16,6 @@
- type: Eye
- type: CameraRecoil
- type: Examiner
- type: HumanInventoryController
- type: AiFactionTag
factions:
- NanoTrasen

57
Resources/Prototypes/Entities/Mobs/Species/human.yml
View File

@@ -108,7 +108,7 @@
sprite: Mobs/Customization/masking_helpers.rsi
state: female_full
visible: false
- map: [ "enum.Slots.INNERCLOTHING" ]
- map: [ "jumpsuit" ]
shader: StencilDraw
- map: [ "enum.HumanoidVisualLayers.LHand" ]
color: "#e8b59b"
@@ -131,25 +131,25 @@
sprite: Objects/Misc/handcuffs.rsi
state: body-overlay-2
visible: false
- map: [ "enum.Slots.IDCARD" ]
- map: [ "enum.Slots.GLOVES" ]
- map: [ "enum.Slots.SHOES" ]
- map: [ "enum.Slots.EARS" ]
- map: [ "enum.Slots.OUTERCLOTHING" ]
- map: [ "enum.Slots.EYES" ]
- map: [ "enum.Slots.BELT" ]
- map: [ "enum.Slots.NECK" ]
- map: [ "enum.Slots.BACKPACK" ]
- map: [ "id" ]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
- map: [ "outerClothing" ]
- map: [ "eyes" ]
- map: [ "belt" ]
- map: [ "neck" ]
- map: [ "back" ]
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
state: shaved
sprite: Mobs/Customization/human_facial_hair.rsi
- map: [ "enum.HumanoidVisualLayers.Hair" ]
state: bald
sprite: Mobs/Customization/human_hair.rsi
- map: [ "enum.Slots.MASK" ]
- map: [ "enum.Slots.HEAD" ]
- map: [ "enum.Slots.POCKET1" ]
- map: [ "enum.Slots.POCKET2" ]
- map: [ "mask" ]
- map: [ "head" ]
- map: [ "pocket1" ]
- map: [ "pocket2" ]
- type: Physics
bodyType: KinematicController
- type: Fixtures
@@ -303,6 +303,7 @@
components:
- type: Hands
- type: Inventory
- type: ContainerContainer
- type: Icon
sprite: Mobs/Species/Human/parts.rsi
state: full
@@ -354,7 +355,7 @@
sprite: Mobs/Customization/masking_helpers.rsi
state: female_full
visible: false
- map: ["enum.Slots.INNERCLOTHING"]
- map: ["jumpsuit"]
shader: StencilDraw
- map: ["enum.HumanoidVisualLayers.LHand"]
color: "#e8b59b"
@@ -369,25 +370,25 @@
sprite: Objects/Misc/handcuffs.rsi
state: body-overlay-2
visible: false
- map: ["enum.Slots.IDCARD"]
- map: ["enum.Slots.GLOVES"]
- map: ["enum.Slots.SHOES"]
- map: ["enum.Slots.EARS"]
- map: ["enum.Slots.OUTERCLOTHING"]
- map: ["enum.Slots.EYES"]
- map: ["enum.Slots.BELT"]
- map: ["enum.Slots.NECK"]
- map: ["enum.Slots.BACKPACK"]
- map: ["id"]
- map: ["gloves"]
- map: ["shoes"]
- map: ["ears"]
- map: ["outerClothing"]
- map: ["eyes"]
- map: ["belt"]
- map: ["neck"]
- map: ["back"]
- map: ["enum.HumanoidVisualLayers.FacialHair"]
state: shaved
sprite: Mobs/Customization/human_facial_hair.rsi
- map: ["enum.HumanoidVisualLayers.Hair"]
state: bald
sprite: Mobs/Customization/human_hair.rsi
- map: ["enum.Slots.MASK"]
- map: ["enum.Slots.HEAD"]
- map: [ "enum.Slots.POCKET1" ]
- map: [ "enum.Slots.POCKET2" ]
- map: ["mask"]
- map: ["head"]
- map: [ "pocket1" ]
- map: [ "pocket2" ]
- map: ["hand-left"]
- map: ["hand-right"]
- type: Physics

28
Resources/Prototypes/Entities/Mobs/Species/slime.yml
View File

@@ -48,7 +48,7 @@
sprite: Mobs/Customization/masking_helpers.rsi
state: female_full
visible: false
- map: [ "enum.Slots.INNERCLOTHING" ]
- map: [ "jumpsuit" ]
shader: StencilDraw
- map: [ "enum.HumanoidVisualLayers.LHand" ]
color: "#b8b8b8"
@@ -71,25 +71,25 @@
sprite: Objects/Misc/handcuffs.rsi
state: body-overlay-2
visible: false
- map: [ "enum.Slots.IDCARD" ]
- map: [ "enum.Slots.GLOVES" ]
- map: [ "enum.Slots.SHOES" ]
- map: [ "enum.Slots.EARS" ]
- map: [ "enum.Slots.OUTERCLOTHING" ]
- map: [ "enum.Slots.EYES" ]
- map: [ "enum.Slots.BELT" ]
- map: [ "enum.Slots.NECK" ]
- map: [ "enum.Slots.BACKPACK" ]
- map: [ "id" ]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
- map: [ "outerClothing" ]
- map: [ "eyes" ]
- map: [ "belt" ]
- map: [ "neck" ]
- map: [ "back" ]
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
state: shaved
sprite: Mobs/Customization/human_facial_hair.rsi
- map: [ "enum.HumanoidVisualLayers.Hair" ]
state: bald
sprite: Mobs/Customization/human_hair.rsi
- map: [ "enum.Slots.MASK" ]
- map: [ "enum.Slots.HEAD" ]
- map: [ "enum.Slots.POCKET1" ]
- map: [ "enum.Slots.POCKET2" ]
- map: [ "mask" ]
- map: [ "head" ]
- map: [ "pocket1" ]
- map: [ "pocket2" ]
- type: Body
template: HumanoidTemplate
preset: SlimePreset

28
Resources/Prototypes/Entities/Mobs/Species/vox.yml
View File

@@ -42,7 +42,7 @@
# sprite: Mobs/Customization/masking_helpers.rsi
# state: female_full
# visible: false
#- map: [ "enum.Slots.INNERCLOTHING" ]
#- map: [ "jumpsuit" ]
# shader: StencilDraw
- map: [ "enum.HumanoidVisualLayers.LHand" ]
sprite: Mobs/Species/Vox/parts.rsi
@@ -61,25 +61,25 @@
sprite: Objects/Misc/handcuffs.rsi
state: body-overlay-2
visible: false
- map: [ "enum.Slots.IDCARD" ]
- map: [ "enum.Slots.GLOVES" ]
- map: [ "enum.Slots.SHOES" ]
- map: [ "enum.Slots.EARS" ]
- map: [ "enum.Slots.OUTERCLOTHING" ]
- map: [ "enum.Slots.EYES" ]
- map: [ "enum.Slots.BELT" ]
- map: [ "enum.Slots.NECK" ]
- map: [ "enum.Slots.BACKPACK" ]
- map: [ "id" ]
- map: [ "gloves" ]
- map: [ "shoes" ]
- map: [ "ears" ]
- map: [ "outerClothing" ]
- map: [ "eyes" ]
- map: [ "belt" ]
- map: [ "neck" ]
- map: [ "back" ]
- map: [ "enum.HumanoidVisualLayers.FacialHair" ]
state: shaved
sprite: Mobs/Customization/human_facial_hair.rsi
- map: [ "enum.HumanoidVisualLayers.Hair" ]
state: bald
sprite: Mobs/Customization/human_hair.rsi
- map: [ "enum.Slots.MASK" ]
- map: [ "enum.Slots.HEAD" ]
- map: [ "enum.Slots.POCKET1" ]
- map: [ "enum.Slots.POCKET2" ]
- map: [ "mask" ]
- map: [ "head" ]
- map: [ "pocket1" ]
- map: [ "pocket2" ]
- type: Body
template: HumanoidTemplate
preset: VoxPreset

46
Resources/Prototypes/Entities/Objects/Devices/pda.yml
View File

@@ -56,7 +56,7 @@
description: Why isn't it gray?
components:
- type: PDA
idCard: AssistantIDCard
id: AssistantIDCard
- type: entity
parent: BasePDA
@@ -65,7 +65,7 @@
description: Covered in grease and flour.
components:
- type: PDA
idCard: ChefIDCard
id: ChefIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -80,7 +80,7 @@
description: Has an earthy scent.
components:
- type: PDA
idCard: BotanistIDCard
id: BotanistIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -95,7 +95,7 @@
description: Looks can be deceiving.
components:
- type: PDA
idCard: ClownIDCard
id: ClownIDCard
penSlot:
startingItem: CrayonOrange # no pink crayon?!?
# Maybe this is a bad idea.
@@ -140,7 +140,7 @@
description: Suprisingly not on mute.
components:
- type: PDA
idCard: MimeIDCard
id: MimeIDCard
idSlot:
name: ID Card
whitelist:
@@ -160,7 +160,7 @@
description: God's chosen PDA.
components:
- type: PDA
idCard: ChaplainIDCard
id: ChaplainIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -175,7 +175,7 @@
description: PDA for the guy that orders the guns.
components:
- type: PDA
idCard: QuartermasterIDCard
id: QuartermasterIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -190,7 +190,7 @@
description: PDA for the guys that order the pizzas.
components:
- type: PDA
idCard: CargoIDCard
id: CargoIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -205,7 +205,7 @@
description: Smells like beer.
components:
- type: PDA
idCard: BartenderIDCard
id: BartenderIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -221,7 +221,7 @@
description: Smells like bleach.
components:
- type: PDA
idCard: JanitorIDCard
id: JanitorIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -236,7 +236,7 @@
description: Surprisingly no different from your PDA.
components:
- type: PDA
idCard: CaptainIDCard
id: CaptainIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -252,7 +252,7 @@
description: Looks like it's been chewed on.
components:
- type: PDA
idCard: HoPIDCard
id: HoPIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -268,7 +268,7 @@
description: Looks like it's barely been used.
components:
- type: PDA
idCard: CEIDCard
id: CEIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -284,7 +284,7 @@
description: Rugged and well-worn.
components:
- type: PDA
idCard: EngineeringIDCard
id: EngineeringIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -299,7 +299,7 @@
description: Extraordinarily shiny and sterile.
components:
- type: PDA
idCard: CMOIDCard
id: CMOIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -314,7 +314,7 @@
description: Shiny and sterile.
components:
- type: PDA
idCard: MedicalIDCard
id: MedicalIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -329,7 +329,7 @@
description: It has a few discolored blotches here and there.
components:
- type: PDA
idCard: ChemistIDCard
id: ChemistIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -344,7 +344,7 @@
description: It appears surprisingly ordinary.
components:
- type: PDA
idCard: RDIDCard
id: RDIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -359,7 +359,7 @@
description: It's covered with an unknown gooey substance.
components:
- type: PDA
idCard: ResearchIDCard
id: ResearchIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -374,7 +374,7 @@
description: Whosoever bears this PDA is the law.
components:
- type: PDA
idCard: HoSIDCard
id: HoSIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -389,7 +389,7 @@
description: The OS appears to have been jailbroken.
components:
- type: PDA
idCard: WardenIDCard
id: WardenIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -404,7 +404,7 @@
description: Red to hide the stains of assistant blood.
components:
- type: PDA
idCard: SecurityIDCard
id: SecurityIDCard
- type: Appearance
visuals:
- type: PDAVisualizer
@@ -419,4 +419,4 @@
description: Colored the numbing grey of bureaucracy.
components:
- type: PDA
idCard: CentcomIDCardSyndie
id: CentcomIDCardSyndie

2
Resources/Prototypes/Entities/Objects/Fun/toys.yml
View File

@@ -134,7 +134,7 @@
QuickEquip: false
sprite: Objects/Fun/ducky.rsi
Slots:
- Helmet
- HEAD
- type: ItemCooldown
- type: EmitSoundOnUse
sound:

11
Resources/Prototypes/Entities/Objects/Materials/materials.yml
View File

@@ -256,9 +256,8 @@
- type: Clothing
sprite: Clothing/Head/Misc/hides.rsi
HeldPrefix: bear
ClothingPrefix: bear
Slots:
- Helmet
- HEAD
- type: entity
parent: MaterialBase
@@ -271,9 +270,8 @@
# - type: Clothing
# sprite: Clothing/Head/Misc/hides.rsi
# HeldPrefix: cat
# ClothingPrefix: cat
# Slots:
# - Helmet
# - HEAD
- type: entity
parent: MaterialBase
@@ -285,7 +283,6 @@
state: corgihide
- type: Clothing
sprite: Clothing/Head/Misc/hides.rsi
# HeldPrefix: corgi
ClothingPrefix: corgi2
HeldPrefix: corgi
Slots:
- Helmet
- HEAD

2
Resources/Prototypes/Entities/Objects/Tools/bucket.yml
View File

@@ -15,7 +15,7 @@
size: 100
sprite: Objects/Tools/bucket.rsi
Slots:
- Helmet
- HEAD
- type: Bucket
- type: SolutionContainerManager
solutions:

90
Resources/Prototypes/InventoryTemplates/human_inventory_template.yml Normal file
View File

@@ -0,0 +1,90 @@
- type: inventoryTemplate
id: human
slots:
- name: shoes
slotTexture: shoes
slotFlags: FEET
uiContainer: Top
uiWindowPos: 1,3
displayName: Shoes
- name: jumpsuit
slotTexture: uniform
slotFlags: INNERCLOTHING
uiContainer: Top
uiWindowPos: 0,2
displayName: Jumpsuit
- name: outerClothing
slotTexture: suit
slotFlags: OUTERCLOTHING
uiContainer: Top
uiWindowPos: 1,2
displayName: Suit
- name: gloves
slotTexture: gloves
slotFlags: GLOVES
uiContainer: Top
uiWindowPos: 2,2
displayName: Gloves
- name: neck
slotTexture: neck
slotFlags: NECK
uiContainer: Top
uiWindowPos: 0,1
displayName: Neck
- name: mask
slotTexture: mask
slotFlags: MASK
uiContainer: Top
uiWindowPos: 1,1
displayName: Mask
- name: eyes
slotTexture: glasses
slotFlags: EYES
uiContainer: Top
uiWindowPos: 0,0
displayName: Eyes
- name: ears
slotTexture: ears
slotFlags: EARS
uiContainer: Top
uiWindowPos: 2,0
displayName: Ears
- name: head
slotTexture: head
slotFlags: HEAD
uiContainer: Top
uiWindowPos: 1,0
displayName: Head
- name: pocket1
slotTexture: pocket
slotFlags: POCKET
uiContainer: BottomRight
uiWindowPos: 0,3
dependsOn: jumpsuit
displayName: Pocket 1
- name: pocket2
slotTexture: pocket
slotFlags: POCKET
uiContainer: BottomRight
uiWindowPos: 2,3
dependsOn: jumpsuit
displayName: Pocket 2
- name: id
slotTexture: id
slotFlags: IDCARD
uiContainer: BottomRight
uiWindowPos: 2,1
dependsOn: jumpsuit
displayName: ID
- name: belt
slotTexture: belt
slotFlags: BELT
uiContainer: BottomLeft
uiWindowPos: 3,1
displayName: Belt
- name: back
slotTexture: back
slotFlags: BACK
uiContainer: BottomLeft
uiWindowPos: 3,0
displayName: Back

6
Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
View File

@@ -15,10 +15,10 @@
id: CargoTechGear
equipment:
head: ClothingHeadHatCargosoft
innerclothing: ClothingUniformJumpsuitCargo
backpack: ClothingBackpackFilled
jumpsuit: ClothingUniformJumpsuitCargo
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
idcard: CargoPDA
id: CargoPDA
ears: ClothingHeadsetCargo
innerclothingskirt: ClothingUniformJumpskirtCargo
satchel: ClothingBackpackSatchelFilled

6
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View File

@@ -16,10 +16,10 @@
id: QuartermasterGear
equipment:
head: ClothingHeadHatCargosoft
innerclothing: ClothingUniformJumpsuitQM
backpack: ClothingBackpackFilled
jumpsuit: ClothingUniformJumpsuitQM
back: ClothingBackpackFilled
shoes: ClothingShoesColorBrown
idcard: QuartermasterPDA
id: QuartermasterPDA
ears: ClothingHeadsetCargo
innerclothingskirt: ClothingUniformJumpskirtQM
satchel: ClothingBackpackSatchelFilled

6
Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
View File

@@ -12,10 +12,10 @@
- type: startingGear
id: AssistantGear
equipment:
innerclothing: ClothingUniformJumpsuitColorGrey
backpack: ClothingBackpackFilled
jumpsuit: ClothingUniformJumpsuitColorGrey
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
idcard: AssistantPDA
id: AssistantPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtColorGrey
satchel: ClothingBackpackSatchelFilled

6
Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
View File

@@ -15,11 +15,11 @@
id: BartenderGear
equipment:
head: ClothingHeadHatTophat
innerclothing: ClothingUniformJumpsuitBartender
jumpsuit: ClothingUniformJumpsuitBartender
outerclothing: ClothingOuterVestKevlar
backpack: ClothingBackpackFilled
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
idcard: BartenderPDA
id: BartenderPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtBartender
satchel: ClothingBackpackSatchelFilled

6
Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
View File

@@ -14,10 +14,10 @@
- type: startingGear
id: BotanistGear
equipment:
innerclothing: ClothingUniformJumpsuitHydroponics
backpack: ClothingBackpackHydroponicsFilled
jumpsuit: ClothingUniformJumpsuitHydroponics
back: ClothingBackpackHydroponicsFilled
shoes: ClothingShoesColorBrown
idcard: BotanistPDA
id: BotanistPDA
ears: ClothingHeadsetService
outerclothing: ClothingOuterApronBotanist
innerclothingskirt: ClothingUniformJumpskirtHydroponics

6
Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View File

@@ -13,10 +13,10 @@
- type: startingGear
id: ChaplainGear
equipment:
innerclothing: ClothingUniformJumpsuitChaplain
backpack: ClothingBackpackFilled
jumpsuit: ClothingUniformJumpsuitChaplain
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
idcard: ChaplainPDA
id: ChaplainPDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtChaplain

6
Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
View File

@@ -14,11 +14,11 @@
- type: startingGear
id: ChefGear
equipment:
innerclothing: ClothingUniformJumpsuitChef
jumpsuit: ClothingUniformJumpsuitChef
head: ClothingHeadHatChef
backpack: ClothingBackpackFilled
back: ClothingBackpackFilled
shoes: ClothingShoesColorBlack
idcard: ChefPDA
id: ChefPDA
ears: ClothingHeadsetService
outerclothing: ClothingOuterApronChef
innerclothingskirt: ClothingUniformJumpskirtChef

6
Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
View File

@@ -16,12 +16,12 @@
- type: startingGear
id: ClownGear
equipment:
innerclothing: ClothingUniformJumpsuitClown
backpack: ClothingBackpackClownFilled
jumpsuit: ClothingUniformJumpsuitClown
back: ClothingBackpackClownFilled
shoes: ClothingShoesClown
mask: ClothingMaskClown
pocket1: BikeHorn
idcard: ClownPDA
id: ClownPDA
ears: ClothingHeadsetService
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelClownFilled

6
Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
View File

@@ -17,11 +17,11 @@
- type: startingGear
id: JanitorGear
equipment:
innerclothing: ClothingUniformJumpsuitJanitor
backpack: ClothingBackpackFilled
jumpsuit: ClothingUniformJumpsuitJanitor
back: ClothingBackpackFilled
shoes: ClothingShoesGaloshes
head: ClothingHeadHatPurplesoft
idcard: JanitorPDA
id: JanitorPDA
ears: ClothingHeadsetService
belt: ClothingBeltJanitorFilled
innerclothingskirt: ClothingUniformJumpskirtJanitor

6
Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
View File

@@ -13,8 +13,8 @@
- type: startingGear
id: MimeGear
equipment:
innerclothing: ClothingUniformJumpsuitMime
backpack: ClothingBackpackMimeFilled
jumpsuit: ClothingUniformJumpsuitMime
back: ClothingBackpackMimeFilled
head: ClothingHeadHatBeret
belt: ClothingBeltSuspenders
gloves: ClothingHandsGlovesLatex
@@ -22,7 +22,7 @@
pocket1: CrayonMime
pocket2: Paper
mask: ClothingMaskMime
idcard: MimePDA
id: MimePDA
ears: ClothingHeadsetService
innerclothingskirt: ClothingUniformJumpskirtMime
satchel: ClothingBackpackSatchelFilled

8
Resources/Prototypes/Roles/Jobs/Command/captain.yml
View File

@@ -39,18 +39,18 @@
- Kitchen
- Chapel
- Hydroponics
- type: startingGear
id: CaptainGear
equipment:
innerclothing: ClothingUniformJumpsuitCaptain
backpack: ClothingBackpackCaptainFilled
jumpsuit: ClothingUniformJumpsuitCaptain
back: ClothingBackpackCaptainFilled
shoes: ClothingShoesColorBlack
head: ClothingHeadHatCaptain
eyes: ClothingEyesGlassesSunglasses
gloves: ClothingHandsGlovesCaptain
outerclothing: ClothingOuterHardsuitCap
idcard: CaptainPDA
id: CaptainPDA
ears: ClothingHeadsetAltCommand
innerclothingskirt: ClothingUniformJumpskirtCaptain
satchel: ClothingBackpackSatchelCaptainFilled

4
Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
View File

@@ -14,13 +14,13 @@
- type: startingGear
id: CentcomGear
equipment:
innerclothing: ClothingUniformJumpsuitCentcomOfficial
jumpsuit: ClothingUniformJumpsuitCentcomOfficial
shoes: ClothingShoesBootsJack
head: ClothingHeadHatCentcom
eyes: ClothingEyesGlassesSunglasses
gloves: ClothingHandsGlovesColorBlack
outerclothing: ClothingOuterVestKevlar
idcard: CentcomPDA
id: CentcomPDA
ears: ClothingHeadsetAltCommand
pocket1: Paper
pocket2: Pen

6
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
View File

@@ -26,11 +26,11 @@
- type: startingGear
id: HoPGear
equipment:
innerclothing: ClothingUniformJumpsuitHoP
backpack: ClothingBackpackFilled
jumpsuit: ClothingUniformJumpsuitHoP
back: ClothingBackpackFilled
shoes: ClothingShoesColorBrown
head: ClothingHeadHatHopcap
idcard: HoPPDA
id: HoPPDA
ears: ClothingHeadsetAltCommand
innerclothingskirt: ClothingUniformJumpskirtHoP
satchel: ClothingBackpackSatchelFilled

6
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View File

@@ -21,10 +21,10 @@
id: ChiefEngineerGear
equipment:
head: ClothingHeadHatHardhatWhite
innerclothing: ClothingUniformJumpsuitChiefEngineer
backpack: ClothingBackpackEngineeringFilled
jumpsuit: ClothingUniformJumpsuitChiefEngineer
back: ClothingBackpackEngineeringFilled
shoes: ClothingShoesColorBrown
idcard: CEPDA
id: CEPDA
ears: ClothingHeadsetEngineering
belt: ClothingBeltChiefEngineerFilled
innerclothingskirt: ClothingUniformJumpskirtChiefEngineer

6
Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
View File

@@ -15,11 +15,11 @@
id: StationEngineerGear
equipment:
head: ClothingHeadHatHardhatYellow
innerclothing: ClothingUniformJumpsuitEngineering
backpack: ClothingBackpackEngineeringFilled
jumpsuit: ClothingUniformJumpsuitEngineering
back: ClothingBackpackEngineeringFilled
shoes: ClothingShoesBootsWork
outerclothing: ClothingOuterVestHazard
idcard: EngineerPDA
id: EngineerPDA
belt: ClothingBeltUtilityFilled
ears: ClothingHeadsetEngineering
innerclothingskirt: ClothingUniformJumpskirtEngineering

8
Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
View File

@@ -10,15 +10,15 @@
- Medical
- Chemistry
- Maintenance
- type: startingGear
id: ChemistGear
equipment:
innerclothing: ClothingUniformJumpsuitChemistry
backpack: ClothingBackpackChemistryFilled
jumpsuit: ClothingUniformJumpsuitChemistry
back: ClothingBackpackChemistryFilled
shoes: ClothingShoesColorWhite
outerclothing: ClothingOuterCoatLabChem
idcard: ChemistryPDA
id: ChemistryPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedical
pocket1: HandLabeler

6
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
View File

@@ -22,11 +22,11 @@
- type: startingGear
id: CMOGear
equipment:
innerclothing: ClothingUniformJumpsuitCMO
backpack: ClothingBackpackMedicalFilled
jumpsuit: ClothingUniformJumpsuitCMO
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesColorBrown
outerclothing: ClothingOuterCoatLabCmo
idcard: CMOPDA
id: CMOPDA
ears: ClothingHeadsetAltMedical
belt: ClothingBeltMedical
innerclothingskirt: ClothingUniformJumpskirtCMO

6
Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
View File

@@ -13,11 +13,11 @@
- type: startingGear
id: DoctorGear
equipment:
innerclothing: ClothingUniformJumpsuitMedicalDoctor
backpack: ClothingBackpackMedicalFilled
jumpsuit: ClothingUniformJumpsuitMedicalDoctor
back: ClothingBackpackMedicalFilled
shoes: ClothingShoesColorWhite
outerclothing: ClothingOuterCoatLab
idcard: MedicalPDA
id: MedicalPDA
ears: ClothingHeadsetMedical
belt: ClothingBeltMedical
innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor

6
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
View File

@@ -19,11 +19,11 @@
- type: startingGear
id: ResearchDirectorGear
equipment:
innerclothing: ClothingUniformJumpsuitResearchDirector
backpack: ClothingBackpackScienceFilled
jumpsuit: ClothingUniformJumpsuitResearchDirector
back: ClothingBackpackScienceFilled
shoes: ClothingShoesColorBrown
outerclothing: ClothingOuterCoatLab
idcard: RnDPDA
id: RnDPDA
ears: ClothingHeadsetScience
innerclothingskirt: ClothingUniformJumpskirtResearchDirector
satchel: ClothingBackpackSatchelScienceFilled

6
Resources/Prototypes/Roles/Jobs/Science/scientist.yml
View File

@@ -13,11 +13,11 @@
- type: startingGear
id: ScientistGear
equipment:
innerclothing: ClothingUniformJumpsuitScientist
backpack: ClothingBackpackScienceFilled
jumpsuit: ClothingUniformJumpsuitScientist
back: ClothingBackpackScienceFilled
shoes: ClothingShoesColorWhite
outerclothing: ClothingOuterCoatLab
idcard: SciencePDA
id: SciencePDA
ears: ClothingHeadsetScience
innerclothingskirt: ClothingUniformJumpskirtScientist
satchel: ClothingBackpackSatchelScienceFilled

6
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View File

@@ -22,13 +22,13 @@
- type: startingGear
id: HoSGear
equipment:
innerclothing: ClothingUniformJumpsuitHoS
backpack: ClothingBackpackSecurityFilled
jumpsuit: ClothingUniformJumpsuitHoS
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsJack
outerclothing: ClothingOuterCoatHoSTrench
eyes: ClothingEyesGlassesSecurity
head: ClothingHeadHatBeretHoS
idcard: HoSPDA
id: HoSPDA
ears: ClothingHeadsetAltSecurity
belt: ClothingBeltSecurityFilled
innerclothingskirt: ClothingUniformJumpskirtHoS

6
Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
View File

@@ -15,13 +15,13 @@
- type: startingGear
id: SecurityOfficerGear
equipment:
innerclothing: ClothingUniformJumpsuitSec
backpack: ClothingBackpackSecurityFilled
jumpsuit: ClothingUniformJumpsuitSec
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsJack
eyes: ClothingEyesGlassesSecurity
head: ClothingHeadHelmetHelmetOld
outerclothing: ClothingOuterVestKevlar
idcard: SecurityPDA
id: SecurityPDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
innerclothingskirt: ClothingUniformJumpskirtSec

6
Resources/Prototypes/Roles/Jobs/Security/warden.yml
View File

@@ -17,12 +17,12 @@
id: WardenGear
equipment:
head: ClothingHeadHatWarden
innerclothing: ClothingUniformJumpsuitWarden
backpack: ClothingBackpackSecurityFilled
jumpsuit: ClothingUniformJumpsuitWarden
back: ClothingBackpackSecurityFilled
shoes: ClothingShoesBootsJack
eyes: ClothingEyesGlassesSecurity
outerclothing: ClothingOuterCoatWarden
idcard: WardenPDA
id: WardenPDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltSecurityFilled
innerclothingskirt: ClothingUniformJumpskirtWarden