diff --git a/code/datums/outfits/jobs/science.dm b/code/datums/outfits/jobs/science.dm index a7b7a714783..307da0a8f99 100644 --- a/code/datums/outfits/jobs/science.dm +++ b/code/datums/outfits/jobs/science.dm @@ -39,4 +39,5 @@ pda_slot = slot_r_store pda_type = /obj/item/device/pda/roboticist backpack = /obj/item/weapon/storage/backpack - satchel_one = /obj/item/weapon/storage/backpack/satchel/norm \ No newline at end of file + satchel_one = /obj/item/weapon/storage/backpack/satchel/norm + suit = /obj/item/clothing/suit/storage/toggle/labcoat/roboticist \ No newline at end of file diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index 28bc8a8a54a..db51bcb8f99 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -186,4 +186,10 @@ name = "corgi hood" desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits." icon_state = "ian" - item_state_slots = list(slot_r_hand_str = "ian", slot_l_hand_str = "ian") //Does not exist -S2- \ No newline at end of file + item_state_slots = list(slot_r_hand_str = "ian", slot_l_hand_str = "ian") //Does not exist -S2- + +//Techpriest +/obj/item/clothing/head/hood/techpriest + name = "techpriest hood" + desc = "A techpriest hood." + icon_state = "techpriesthood" \ No newline at end of file diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index cff2cb9ac68..6ee01a78f16 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -362,4 +362,10 @@ /obj/item/weapon/tank, /obj/item/device/radio, /obj/item/weapon/pickaxe - ) \ No newline at end of file + ) + +/obj/item/clothing/suit/storage/hooded/techpriest + name = "techpriest robes" + desc = "For those who REALLY love their toasters." + icon_state = "techpriest" + hoodtype = /obj/item/clothing/head/hood/techpriest diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 7a968ae484a..18c399efbc7 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -33,12 +33,6 @@ icon_state = "orange_labcoat" item_state_slots = list(slot_r_hand_str = "orange_labcoat", slot_l_hand_str = "orange_labcoat") -/obj/item/clothing/suit/storage/toggle/labcoat/green - name = "green labcoat" - desc = "A suit that protects against minor chemical spills. This one is green." - icon_state = "green_labcoat" - item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") - /obj/item/clothing/suit/storage/toggle/labcoat/yellow name = "yellow labcoat" desc = "A suit that protects against minor chemical spills. This one is yellow." @@ -51,6 +45,18 @@ icon_state = "pink_labcoat" item_state_slots = list(slot_r_hand_str = "pink_labcoat", slot_l_hand_str = "pink_labcoat") +/obj/item/clothing/suit/storage/toggle/labcoat/green + name = "green labcoat" + desc = "A suit that protects against minor chemical spills. This one is green." + icon_state = "green_labcoat" + item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") + +/obj/item/clothing/suit/storage/toggle/labcoat/mad + name = "The Mad's labcoat" + desc = "It makes you look capable of konking someone on the noggin and shooting them into space." + icon_state = "green_labcoat" + item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") + /obj/item/clothing/suit/storage/toggle/labcoat/cmo name = "chief medical officer's labcoat" desc = "Bluer than the standard model." @@ -58,17 +64,11 @@ item_state_slots = list(slot_r_hand_str = "cmo_labcoat", slot_l_hand_str = "cmo_labcoat") /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt - name = "chief medical officer labcoat" + name = "chief medical officer's labcoat" desc = "A labcoat with command blue highlights." icon_state = "labcoat_cmoalt" item_state_slots = list(slot_r_hand_str = "cmo_labcoat", slot_l_hand_str = "cmo_labcoat") -/obj/item/clothing/suit/storage/toggle/labcoat/mad - name = "The Mad's labcoat" - desc = "It makes you look capable of konking someone on the noggin and shooting them into space." - icon_state = "labgreen" - item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") - /obj/item/clothing/suit/storage/toggle/labcoat/genetics name = "Geneticist labcoat" desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." @@ -88,6 +88,12 @@ item_state_slots = list(slot_r_hand_str = "virologist_labcoat", slot_l_hand_str = "virologist_labcoat") armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0) +/obj/item/clothing/suit/storage/toggle/labcoat/roboticist + name = "Roboticist labcoat" + desc = "More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads." + icon_state = "labcoat_robo" + item_state_slots = list(slot_r_hand_str = "labcoat", slot_l_hand_str = "labcoat") + /obj/item/clothing/suit/storage/toggle/labcoat/science name = "Scientist labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 0b8245835d8..c4213fb1762 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1301,12 +1301,15 @@ req_access = list(access_robotics) products = list( /obj/item/clothing/under/rank/roboticist = 5, - /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/roboticist = 5, /obj/item/clothing/shoes/black = 5, /obj/item/clothing/gloves/black = 5, /obj/item/weapon/storage/backpack/toxins = 5, /obj/item/weapon/storage/backpack/satchel/tox = 5 ) + contraband = list( + /obj/item/clothing/suit/storage/hooded/techpriest = 2 + ) req_log_access = access_hop has_logs = 1 diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 2675a52a46e..bc1ad569c20 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index f3ad9a82a1a..3667c8597b1 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index b138554313c..77ab891a582 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 45e06f6fbc5..fcb1ee85f34 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ