Added filled wardrobes for most jobs (#5946)

* Added filled wardrobes for most jobs

* Updated based on feedback from mirrorcult

* Readded accidentally deleted cult helmet and maybe test won't fail now 🙏

* Added PietyVend

* Fixed stray pixel

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Rane
2022-01-01 12:08:57 -05:00
committed by GitHub
parent a9266199de
commit f186ffe571
9 changed files with 255 additions and 42 deletions

View File

@@ -1,7 +1,17 @@
# - type: entity
# id: WardrobePrisonFilled
# suffix: Filled
# parent: WardrobePrison
- type: entity
id: WardrobePrisonFilled
suffix: Filled
parent: WardrobePrison
description: "Contains a selection of nice orange clothes for people enjoying their stay in the brig."
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitPrisoner
amount: 2
- id: ClothingUniformJumpskirtPrisoner
amount: 2
- id: ClothingShoesColorBlack
amount: 2
#- type: entity
# id: WardrobePajamaFilled
@@ -14,10 +24,24 @@
# suffix: Filled
# parent: WardrobeRobotics
# - type: entity
# id: WardrobeChemistryFilled
# suffix: Filled
# parent: WardrobeChemistry
- type: entity
id: WardrobeChemistryFilled
suffix: Filled
parent: WardrobeChemistry
description: "The sleek orange threads contained within make you much less likely to be thrown out of the chemistry lab."
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitChemistry
amount: 1
- id: ClothingBackpackChemistry
amount: 1
- id: ClothingShoesColorWhite
amount: 1
- id: ClothingOuterCoatLabChem
amount: 1
- id: ClothingUniformJumpskirtChemistry
amount: 1
# - type: entity
# id: WardrobeGeneticsFilled
@@ -29,47 +53,159 @@
# suffix: Filled
# parent: WardrobeVirology
# - type: entity
# id: WardrobeScienceFilled
# suffix: Filled
# parent: WardrobeScience
- type: entity
id: WardrobeScienceFilled
suffix: Filled
parent: WardrobeScience
description: "You've read a couple pop science articles, now it's time for the real deal."
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitScientist
amount: 1
- id: ClothingBackpackScience
amount: 1
- id: ClothingShoesColorWhite
amount: 1
- id: ClothingOuterCoatLab
amount: 1
- id: ClothingUniformJumpskirtScientist
amount: 1
- id: ClothingEyesGlasses
prob: 0.5
- id: CrowbarRed #The jojoke - hit video game Half-Life
prob: 0.1
# - type: entity
# id: WardrobeBotanistFilled
# suffix: Filled
# parent: WardrobeBotanist
# - type: entity
# id: WardrobeMedicalDoctorFilled
# suffix: Filled
# parent: WardrobeMedicalDoctor
# components:
# - type: StorageFill
# contents:
# - id: ClothingHandsGlovesLatex
# prob: 0.4
- type: entity
id: WardrobeBotanistFilled
suffix: Filled
parent: WardrobeBotanist
description: "Plant yourself among the plant men with these 100% natural plant-derived clothes."
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitHydroponics
amount: 1
- id: ClothingBackpackHydroponics
amount: 1
- id: ClothingShoesColorBrown
amount: 1
- id: ClothingOuterApronBotanist
amount: 1
- id: ClothingUniformJumpskirtHydroponics
amount: 1
- id: ClothingUniformOveralls
amount: 1
- id: ClothingHeadHatTrucker #the hat itself is a subtle joke
prob: 0.15
- id: ClothingHandsGlovesLeather
prob: 0.5
# - type: entity
# id: WardrobeChapelFilled
# suffix: Filled
# parent: WardrobeChapel
- type: entity
id: WardrobeMedicalDoctorFilled
suffix: Filled
parent: WardrobeMedicalDoctor
description: "We've all played doctor before, now practice medicine."
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitMedicalDoctor
amount: 1
- id: ClothingBackpackMedical
amount: 1
- id: ClothingShoesColorWhite
amount: 1
- id: ClothingOuterCoatLab
amount: 1
- id: ClothingUniformJumpskirtMedicalDoctor
amount: 1
- id: ClothingHandsGlovesLatex
prob: 0.4
- id: ClothingEyesGlasses
prob: 0.3
# - type: entity
# id: WardrobeSecurityFilled
# suffix: Filled
# parent: WardrobeSecurity
- type: entity
id: WardrobeChapelFilled
suffix: Filled
parent: WardrobeChapel
description: "You have to look presentable for your flock."
components:
- type: StorageFill
contents: # todo chaplain backpack
- id: ClothingUniformJumpsuitChaplain
amount: 1
- id: ClothingShoesColorBlack
amount: 1
- id: ClothingUniformJumpskirtChaplain
amount: 1
- type: entity
id: WardrobeSecurityFilled
suffix: Filled
parent: WardrobeSecurity
description: "Cross the thin red line."
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitSec
amount: 1
- id: ClothingBackpackSecurity
amount: 1
- id: ClothingShoesBootsJack
amount: 1
- id: ClothingEyesGlassesSecurity
amount: 1
- id: ClothingHeadHelmetHelmetOld
amount: 1
- id: ClothingOuterVestKevlar
amount: 1
- id: ClothingUniformJumpskirtSec
amount: 1
- type: entity
id: WardrobeCargoFilled
suffix: Filled
parent: WardrobeCargo
description: "This locker? Maybe 500 credits. Brotherhood? Priceless."
components:
- type: StorageFill
contents:
- id: ClothingHeadHatCargosoft
amount: 1
- id: ClothingUniformJumpsuitCargo
amount: 1
- id: ClothingBackpack
amount: 1
- id: ClothingShoesColorBlack
amount: 1
- id: ClothingUniformJumpskirtCargo
amount: 1
# - type: entity
# id: WardrobeCargoFilled
# suffix: Filled
# parent: WardrobeCargo
# - type: entity
# id: WardrobeAtmosphericsFilled
# suffix: Filled
# parent: WardrobeAtmospherics
# - type: entity
# id: WardrobeEngineeringFilled
# suffix: Filled
# parent: WardrobeEngineering
- type: entity
id: WardrobeEngineeringFilled
suffix: Filled
parent: WardrobeEngineering
description: "This locker contains a uniform for engineering or social engineering."
components:
- type: StorageFill
contents:
- id: ClothingHeadHatHardhatYellow
amount: 1
- id: ClothingUniformJumpsuitEngineering
amount: 1
- id: ClothingBackpackEngineering
amount: 1
- id: ClothingShoesBootsWork
amount: 1
- id: ClothingOuterVestHazard
amount: 1
- id: ClothingUniformJumpskirtEngineering
amount: 1

View File

@@ -9,4 +9,9 @@
ClothingOuterArmorCult: 1
ClothingHeadHatHoodChaplainHood: 1
ClothingHeadHatHoodCulthood: 1
ClothingHeadHatHoodNunHood: 1
ClothingHeadHatFez: 1
ClothingHeadHatPlaguedoctor: 1
ClothingHeadHatWitch: 1
ClothingHeadHatWitch1: 1
ClothingHeadHelmetCult: 1

View File

@@ -171,6 +171,37 @@
energy: 1.3
color: "#ffb0b0"
- type: entity
parent: VendingMachine
id: VendingMachineChapel
name: PietyVend
components:
- type: VendingMachine
pack: PietyVendInventory
- type: Sprite
sprite: Structures/Machines/VendingMachines/chapel.rsi
layers:
- state: "off"
map: ["enum.VendingMachineVisualLayers.Unlit"]
- state: "off"
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
shader: unshaded
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: AccessReader
access: [["Chapel"]]
- type: Appearance
visuals:
- type: VendingMachineVisualizer
normalUnshaded: true
denyUnshaded: true
broken: true
- type: WiresVisualizer
- type: PointLight
radius: 1.5
energy: 1.6
color: "#CCCCCC" #The holy C
- type: entity
parent: VendingMachine
id: VendingMachineCigs

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications & derivate works under the same license.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "deny-unshaded",
"delays": [
[
0.25,
0.1,
0.1
]
]
},
{
"name": "normal-unshaded",
"delays": [
[
10,
0.1,
10,
0.1
]
]
},
{
"name": "off"
},
{
"name": "broken"
},
{
"name": "panel"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B