cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated toilets, urinals, and showers with NEW features.

Browse Source 
The shower path has changed!
From /obj/structure/shower to /obj/machinery/shower

Made bookcases appear empty if they have no books, and fill up as more books are placed in them.

Updated do_after() to have an extra var that determines if the user is required to keep the item in the active hand. This is only used in swirlies at the moment.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3684 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-05-27 16:31:08 +00:00
parent aff56113a4
commit f2f3c6bebf
5 changed files with 159 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/helpers.dm
+6 -3
View File
@@ -1301,8 +1301,8 @@ proc/listclearnulls(list/list)
return 1
*/
/proc/do_after(var/mob/user as mob, delay as num, var/numticks = 5) // Replacing the upper one with this one because Byond keeps feeling that the upper one is an infinate loop
if(!user || isnull(user)) // This one should have less temptation
/proc/do_after(var/mob/user as mob, delay as num, var/numticks = 5, var/needhand = 1) // Replacing the upper one with this one because Byond keeps feeling that the upper one is an infinate loop
if(!user || isnull(user)) // This one should have less temptation
return 0
if(numticks == 0)
return 0
@@ -1313,7 +1313,10 @@ proc/listclearnulls(list/list)
for(var/i = 0, i<numticks, i++)
sleep(delayfraction)
if(!user || user.stat || user.weakened || user.stunned || !(user.loc == T) || !(user.equipped() == holding))
if(needhand && !(user.equipped() == holding)) //Sometimes you don't want the user to have to keep their active hand
return 0
if(!user || user.stat || user.weakened || user.stunned || !(user.loc == T))
return 0
return 1