Add Botanist, Warden, Quartermaster and Chaplain (#2402)

* Add Botanist, Warden and Quartermaster

* QM ID card, warden sprite state

* Add missing sprites

* Chaplain + some fixes

* typo fix

* capitalization

* copyrihgght

* add spawnpoints

Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml

@@ -62,7 +62,7 @@
   parent: UniformBase
   id: UniformAssistant
   name: assistant jumpsuit
-  desciption: It's a generic grey jumpsuit. That's about what assistants are worth, anyway.
+  description: It's a generic grey jumpsuit. That's about what assistants are worth, anyway.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_assistant.rsi
@@ -75,7 +75,7 @@
   parent: UniformBase
   id: UniformChemistry
   name: chemistry jumpsuit
-  desciption: There's some odd stains on this jumpsuit. Hm.
+  description: There's some odd stains on this jumpsuit. Hm.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
@@ -89,7 +89,7 @@
   parent: UniformChemistry
   id: UniformChemistrySkirt
   name: chemistry jumpskirt
-  desciption: A sterile jumpskirt in Chemistry colors.
+  description: A sterile jumpskirt in Chemistry colors.
   components:
   - type: Sprite
     state: chemistry_skirt
@@ -102,7 +102,7 @@
   parent: UniformBase
   id: UniformParamedic
   name: paramedic jumpsuit
-  desciption: It's got a red plus on it, that's a good thing right?
+  description: It's got a red plus on it, that's a good thing right?
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
@@ -116,7 +116,7 @@
   parent: UniformParamedic
   id: UniformParamedicSkirt
   name: paramedic jumpskirt
-  desciption: A sterile jumpskirt in Paramedic colors.
+  description: A sterile jumpskirt in Paramedic colors.
   components:
   - type: Sprite
     state: paramedic_skirt
@@ -129,7 +129,7 @@
   parent: UniformBase
   id: UniformScrubsPurple
   name: purple scrubs
-  desciption: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
@@ -143,7 +143,7 @@
   parent: UniformBase
   id: UniformScrubsGreen
   name: green scrubs
-  desciption: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
@@ -157,7 +157,7 @@
   parent: UniformBase
   id: UniformScrubsBlue
   name: blue scrubs
-  desciption: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
+  description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_medical.rsi
@@ -362,7 +362,7 @@
   parent: UniformCargoTech
   id: UniformCargoTechSkirt
   name: cargo tech jumpskirt
-  desciption: A sturdy jumpskirt, issued to members of the Cargo department.
+  description: A sturdy jumpskirt, issued to members of the Cargo department.
   components:
   - type: Sprite
     state: cargo_skirt
@@ -374,7 +374,7 @@
 - type: entity
   parent: UniformBase
   id: UniformQM
-  name: qm jumpsuit
+  name: quartermaster's jumpsuit
   description: 'What can brown do for you?'
   components:
   - type: Sprite
@@ -387,8 +387,8 @@
 - type: entity
   parent: UniformQM
   id: UniformQMSkirt
-  name: qm jumpskirt
-  desciption: 'What can brown do for you?'
+  name: quartermaster's jumpskirt
+  description: 'What can brown do for you?'
   components:
   - type: Sprite
     state: qm_skirt
@@ -414,7 +414,7 @@
   parent: UniformChef
   id: UniformChefSkirt
   name: chef skirt
-  desciption: Can't cook without this.
+  description: Can't cook without this.
   components:
   - type: Sprite
     state: chef_skirt
@@ -453,7 +453,7 @@
   parent: UniformChiefEngineer
   id: UniformChiefEngineerSkirt
   name: ce jumpskirt
-  desciption: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+  description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
   components:
   - type: Sprite
     state: chief_skirt
@@ -479,7 +479,7 @@
   parent: UniformCMO
   id: UniformCMOSkirt
   name: cmo jumpskirt
-  desciption: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
   components:
   - type: Sprite
     state: cmo_skirt
@@ -505,7 +505,7 @@
   parent: UniformMedicalDoctor
   id: UniformMedicalDoctorSkirt
   name: medical doctor jumpskirt
-  desciption: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
+  description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
   components:
   - type: Sprite
     state: medical_skirt
@@ -531,7 +531,7 @@
   parent: UniformScientist
   id: UniformScientistSkirt
   name: scientist jumpskirt
-  desciption: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+  description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
   components:
   - type: Sprite
     state: sci_skirt
@@ -543,7 +543,7 @@
 - type: entity
   parent: UniformBase
   id: UniformResearchDirector
-  name: rd turtleneck
+  name: research director's turtleneck
   description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
   components:
   - type: Sprite
@@ -556,8 +556,8 @@
 - type: entity
   parent: UniformResearchDirector
   id: UniformResearchDirectorSkirt
-  name: rd skirtleneck
-  desciption: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+  name: research director's skirtleneck
+  description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
   components:
   - type: Sprite
     state: rnd_skirt
@@ -583,7 +583,7 @@
   parent: UniformMime
   id: UniformMimeSkirt
   name: mime skirt
-  desciption: ...
+  description: ...
   components:
   - type: Sprite
     state: mime_skirt
@@ -592,6 +592,32 @@
     ClothingPrefix: mime_skirt
     femaleMask: UniformTop
 
+- type: entity
+  parent: UniformBase
+  id: UniformChaplain
+  name: chaplain's jumpsuit
+  description: It's a black jumpsuit, often worn by religious folk.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/uniform_chaplain.rsi
+      state: icon
+
+    - type: Clothing
+      sprite: Clothing/Uniforms/uniform_chaplain.rsi
+
+- type: entity
+  parent: UniformChaplain
+  id: UniformChaplainSkirt
+  name: chaplain's jumpskirt
+  description: It's a black jumpskirt. If you wear this, you probably need religious help more than you will be providing it.
+  components:
+    - type: Sprite
+      state: chaplain_skirt
+
+    - type: Clothing
+      ClothingPrefix: chaplain_skirt
+      femaleMask: UniformTop
+
 - type: entity
   parent: UniformBase
   id: UniformHoSAlt
@@ -610,7 +636,7 @@
   parent: UniformHoSAlt
   id: UniformHoSAltSkirt
   name: head of security skirtleneck
-  desciption: It's a skirtleneck worn by those who were strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
+  description: It's a skirtleneck worn by those who were strong and disciplined enough to achieve the position of Head of Security. Its sturdy fabric provides minor protection from mechanical damage.
   components:
   - type: Sprite
     state: hosalt_skirt
@@ -638,7 +664,7 @@
   parent: UniformHoS
   id: UniformHoSSkirt
   name: head of security jumpskirt
-  desciption: It's bright red and rather crisp, much like security's victims tend to be.
+  description: It's bright red and rather crisp, much like security's victims tend to be.
   components:
   - type: Sprite
     state: hos_skirt
@@ -713,7 +739,7 @@
 - type: entity
   parent: UniformBase
   id: UniformWarden
-  name: security suit
+  name: warden's uniform
   description: A formal security suit for officers complete with Nanotrasen belt buckle.
   components:
   - type: Sprite
@@ -792,7 +818,7 @@
   parent: UniformPrisoner
   id: UniformPrisonerSkirt
   name: prisoner jumpskirt
-  desciption: Busted.
+  description: Busted.
   components:
   - type: Sprite
     state: prisoner_skirt
@@ -805,7 +831,7 @@
   parent: UniformBase
   id: UniformHoP
   name: hop jumpsuit
-  desciption: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
+  description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hop.rsi
@@ -818,7 +844,7 @@
   parent: UniformHoP
   id: UniformHoPSkirt
   name: hop jumpskirt
-  desciption: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
+  description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
   components:
   - type: Sprite
     state: hop_skirt
@@ -831,7 +857,7 @@
   parent: UniformBase
   id: UniformHydroponics
   name: hydroponics jumpsuit
-  desciption: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
+  description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/uniform_hydro.rsi
@@ -844,7 +870,7 @@
   parent: UniformHydroponics
   id: UniformHydroponicsSkirt
   name: hydroponics jumpskirt
-  desciption: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
+  description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled.
   components:
   - type: Sprite
     state: hydro_skirt
@@ -870,7 +896,7 @@
   parent: UniformBartender
   id: UniformBartenderSkirt
   name: bartender's skirt
-  desciption: A nice and tidy skirt. Shame about the bar though.
+  description: A nice and tidy skirt. Shame about the bar though.
   components:
   - type: Sprite
     state: skirt
@@ -883,7 +909,7 @@
   parent: UniformBartender
   id: UniformBartenderPurple
   name: purple bartender's uniform
-  desciption: A special purple outfit to serve drinks.
+  description: A special purple outfit to serve drinks.
   components:
   - type: Sprite
     state: purple

Resources/Prototypes/Entities/Effects/Markers/spawn_points_jobs.yml

@@ -18,6 +18,16 @@
   - type: Sprite
     state: Assistant
 
+# Quartermaster
+- type: entity
+  id: SpawnPointQuartermaster
+  parent: SpawnPointJobBase
+  name: spawn point (quartermaster)
+  components:
+    - type: SpawnPoint
+      job_id: Quartermaster
+    - type: Sprite
+      state: Quartermaster
 
 # Cargo tech
 - type: entity
@@ -43,7 +53,7 @@
     state: Bartender
 
 
-# Bartender
+# Chef
 - type: entity
   id: SpawnPointChef
   parent: SpawnPointJobBase
@@ -54,6 +64,16 @@
   - type: Sprite
     state: Cook
 
+# Botanist
+- type: entity
+  id: SpawnPointBotanist
+  parent: SpawnPointJobBase
+  name: spawn point (botanist)
+  components:
+    - type: SpawnPoint
+      job_id: Botanist
+    - type: Sprite
+      state: Botanist
 
 # Clown
 - type: entity
@@ -78,6 +98,16 @@
   - type: Sprite
     state: Mime
 
+# Chaplain
+- type: entity
+  id: SpawnPointChaplain
+  parent: SpawnPointJobBase
+  name: spawn point (chaplain)
+  components:
+    - type: SpawnPoint
+      job_id: Chaplain
+    - type: Sprite
+      state: Chaplain
 
 # Janitor
 - type: entity
@@ -198,6 +228,16 @@
   - type: Sprite
     state: Head of Security
 
+# Warden
+- type: entity
+  id: SpawnPointWarden
+  parent: SpawnPointJobBase
+  name: spawn point (warden)
+  components:
+    - type: SpawnPoint
+      job_id: Warden
+    - type: Sprite
+      state: Warden
 
 # SecurityOfficer
 - type: entity

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -52,6 +52,21 @@
   - type: Icon
     state: pda-cook
 
+- type: entity
+  name: Botanist PDA
+  parent: BasePDA
+  id: BotanistPDA
+  description: Has an earthy scent.
+  components:
+  - type: PDA
+    idCard: BotanistIDCard
+  - type: Appearance
+    visuals:
+      - type: PDAVisualizer
+        state: pda-hydro
+  - type: Icon
+    state: pda-hydro
+
 - type: entity
   name: Clown PDA
   parent: BasePDA
@@ -90,21 +105,35 @@
   - type: Icon
     state: pda-mime
 
-# TODO: uncomment this when the QM job gets added
-#- type: entity
-#  name: Quartermaster PDA
-#  parent: BasePDA
-#  id: QuartermasterPDA
-#  description: PDA for the guy that orders the guns.
-#  components:
-#    - type: PDA
-#      idCard: QuartermasterIDCard
-#    - type: Appearance
-#      visuals:
-#        - type: PDAVisualizer
-#          state: pda-qm
-#    - type: Icon
-#      state: pda-qm
+- type: entity
+  name: Chaplain PDA
+  parent: BasePDA
+  id: ChaplainPDA
+  description: God's chosen PDA.
+  components:
+    - type: PDA
+      idCard: ChaplainIDCard
+    - type: Appearance
+      visuals:
+        - type: PDAVisualizer
+          state: pda-chaplain
+    - type: Icon
+      state: pda-chaplain
+
+- type: entity
+  name: Quartermaster PDA
+  parent: BasePDA
+  id: QuartermasterPDA
+  description: PDA for the guy that orders the guns.
+  components:
+    - type: PDA
+      idCard: QuartermasterIDCard
+    - type: Appearance
+      visuals:
+        - type: PDAVisualizer
+          state: pda-qm
+    - type: Icon
+      state: pda-qm
 
 - type: entity
   name: Cargo PDA
@@ -292,21 +321,20 @@
   - type: Icon
     state: pda-hos
 
-# TODO: Uncomment this when the Warden job gets added
-#- type: entity
-#  name: Warden PDA
-#  parent: BasePDA
-#  id: WardenPDA
-#  description: The OS appears to have been jailbroken.
-#  components:
-#    - type: PDA
-#      idCard: WardenIDCard
-#    - type: Appearance
-#      visuals:
-#        - type: PDAVisualizer
-#          state: pda-warden
-#    - type: Icon
-#      state: pda-warden
+- type: entity
+  name: Warden PDA
+  parent: BasePDA
+  id: WardenPDA
+  description: The OS appears to have been jailbroken.
+  components:
+    - type: PDA
+      idCard: WardenIDCard
+    - type: Appearance
+      visuals:
+        - type: PDAVisualizer
+          state: pda-warden
+    - type: Icon
+      state: pda-warden
 
 - type: entity
   name: Security PDA

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -62,6 +62,20 @@
   - type: PresetIdCard
     job: SecurityOfficer
 
+- type: entity
+  parent: IDCardStandard
+  id: WardenIDCard
+  name: warden ID card
+  components:
+    - type: Sprite
+      layers:
+        - state: default
+        - state: assigned
+        - state: idwarden
+
+    - type: PresetIdCard
+      job: Warden
+
 - type: entity
   parent: IDCardStandard
   id: EngineeringIDCard
@@ -104,6 +118,20 @@
   - type: PresetIdCard
     job: CargoTechnician
 
+- type: entity
+  parent: IDCardStandard
+  id: QuartermasterIDCard
+  name: quartermaster ID card
+  components:
+    - type: Sprite
+      layers:
+        - state: default
+        - state: assigned
+        - state: idquartermaster
+
+    - type: PresetIdCard
+      job: Quartermaster
+
 - type: entity
   parent: IDCardStandard
   id: ResearchIDCard
@@ -146,6 +174,20 @@
   - type: PresetIdCard
     job: Mime
 
+- type: entity
+  parent: IDCardStandard
+  id: ChaplainIDCard
+  name: chaplain ID card
+  components:
+    - type: Sprite
+      layers:
+        - state: default
+        - state: assigned
+        - state: idchaplain
+
+    - type: PresetIdCard
+      job: Chaplain
+
 - type: entity
   parent: IDCardStandard
   id: JanitorIDCard
@@ -188,6 +230,21 @@
   - type: PresetIdCard
     job: Chef
 
+- type: entity
+  parent: IDCardStandard
+  id: BotanistIDCard
+  name: botanist ID card
+  components:
+    - type: Sprite
+      layers:
+        - state: default
+        - state: assigned
+        - state: idbotanist
+
+    - type: PresetIdCard
+      job: Botanist
+
+
 - type: entity
   parent: IDCardStandard
   id: HoPIDCard

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -0,0 +1,22 @@
+- type: job
+  id: Quartermaster
+  name: "quartermaster"
+  positions: 1
+  spawnPositions: 1
+  startingGear: QuartermasterGear
+  department:
+  - Cargo
+  icon: "QuarterMaster"
+  access:
+  - Cargo
+  - Quartermaster
+  - Maintenance
+
+- type: startingGear
+  id: QuartermasterGear
+  equipment:
+    innerclothing: UniformQM
+    backpack: BackpackClothingFilled
+    shoes: ShoesBrown
+    idcard: QuartermasterPDA
+    ears: HeadsetCargo

Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml

@@ -0,0 +1,22 @@
+- type: job
+  id: Botanist
+  name: "botanist"
+  positions: 2
+  spawnPositions: 2
+  startingGear: BotanistGear
+  department:
+  - Civilian
+  icon: "Botanist"
+  access:
+  - Service
+  - Hydroponics
+  - Maintenance
+
+- type: startingGear
+  id: BotanistGear
+  equipment:
+    innerclothing: UniformHydroponics
+    backpack: BackpackClothingFilled
+    shoes: ShoesBrown
+    idcard: BotanistPDA
+    ears: HeadsetService

Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml

@@ -0,0 +1,20 @@
+- type: job
+  id: Chaplain
+  name: "chaplain"
+  positions: 1
+  startingGear: ChaplainGear
+  department:
+  - Civilian
+  icon: "Chaplain"
+  access:
+  - Chapel
+  - Maintenance
+
+- type: startingGear
+  id: ChaplainGear
+  equipment:
+    innerclothing: UniformChaplain
+    backpack: BackpackClothing
+    shoes: ShoesBlack
+    idcard: ChaplainPDA
+    ears: HeadsetService

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -0,0 +1,25 @@
+- type: job
+  id: Warden
+  name: "warden"
+  positions: 1
+  spawnPositions: 1
+  startingGear: WardenGear
+  department:
+  - Security
+  icon: "Warden"
+  access:
+  - Security
+  - Brig
+  - Maintenance
+  - Service
+
+- type: startingGear
+  id: WardenGear
+  equipment:
+    innerclothing: UniformWarden
+    backpack: SecPackFilled
+    shoes: ShoesJackboots
+    eyes: SecGlasses
+    outerclothing: OuterclothingArmorVest
+    idcard: WardenPDA
+    ears: HeadsetSecurity

Resources/Textures/Clothing/Uniforms/uniform_chaplain.rsi/meta.json

@@ -0,0 +1,101 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/commit/f2a314f575fd3ed9c6abf3b2cada6ebf5a8c1a4b",
+    "states": [
+        {
+            "name": "chaplain_skirt-equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "chaplain_skirt",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        }
+    ]
+}