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

finishing touches

Browse Source
This commit is contained in:
Deity Link
2020-06-05 02:11:47 +02:00
parent 2c980a1f42
commit 7dd3fa6716
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/assembly/infrared.dm
View File

@@ -218,7 +218,7 @@
..()
/obj/effect/beam/infrared/resetVariables()
..("sources", "children", "limit","visible", "left", "assembly", "invisibility", args)
..("sources", "children", "limit","visible", "left", "assembly", "invisibility", "puffed", args)
children = list()
sources = list()
@@ -257,16 +257,6 @@
var/obj/effect/beam/infrared/B=next
B.set_visible(v)
/obj/effect/beam/infrared/proc/puff_update(var/atom/movable/AM,var/turf/T)
while (!gcDestroyed && T == loc)
sleep(10)
if (!AM || AM.loc != T)
puffed--
if (puffed <= 0)
update_icon()
/obj/effect/beam/infrared/proc/hit()
if(assembly && stepped)//by checking for stepped we ensure the hit won't be triggered while the beam is still deploying
assembly.trigger_beam()
@@ -287,8 +277,11 @@
puffed++
invisibility = 0
var/turf/T = loc
spawn()
puff_update(AM,T)
spawn(10)
if (!gcDestroyed && T == loc)
puffed--
if (puffed <= 0)
update_icon()
return
if(istype(AM, /obj/effect/beam) || (!AM.density && !istype(AM, /obj/effect/blob)))
return