diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index f2c94b6db27..35879744025 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -251,6 +251,7 @@ new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/general(src) new /obj/item/clothing/suit/storage/labcoat/cmo(src) + new /obj/item/clothing/suit/storage/labcoat/cmoalt(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/heads/cmo(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) diff --git a/code/game/objects/closets/wardrobe.dm b/code/game/objects/closets/wardrobe.dm index fc702dd65cb..46ea08a395c 100644 --- a/code/game/objects/closets/wardrobe.dm +++ b/code/game/objects/closets/wardrobe.dm @@ -235,6 +235,7 @@ obj/structure/closet/wardrobe/hop/New() new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/general(src) new /obj/item/clothing/suit/storage/labcoat/cmo(src) + new /obj/item/clothing/suit/storage/labcoat/cmoalt(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm index 602a0288154..f038873f74c 100644 --- a/code/game/objects/items/clothing.dm +++ b/code/game/objects/items/clothing.dm @@ -322,6 +322,12 @@ THERMAL GLASSES else if(src.icon_state == "labcoat_cmo") src.icon_state = "labcoat_cmo_open" usr << "You unbutton the labcoat." + else if(src.icon_state == "labcoat_cmoalt_open") + src.icon_state = "labcoat_cmoalt" + usr << "You button up the labcoat." + else if(src.icon_state == "labcoat_cmoalt") + src.icon_state = "labcoat_cmoalt_open" + usr << "You unbutton the labcoat." else if(src.icon_state == "labcoat_gen_open") src.icon_state = "labcoat_gen" usr << "You button up the labcoat." diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index fc8719272e7..392c344cff3 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -15,6 +15,11 @@ icon_state = "labcoat_cmo_open" item_state = "labcoat_cmo" +/obj/item/clothing/suit/storage/labcoat/cmoalt + name = "chief medical officer's labcoat" + desc = "With command blue highlights." + icon_state = "labcoat_cmoalt_open" + /obj/item/clothing/suit/storage/labcoat/mad name = "The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 29c200bb8a0..19c9c411389 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -9,7 +9,14 @@ cell_type = "/obj/item/weapon/cell/crap" force = 10 - +/* special_check(var/mob/living/carbon/human/M) + if(ishuman(M)) + for(var/obj/item/weapon/implant/I in M) + if(I.implanted) + if(istype(I,/obj/item/weapon/implant/loyalty)) + return 1 + M << "\red The gun refuses to fire!" + return 0*/// Can be used to restrict weapon use to implants. - Erthilo /obj/item/weapon/gun/energy/taser/cyborg/load_into_chamber()//TOOD: change this over to the slowly recharge other cell if(in_chamber) diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 37c49b10e7a..28f4a725f83 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index e42238c3792..09d18f111af 100755 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ