cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 14:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2779 from Jamini/master

Browse Source 
Disposals Fix
This commit is contained in:
Chinsky
2013-05-16 18:29:19 -07:00
parent 0e7b803d8e 5b14c5081c
commit 25fe7aab07
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
baystation12.dme
View File

@@ -35,6 +35,7 @@
#define FILE_DIR "icons/Testing" #define FILE_DIR "icons/Testing"
#define FILE_DIR "icons/turf" #define FILE_DIR "icons/turf"
#define FILE_DIR "icons/vending_icons" #define FILE_DIR "icons/vending_icons"
#define FILE_DIR "icons/xenoarch_icons"
#define FILE_DIR "sound" #define FILE_DIR "sound"
#define FILE_DIR "sound/AI" #define FILE_DIR "sound/AI"
#define FILE_DIR "sound/ambience" #define FILE_DIR "sound/ambience"

4
code/modules/recycling/disposal.dm
View File

@@ -534,6 +534,10 @@
proc/move() proc/move()
var/obj/structure/disposalpipe/last var/obj/structure/disposalpipe/last
while(active) 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 if(has_fat_guy && prob(2)) // chance of becoming stuck per segment if contains a fat guy
active = 0 active = 0
// find the fat guys // find the fat guys