cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3425 316c924e-a436-60f5-8080-3fe189b3f50e

Browse Source
This commit is contained in:
VivianFoxfoot@gmail.com
2012-04-10 03:21:08 +00:00
parent 78d1459075
commit 57dcdcbfbc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/helpers.dm
+2 -2
View File
@@ -1295,13 +1295,13 @@ proc/listclearnulls(list/list)
if(numticks == 0)
return 0
var/delayfraction = delay/numticks
var/delayfraction = round(delay/numticks)
var/turf/T = user.loc
var/holding = user.equipped()
for(var/i = 0, i<numticks, i++)
sleep(delayfraction)
if(!src || !user || !user.canmove || !(user.loc == T) || !(user.equipped() == holding))
if(!user || !user.canmove || !(user.loc == T) || !(user.equipped() == holding))
return 0
return 1
code/game/asteroid/artifacts.dm
+1 -1
View File
@@ -5,7 +5,7 @@ var/global/list/space_surprises = list( /obj/item/clothing/mask/facehugger,
// /obj/item/weapon/rcd,
// /obj/item/weapon/rcd_ammo,
// /obj/item/weapon/spacecash,
/obj/item/weapon/cloaking_device,
// /obj/item/weapon/cloaking_device, // BECAUSE KOR AND PETE ARE FUCKING SCRUBS
// /obj/item/weapon/gun/energy/teleport_gun,
// /obj/item/weapon/rubber_chicken,
/obj/item/weapon/melee/energy/sword/pirate,