cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Added a check for the target's location when drag and dropping someone into a disposal unit.

Browse Source 
-Misc stuff with diseases.
-Forgot to add the .dme so the extra symptoms will be ticked now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5014 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-11-06 15:02:00 +00:00
parent 9e14159690
commit f4a559f183
3 changed files with 288 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,6 +136,7 @@
if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai))
return
src.add_fingerprint(user)
var/target_loc = target.loc
var/msg
for (var/mob/V in viewers(usr))
if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
@@ -145,6 +146,8 @@
V.show_message("[usr] starts stuffing [target.name] into the disposal.", 3)
if(!do_after(usr, 20))
return
if(target_loc != target.loc)
return
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]."