diff --git a/code/WorkInProgress/Ported/Abi79/uplinks.dm b/code/WorkInProgress/Ported/Abi79/uplinks.dm index 82466134529..a27345d4c02 100644 --- a/code/WorkInProgress/Ported/Abi79/uplinks.dm +++ b/code/WorkInProgress/Ported/Abi79/uplinks.dm @@ -193,11 +193,20 @@ A list of items and costs is stored under the datum of every game mode, alongsid return explode() + var/turf/location = get_turf(src.loc) + if(location) + location.hotspot_expose(700,125) + explosion(location, 0, 0, 2, 4, 1) + var/obj/item/weapon/implant/uplink/U = src.loc var/mob/living/A = U.imp_in var/datum/organ/external/head = A:organs["head"] - head.take_damage(100, 0, 1) - ..() + head.destroyed = 1 + spawn(2) + head.droplimb() + del(src.master) + del(src) + return /obj/item/device/uplink/radio diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 6e19ed87e7c..5655f73a1ee 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -663,6 +663,25 @@ anchored = 1.0 var/list/buckled_mobs = list( ) +/obj/stool/chair/comfy + name = "comfy chair" + desc = "It looks comfy." + +/obj/stool/chair/comfy/brown + icon_state = "comfychair_brown" + +/obj/stool/chair/comfy/beige + icon_state = "comfychair_beige" + +/obj/stool/chair/comfy/teal + icon_state = "comfychair_teal" + +/obj/stool/chair/comfy/black + icon_state = "comfychair_black" + +/obj/stool/chair/comfy/lime + icon_state = "comfychair_lime" + /obj/structure/stool/chair/e_chair name = "electrified chair" desc = "Looks absolutely terrifying!" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7c97a22db91..0fec1a769be 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -12,6 +12,7 @@ life_tick = 0 isbreathing = 1 holdbreath = 0 + lyingcheck = 0 /mob/living/carbon/human/Life() set invisibility = 0 @@ -86,6 +87,9 @@ // Update clothing // update_clothing() + if(lyingcheck != lying) //This is a fix for falling down / standing up not updating icons. Instead of going through and changing every + update_clothing() //instance in the code where lying is modified, I've just added a new variable "lyingcheck" which will be compared + lyingcheck = lying //to lying, so if lying ever changes, update_clothing() will run like normal. if(client) handle_regular_hud_updates() diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index cf7cc1e2824..28e0bd88ef9 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ