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

Update simulated var to bay12 refactors

Browse Source 
This commit refactors the simulated var to a missed update from bay12,
which prevents the singularity or explosions from breaking lighting.
This commit is contained in:
Tigercat2000
2015-05-13 07:30:07 -07:00
parent ed8e0c7581
commit 5b7ec52ecd
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/singularity.dm
+6
View File
@@ -5,6 +5,7 @@ var/global/narsie_cometh = 0
var/global/list/uneatable = list(
/turf/space,
/obj/effect/overlay,
/atom/movable/lighting_overlay,
/mob/dead,
/mob/camera,
/mob/new_player
@@ -222,6 +223,7 @@ var/global/list/uneatable = list(
for(var/atom/X in orange(grav_pull,src))
// N3X: Move this up here since get_dist is slow.
if(is_type_in_list(X, uneatable)) continue
if(!X.simulated) continue
var/dist = get_dist(X, src)
@@ -265,6 +267,8 @@ var/global/list/uneatable = list(
var/gain = 0
if(is_type_in_list(A, uneatable))
return 0
if(!A.simulated)
return 0
if (istype(A,/mob/living))//Mobs get gibbed
var/mob/living/M = A
gain = 20
@@ -561,6 +565,8 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/narsie/consume(var/atom/A)
if(is_type_in_list(A, uneatable))
return 0
if(!A.simulated)
return 0
if (istype(A,/mob/living))//Mobs get gibbed
A:gib()
else if(istype(A,/obj))