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..32781e99ed6 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, "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 // find the fat guys