cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 09:03:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Beamcode fix

Browse Source
This commit is contained in:
ZomgPonies
2013-10-20 19:59:29 -04:00
parent 6f552d6eab
commit 359d5dd541
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/animate.dm
+2 -2
View File
@@ -7,7 +7,7 @@
flag = "energy"
/obj/item/projectile/animate/Bump(var/atom/change)
. = ..()
if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, protected_objects))
var/obj/O = change
new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
..()
code/modules/projectiles/projectile/beams.dm
+7 -8
View File
@@ -231,14 +231,13 @@ var/list/beam_master = list()
..()
proc/cleanup(reference) //Waits .3 seconds then removes the overlay.
src = null
sleep(3)
var/list/turf_master = beam_master[reference]
for(var/laser_state in turf_master)
var/list/turfs = turf_master[laser_state]
for(var/turf/T in turfs)
T.overlays -= beam_master[laser_state]
return
src = null //we're getting deleted! this will keep the code running
spawn(3)
var/list/turf_master = beam_master[reference]
for(var/laser_state in turf_master)
var/list/turfs = turf_master[laser_state]
for(var/turf/T in turfs)
T.overlays -= beam_master[laser_state]
/obj/item/projectile/beam/practice
name = "laser"