From 2845065463d53dc09aa8353ba378c7559d74ceda Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 26 May 2013 13:02:13 -0600 Subject: [PATCH] Adding lost pulls #590 #528 #574 #563 #529 --- code/modules/assembly/mousetrap.dm | 2 +- code/modules/hydroponics/grown.dm | 3 ++- .../mob/living/carbon/human/examine.dm | 23 ++++++++++-------- .../living/simple_animal/friendly/mouse.dm | 16 +++++++++--- .../mob/new_player/sprite_accessories.dm | 4 +++ icons/mob/human_face.dmi | Bin 29056 -> 29270 bytes maps/tgstation.2.1.2.dmm | 4 +-- 7 files changed, 35 insertions(+), 17 deletions(-) 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 734fad6d2d735143e092501a703b9b6e6f806362..e3a0357805c7a506071b08ccbb7b0d636ed921d2 100644 GIT binary patch delta 8170 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 H!^{5%xRC8K delta 8007 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 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)