diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 696fb288..6616fda5 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1265,19 +1265,6 @@ 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 97eacd77..79fc512e 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -29,12 +29,7 @@ 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) - 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/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) @@ -77,12 +72,7 @@ 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) - 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/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) @@ -123,12 +113,7 @@ /* 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) */ - 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/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) @@ -168,12 +153,7 @@ /* 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) */ - 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/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 26eaf5fb..4736ad12 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -132,14 +132,4 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 item_color="yellow" - 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 + species_restricted = list("Unathi") \ No newline at end of file diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index fe431b5c..db08554d 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -53,16 +53,6 @@ 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" @@ -78,7 +68,6 @@ 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 38c2dcf6..7871b7b4 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -801,10 +801,7 @@ return for(var/mob/O in viewers(src, null)) - 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) + 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)