diff --git a/baystation12.dme b/baystation12.dme
index ce8bb91b34..c82f08c0d5 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -447,7 +447,7 @@
#include "code\game\jobs\jobs.dm"
#include "code\game\jobs\whitelist.dm"
#include "code\game\jobs\job\assistant.dm"
-#include "code\game\jobs\job\captian.dm"
+#include "code\game\jobs\job\captain.dm"
#include "code\game\jobs\job\civilian.dm"
#include "code\game\jobs\job\civilian_chaplain.dm"
#include "code\game\jobs\job\engineering.dm"
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index 89c5a1773d..9054cbe597 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -170,7 +170,6 @@
return 1
if(special_action())
return 1
-
return 0
proc/consume_air()
@@ -184,6 +183,7 @@
if(temperature > T0C+200)
health -= 0.01 * temperature
update()
+
proc/expand(var/turf/T = null)
if(!prob(health)) return//TODO: Change this to prob(health + o2 mols or such)
if(!T)
diff --git a/code/game/jobs/job/captian.dm b/code/game/jobs/job/captain.dm
similarity index 97%
rename from code/game/jobs/job/captian.dm
rename to code/game/jobs/job/captain.dm
index 60e68e43d1..e1fa773119 100644
--- a/code/game/jobs/job/captian.dm
+++ b/code/game/jobs/job/captain.dm
@@ -1,52 +1,52 @@
-/datum/job/captain
- title = "Captain"
- flag = CAPTAIN
- department_flag = ENGSEC
- faction = "Station"
- total_positions = 1
- spawn_positions = 1
- supervisors = "Nanotrasen officials and Space law"
-
-
- equip(var/mob/living/carbon/human/H)
- if(!H) return 0
- H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears)
- H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
- H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform)
- H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt)
- H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
- H.equip_if_possible(new /obj/item/clothing/head/caphat(H), H.slot_head)
- H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses)
- H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack)
- var/datum/organ/external/O = H.organs[pick(H.organs)]
- var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(O)
- O.implant += L
- L.imp_in = H
- L.implanted = 1
- world << "[H.real_name] is the captain!"
- return 1
-
-
-
-/datum/job/hop
- title = "Head of Personnel"
- flag = HOP
- department_flag = CIVILIAN
- faction = "Station"
- total_positions = 1
- spawn_positions = 1
- supervisors = "the captain"
-
-
- equip(var/mob/living/carbon/human/H)
- if(!H) return 0
- H.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(H), H.slot_ears)
- H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
- H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(H), H.slot_w_uniform)
- H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
- H.equip_if_possible(new /obj/item/device/pda/heads/hop(H), H.slot_belt)
- H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
- H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head)
- H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack)
- H.equip_if_possible(new /obj/item/clothing/gloves/blue(H), H.slot_gloves)
- return 1
+/datum/job/captain
+ title = "Captain"
+ flag = CAPTAIN
+ department_flag = ENGSEC
+ faction = "Station"
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "Nanotrasen officials and Space law"
+
+
+ equip(var/mob/living/carbon/human/H)
+ if(!H) return 0
+ H.equip_if_possible(new /obj/item/device/radio/headset/heads/captain(H), H.slot_ears)
+ H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+ H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform)
+ H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt)
+ H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
+ H.equip_if_possible(new /obj/item/clothing/head/caphat(H), H.slot_head)
+ H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses)
+ H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack)
+ var/datum/organ/external/O = H.organs[pick(H.organs)]
+ var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(O)
+ O.implant += L
+ L.imp_in = H
+ L.implanted = 1
+ world << "[H.real_name] is the captain!"
+ return 1
+
+
+
+/datum/job/hop
+ title = "Head of Personnel"
+ flag = HOP
+ department_flag = CIVILIAN
+ faction = "Station"
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "the captain"
+
+
+ equip(var/mob/living/carbon/human/H)
+ if(!H) return 0
+ H.equip_if_possible(new /obj/item/device/radio/headset/heads/hop(H), H.slot_ears)
+ H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back)
+ H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(H), H.slot_w_uniform)
+ H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes)
+ H.equip_if_possible(new /obj/item/device/pda/heads/hop(H), H.slot_belt)
+ H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
+ H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head)
+ H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_in_backpack)
+ H.equip_if_possible(new /obj/item/clothing/gloves/blue(H), H.slot_gloves)
+ return 1
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 769ee4ec8d..c7945cda4f 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -49,7 +49,7 @@
H.equip_if_possible(new /obj/item/clothing/under/rank/warden(H), H.slot_w_uniform)
H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes)
H.equip_if_possible(new /obj/item/device/pda/security(H), H.slot_belt)
- H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit)
+ H.equip_if_possible(new /obj/item/clothing/suit/armor/vest/warden(H), H.slot_wear_suit)
H.equip_if_possible(new /obj/item/clothing/head/helmet/warden(H), H.slot_head)
H.equip_if_possible(new /obj/item/clothing/gloves/red(H), H.slot_gloves)
H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses)
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 05f5c5cf26..4cb984c2a1 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -13,6 +13,11 @@
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
+/obj/item/clothing/suit/armor/vest/warden
+ name = "Warden's jacket"
+ desc = "An armoured jacket with silver rank pips and livery."
+ icon_state = "warden_jacket"
+ item_state = "armor"
/obj/item/clothing/suit/armor/riot
name = "Riot Suit"