From d0615430ecad37db85c0e360265a465bec9f8406 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 27 Apr 2015 01:25:45 -0400 Subject: [PATCH 1/2] Fixes #8997 Gibbing a human now causes all items on or in their person to get thrown around. This includes implants and bullet shrapnel. --- code/modules/mob/living/carbon/human/death.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 466742046bb..5a439731975 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -15,6 +15,10 @@ // Override the current limb status and don't cause an explosion E.droplimb(1,1) + for(var/obj/item/I in src) + drop_from_inventory(I) + I.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(1,3), round(30/I.w_class)) + ..(species.gibbed_anim) gibs(loc, viruses, dna, null, species.flesh_color, species.blood_color) From 36d9944dfd5a7f00f40281fbb8812ac29b0b63a5 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 27 Apr 2015 01:49:18 -0400 Subject: [PATCH 2/2] Fixes #8977 --- code/modules/power/lighting.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 7c9ae41cf25..d513d2ff120 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -9,7 +9,7 @@ #define LIGHT_BROKEN 2 #define LIGHT_BURNED 3 - +#define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb /obj/item/light_fixture_frame name = "light fixture frame" @@ -487,11 +487,13 @@ var/mob/living/carbon/human/H = user if(istype(H)) - - if(H.gloves) + 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) - prot = (G.max_heat_protection_temperature > 360) + if(G.max_heat_protection_temperature > LIGHT_BULB_TEMPERATURE) + prot = 1 else prot = 1