From cb696d6dd4cc080360d492deb60921854f4c3a04 Mon Sep 17 00:00:00 2001 From: gem <99297919+SleepyGemmy@users.noreply.github.com> Date: Sat, 19 Mar 2022 14:57:19 +0100 Subject: [PATCH] Gloves Not Required to Remove Bulbs and Tubes (#13277) --- code/modules/power/lights/fixtures.dm | 26 ++---------------------- html/changelogs/cool_bulbs_and_tubes.yml | 6 ++++++ 2 files changed, 8 insertions(+), 24 deletions(-) create mode 100644 html/changelogs/cool_bulbs_and_tubes.yml diff --git a/code/modules/power/lights/fixtures.dm b/code/modules/power/lights/fixtures.dm index a17a32f6501..adf2a1dad3a 100644 --- a/code/modules/power/lights/fixtures.dm +++ b/code/modules/power/lights/fixtures.dm @@ -458,7 +458,6 @@ // attack with hand - remove tube/bulb // if hands aren't protected and the light is on, burn the player /obj/machinery/light/attack_hand(mob/user) - add_fingerprint(user) if(status == LIGHT_EMPTY) @@ -477,29 +476,6 @@ shatter() return - // make it burn hands if not wearing fire-insulated gloves - if(!stat) - var/prot = 0 - var/mob/living/carbon/human/H = user - - if(istype(H)) - if(H.species.heat_level_1 > LIGHT_BULB_TEMPERATURE) - prot = 1 - else if(H.gloves) - var/obj/item/clothing/gloves/G = H.gloves - if(G.max_heat_protection_temperature && G.max_heat_protection_temperature > LIGHT_BULB_TEMPERATURE) - prot = 1 - else - prot = 1 - - if(prot || (COLD_RESISTANCE in user.mutations)) - to_chat(user, SPAN_NOTICE("You remove the light [fitting].")) - else - to_chat(user, SPAN_WARNING("You try to remove the light [fitting], but it's too hot and you don't want to burn your hand.")) - return // if burned, don't remove the light - else - to_chat(user, SPAN_NOTICE("You remove the light [fitting].")) - // create a light tube/bulb item and put it in the user's hand if(inserted_light) var/obj/item/light/L = new inserted_light() @@ -518,6 +494,8 @@ user.put_in_active_hand(L) //puts it in our active hand + to_chat(user, SPAN_NOTICE("You remove the light [fitting].")) + inserted_light = null status = LIGHT_EMPTY diff --git a/html/changelogs/cool_bulbs_and_tubes.yml b/html/changelogs/cool_bulbs_and_tubes.yml new file mode 100644 index 00000000000..24396d7aa7f --- /dev/null +++ b/html/changelogs/cool_bulbs_and_tubes.yml @@ -0,0 +1,6 @@ +author: SleepyGem + +delete-after: True + +changes: + - tweak: "You no longer require gloves to remove light bulbs- and tubes. LED is finally here. Rejoice!" \ No newline at end of file