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

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/energy_field.dm
	code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm
	code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
caelaislinn
2012-06-16 12:02:29 +10:00
parent 22bad14049 c7ce65a6df
commit f1782ec017
3 changed files with 3 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/gamehelpers.dm
+2 -3
View File
@@ -296,7 +296,7 @@ proc/is_carrying(var/M as mob, var/O as obj)
O = O:loc
return 0
//hackcopy from a ZAS function, first created for use with intertial_damper/new shielding
//hackcopy from a ZAS function, first created for use with intertial_damper/new shielding
proc/CircleFloodFill(turf/start, var/radius = 3)
if(!istype(start))
return list()
@@ -414,5 +414,4 @@ proc/ExplosionCircleFloodFill(turf/start, var/radius = 3)
open -= T
closed += T
return closed
return closed