cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed being able to climb into disposals while stunned or weakened, etc.

Browse Source 
Fixed floorbots creating a full toolbox on death.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2253 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-09-23 01:55:16 +00:00
parent b4193b0f0e
commit f08df6445d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/WorkInProgress/recycling/disposal.dm
View File

@@ -88,15 +88,15 @@
var/msg
for (var/mob/V in viewers(usr))
if(target == user && !user.stat)
if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
V.show_message("[usr] starts climbing into the disposal.", 3)
if(target != user && !user.restrained())
if(target.anchored) return
V.show_message("[usr] starts stuffing [target.name] into the disposal.", 3)
if(!do_after(usr, 20))
return
if(target == user && !user.stat) // if drop self, then climbed in
// must be awake
if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis) // if drop self, then climbed in
// must be awake, not stunned or whatever
msg = "[user.name] climbs into the [src]."
user << "You climb into the [src]."
else if(target != user && !user.restrained())