diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 55315576777..8de02f5d1ae 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/code/defines/obj/clothing/gloves.dm @@ -37,6 +37,23 @@ ce color = "chief" //Exists for washing machines. Is not different from black gloves in any way. +/obj/item/clothing/gloves/detective + desc = "Made of well worn leather, these gloves are comfortable, useful, and stylish!" + name = "The Detective's Gloves" + icon_state = "black" + item_state = "bgloves" + color="brown" + siemens_coefficient = 0.30 + protective_temperature = 1100 + +/obj/item/clothing/gloves/hos + desc = "These gloves belong to the man in charge of the guns." + name = "Head of Security's Gloves" + icon_state = "black" + item_state = "bgloves" + color="brown" + siemens_coefficient = 0.30 + protective_temperature = 1100 /obj/item/clothing/gloves/cyborg desc = "beep boop borp" @@ -145,7 +162,6 @@ icon_state = "red" item_state = "redgloves" siemens_coefficient = 0.30 - protective_temperature = 1100 /obj/item/clothing/gloves/rainbow diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 67cd8981d04..619fde8125d 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -9,9 +9,10 @@ /proc/is_convertable_to_cult(datum/mind/mind) if(!istype(mind)) return 0 - for(var/obj/item/weapon/implant/loyalty/L in mind.current) + //This makes security unconvertable. *comments out* +/* for(var/obj/item/weapon/implant/loyalty/L in mind.current) if(L && L.implanted) - return 0 + return 0 */ return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index f9463337cc6..6f167e5b0aa 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -17,7 +17,7 @@ H.equip_if_possible(new /obj/item/device/pda/heads/hos(H), H.slot_belt) // H.equip_if_possible(new /obj/item/clothing/suit/armor/hos(H), H.slot_wear_suit) //We're Bay12, not Goon. We don't need armor 24/7 - H.equip_if_possible(new /obj/item/clothing/gloves/red(H), H.slot_gloves) + H.equip_if_possible(new /obj/item/clothing/gloves/hos(H), H.slot_gloves) H.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(H), H.slot_head) H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(H), H.slot_glasses) H.equip_if_possible(new /obj/item/weapon/handcuffs(H), H.slot_in_backpack) @@ -72,6 +72,7 @@ H.equip_if_possible(new /obj/item/device/radio/headset/headset_sec(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/weapon/storage/box/evidence(H.back), H.slot_in_backpack) + H.equip_if_possible(new /obj/item/weapon/reagent_containers/food/drinks/dflask(H.back), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/under/det(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/detective(H), H.slot_belt) @@ -80,7 +81,7 @@ CIG.light("") H.equip_if_possible(CIG, H.slot_wear_mask) */ //Fuck that thing. --SkyMarshal - H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves) + H.equip_if_possible(new /obj/item/clothing/gloves/detective(H), H.slot_gloves) H.equip_if_possible(new /obj/item/weapon/storage/fcard_kit(H.back), H.slot_in_backpack) H.equip_if_possible(new /obj/item/weapon/fcardholder(H), H.slot_in_backpack) H.equip_if_possible(new /obj/item/clothing/suit/storage/det_suit(H), H.slot_wear_suit) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 9dc558db8ea..70857ef4846 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -53,6 +53,7 @@ new /obj/item/clothing/under/jensen(src) new /obj/item/clothing/suit/armor/hos/jensen(src) new /obj/item/clothing/suit/armor/hos(src) + new /obj/item/clothing/gloves/hos(src) new /obj/item/clothing/head/helmet/HoS/dermal(src) new /obj/item/device/radio/headset/heads/hos(src) new /obj/item/weapon/shield/riot(src) @@ -131,7 +132,7 @@ new /obj/item/clothing/under/det(src) new /obj/item/clothing/suit/det_suit/armor(src) new /obj/item/clothing/suit/storage/det_suit(src) - new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/gloves/detective(src) new /obj/item/clothing/head/det_hat(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/headset_sec(src) @@ -141,6 +142,7 @@ new /obj/item/device/detective_scanner(src) new /obj/item/weapon/pepperspray/small(src) new /obj/item/weapon/storage/box/evidence(src) + new /obj/item/weapon/reagent_containers/food/drinks/dflask(src) return diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index a7c3b224d6a..88231c0d8c0 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -2823,6 +2823,12 @@ icon_state = "flask" volume = 60 +/obj/item/weapon/reagent_containers/food/drinks/dflask + name = "Detective's Flask" + desc = "A well used metal flask with the detective's name etched into it." + icon_state = "dflask" + volume = 60 + /obj/item/weapon/reagent_containers/food/drinks/britcup name = "cup" desc = "A cup with the british flag emblazoned on it." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 81a3cd47a27..446531d6ff4 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ