From d96cc75fe72c9764b08df5051149c1cafaff2bb9 Mon Sep 17 00:00:00 2001 From: Meowykins Date: Thu, 12 Feb 2015 22:42:41 -0600 Subject: [PATCH] Revert "Revert "Things"" This reverts commit 9344369765d12dd9c4a9b15728c766763eee2ca3. --- code/datums/supplypacks.dm | 13 +++++++++ code/game/jobs/job/security.dm | 28 ++++++++++++++++--- code/modules/clothing/gloves/color.dm | 12 +++++++- code/modules/clothing/gloves/miscellaneous.dm | 11 ++++++++ code/modules/mob/living/living.dm | 5 +++- 5 files changed, 63 insertions(+), 6 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 6616fda5..696fb288 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1265,6 +1265,19 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee containername = "speciality gloves kit" group = "Supply" +/datum/supply_packs/alienmedicalgloves + name = "Non-Human Sterile Glove Kit" + contains = list(/obj/item/clothing/gloves/latex/unathi, + /obj/item/clothing/gloves/latex/unathi, + /obj/item/clothing/gloves/latex/unathi, + /obj/item/clothing/gloves/latex/tajara, + /obj/item/clothing/gloves/latex/tajara, + /obj/item/clothing/gloves/latex/tajara) + cost = 25 + containertype = /obj/structure/closet/crate + containername = "speciality sterile gloves kit" + group = "Medical / Science" + /datum/supply_packs/hardsuitcrate_e name = "Engineering Hardsuit" contains = list(/obj/item/clothing/head/helmet/space/rig, diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 79fc512e..97eacd77 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -29,7 +29,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_security(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + if(H.species.name == "Tajaran") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) + if(H.species.name == "Unathi") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) // H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) @@ -72,7 +77,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/warden(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + if(H.species.name == "Tajaran") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) + if(H.species.name == "Unathi") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(H), slot_glasses) // H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) @@ -113,7 +123,12 @@ /* var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H) CIG.light("") H.equip_to_slot_or_del(CIG, slot_wear_mask) */ - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + if(H.species.name == "Tajaran") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) + if(H.species.name == "Unathi") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(H), slot_l_store) @@ -153,7 +168,12 @@ /* var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H) CIG.light("") H.equip_to_slot_or_del(CIG, slot_wear_mask) */ - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + if(H.species.name == "Tajaran") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/tajara(H), slot_gloves) + if(H.species.name == "Unathi") + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black/unathi(H), slot_gloves) + else + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.mind.role_alt_title && H.mind.role_alt_title == "Crime Scene Investigator") H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/det_suit(H), slot_wear_suit) else diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 4736ad12..26eaf5fb 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -132,4 +132,14 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 item_color="yellow" - species_restricted = list("Unathi") \ No newline at end of file + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/black/unathi + name = "black gloves" + desc = "black gloves made for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/black/tajara + name = "black gloves" + desc = "black gloves made for Tajara use." + species_restricted = list("Tajaran") \ No newline at end of file diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index db08554d..fe431b5c 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -53,6 +53,16 @@ cmo item_color = "medical" //Exists for washing machines. Is not different from latex gloves in any way. +/obj/item/clothing/gloves/latex/unathi + name = "unathi latex gloves" + desc = "Sterile latex gloves. Designed for Unathi use." + species_restricted = list("Unathi") + +/obj/item/clothing/gloves/latex/tajara + name = "tajara latex gloves" + desc = "Sterile latex gloves. Designed for Tajara use." + species_restricted = list("Tajaran") + /obj/item/clothing/gloves/botanic_leather desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." name = "botanist's leather gloves" @@ -68,6 +78,7 @@ item_state = "watchgloves" w_class = 1 wired = 1 + species_restricted = list() // var/time = 1 verb/checktime() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 7871b7b4..38c2dcf6 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -801,7 +801,10 @@ return for(var/mob/O in viewers(src, null)) - O.show_message(text("[src] scrambles into the ventillation ducts!"), 1) + if(mind.changeling) + O.show_message(text("\red [src] twists their body into a vile form, bones cracking and popping as its tiny body contorts into a mass of distorted limbs, quickly forcing their way through the vent!"), 1) + else + O.show_message(text("[src] scrambles into the ventillation ducts!"), 1) loc = target_vent var/travel_time = round(get_dist(loc, target_vent.loc) / 2)