cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/mob/new_player/new_player.dm
This commit is contained in:
Chinsky
2013-10-15 10:56:50 +04:00
parent 29ea7f0d3a 6a2c91196a
commit 7c681b2bd8
27 changed files with 264 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/projectiles/projectile/beams.dm
View File

@@ -71,13 +71,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]
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]
return
/obj/item/projectile/beam/practice