diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 97ac1946efd..135dab88eda 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -60,7 +60,7 @@ var/mob/living/simple_animal/mouse/M = target visible_message("\red SPLAT!") M.splat() - playsound(target.loc, 'sound/effects/snap.ogg', 50, 1) + playsound(src.loc, 'sound/effects/snap.ogg', 50, 1) armed = 0 update_icon() pulse(0) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 0b33edacb80..62b29c3acee 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -883,7 +883,8 @@ icon_state = "spawner" potency = 10 New() - switch(rand(1,100))//(potency) //It wants to use the default potency instead of the new, so it was always 10. Will try to come back to this later - Cheridan + ..() + switch(potency) if(0 to 10) new/obj/item/weapon/spacecash/(src.loc) if(11 to 20) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 6f3c1ec9432..5bf09166443 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -199,7 +199,9 @@ else msg += "[t_He] has a strange masculine quality to [t_him].\n" + var/appears_dead = 0 if(stat == DEAD || (status_flags & FAKEDEATH)) + appears_dead = 1 if(getbrain(src))//Only perform these checks if there is no brain msg += "[t_He] [t_is] limp and unresponsive; there are no signs of life" @@ -252,18 +254,19 @@ msg += "" - if(stat == UNCONSCIOUS) - msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n" - else if(getBrainLoss() >= 60) - msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n" + if(!appears_dead) + if(stat == UNCONSCIOUS) + msg += "[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.\n" + else if(getBrainLoss() >= 60) + msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n" - if(!key && getbrain(src) && stat != DEAD) - msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely\n" - else if(!client && getbrain(src) && stat != DEAD) - msg += "[t_He] [t_has] a vacant, braindead stare...\n" + if(!key && getbrain(src)) + msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely\n" + else if(!client && getbrain(src)) + msg += "[t_He] [t_has] a vacant, braindead stare...\n" - if(digitalcamo) - msg += "[t_He] [t_is] repulsively uncanny!\n" + if(digitalcamo) + msg += "[t_He] [t_is] repulsively uncanny!\n" if(istype(usr, /mob/living/carbon/human)) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 1909be755b8..3d36ecf52cb 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -31,10 +31,14 @@ /mob/living/simple_animal/mouse/proc/splat() src.health = 0 - src.stat = DEAD src.icon_dead = "mouse_[color]_splat" - src.icon_state = "mouse_[color]_splat" + Die() +/mob/living/simple_animal/mouse/Die() + ..() + var/obj/item/trash/deadmouse/M = new(src.loc) + M.icon_state = src.icon_dead + del (src) /mob/living/simple_animal/mouse/HasEntered(AM as mob|obj) if( ishuman(AM) ) @@ -66,4 +70,10 @@ desc = "Jerry the cat is not amused." response_help = "pets" response_disarm = "gently pushes aside" - response_harm = "splats" \ No newline at end of file + response_harm = "splats" + +/obj/item/trash/deadmouse + name = "dead mouse" + desc = "It looks like somebody dropped the bass on it." + icon = 'icons/mob/animal.dmi' + icon_state = "mouse_gray_dead" \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 99446bf0532..0b52fa0e41b 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -353,6 +353,10 @@ name = "Five o Clock Shadow" icon_state = "facial_fiveoclock" + fu + name = "Fu Manchu" + icon_state = "facial_fumanchu" + /////////////////////////// // Underwear Definitions // /////////////////////////// diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 734fad6d2d7..e3a0357805c 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/maps/tgstation.2.1.2.dmm b/maps/tgstation.2.1.2.dmm index 493eb98fd69..86abde9e48c 100644 --- a/maps/tgstation.2.1.2.dmm +++ b/maps/tgstation.2.1.2.dmm @@ -6404,14 +6404,14 @@ "cth" = (/turf/unsimulated/floor{dir = 8; icon_state = "carpetside"},/area/wizard_station) "cti" = (/obj/effect/landmark/start{name = "wizard"},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/wizard_station) "ctj" = (/turf/unsimulated/floor{dir = 4; icon_state = "carpetside"},/area/wizard_station) -"ctk" = (/obj/structure/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/red,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) +"ctk" = (/obj/structure/rack,/obj/item/clothing/under/color/red,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/red,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/energy/sword/red,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "ctl" = (/obj/machinery/door/poddoor{id = "thunderdomegen"; name = "General Supply"},/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "ctm" = (/obj/effect/landmark{name = "tdome2"},/turf/unsimulated/floor{name = "plating"},/area/tdome/tdome2) "ctn" = (/obj/machinery/door/poddoor{id = "thunderdome"; name = "Thunderdome Blast Door"},/turf/unsimulated/floor{name = "plating"},/area/tdome) "cto" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/tdome) "ctp" = (/turf/simulated/floor{icon_state = "green"; dir = 4},/area/tdome) "ctq" = (/obj/effect/landmark{name = "tdome1"},/turf/unsimulated/floor{name = "plating"},/area/tdome/tdome1) -"ctr" = (/obj/structure/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/green,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) +"ctr" = (/obj/structure/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/energy/sword/green,/turf/unsimulated/floor{icon_state = "dark"},/area/tdome) "cts" = (/obj/machinery/sleeper{icon_state = "sleeper-open"; dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "ctt" = (/obj/machinery/door/window{dir = 4; name = "Infirmary"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "ctu" = (/obj/machinery/door/window/westright{name = "Tool Storage"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)