From d2c9f11b4fc3c0d28285d6413e5babd7fee4ce4e Mon Sep 17 00:00:00 2001 From: Jamini Date: Thu, 16 May 2013 21:10:03 -0400 Subject: [PATCH 1/2] Fixed a disposals bug. Playing with the big garbage pipes is now stupid again. Signed-off-by: Jamini --- baystation12.dme | 1 + code/modules/recycling/disposal.dm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/baystation12.dme b/baystation12.dme index 9ef6c90239f..3bcaf9a00b6 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -35,6 +35,7 @@ #define FILE_DIR "icons/Testing" #define FILE_DIR "icons/turf" #define FILE_DIR "icons/vending_icons" +#define FILE_DIR "icons/xenoarch_icons" #define FILE_DIR "sound" #define FILE_DIR "sound/AI" #define FILE_DIR "sound/ambience" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 6ff62b6565b..982740ab7da 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -534,6 +534,10 @@ proc/move() var/obj/structure/disposalpipe/last while(active) + if(hasmob && prob(3)) + for(var/mob/living/H in src) + H.take_overall_damage(20, 0, "Idiocy")//horribly maim any living creature jumping down disposals. c'est la vie + if(has_fat_guy && prob(2)) // chance of becoming stuck per segment if contains a fat guy active = 0 // find the fat guys From 5b14c5081cb2741b620ace51f2cb06136f64efe3 Mon Sep 17 00:00:00 2001 From: Jamini Date: Thu, 16 May 2013 21:26:26 -0400 Subject: [PATCH 2/2] Adjustment Signed-off-by: Jamini --- code/modules/recycling/disposal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 982740ab7da..32781e99ed6 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -536,7 +536,7 @@ while(active) if(hasmob && prob(3)) for(var/mob/living/H in src) - H.take_overall_damage(20, 0, "Idiocy")//horribly maim any living creature jumping down disposals. c'est la vie + H.take_overall_damage(20, 0, "Blunt Trauma")//horribly maim any living creature jumping down disposals. c'est la vie if(has_fat_guy && prob(2)) // chance of becoming stuck per segment if contains a fat guy active = 0