mirror of
https://github.com/cybergirlvannie/OpenSS13.git
synced 2026-02-09 19:07:44 +00:00
Split water effects off into a separate file.
This commit is contained in:
@@ -663,14 +663,6 @@
|
||||
name = "ion trails"
|
||||
icon_state = "ion_trails"
|
||||
anchored = 1.0
|
||||
/obj/effects/water
|
||||
name = "water"
|
||||
icon = 'water.dmi'
|
||||
icon_state = "extinguish"
|
||||
var/life = 15.0
|
||||
flags = 2.0
|
||||
mouse_opacity = 0
|
||||
weight = 1000
|
||||
/obj/equip_e
|
||||
name = "equip e"
|
||||
var/mob/source = null
|
||||
|
||||
31
Code/Effects/water.dm
Normal file
31
Code/Effects/water.dm
Normal file
@@ -0,0 +1,31 @@
|
||||
/obj/effects/water
|
||||
flags = 2.0
|
||||
icon = 'water.dmi'
|
||||
icon_state = "extinguish"
|
||||
mouse_opacity = 0
|
||||
name = "water"
|
||||
weight = 1000
|
||||
var/life = 15.0
|
||||
|
||||
New()
|
||||
..()
|
||||
var/turf/T = src.loc
|
||||
if (istype(T, /turf))
|
||||
T.firelevel = 0
|
||||
spawn(70) del(src)
|
||||
|
||||
Del()
|
||||
var/turf/T = src.loc
|
||||
if (istype(T, /turf))
|
||||
T.firelevel = 0
|
||||
..()
|
||||
|
||||
Move(turf/newloc)
|
||||
var/turf/T = src.loc
|
||||
if (istype(T, /turf))
|
||||
T.firelevel = 0
|
||||
if (--src.life < 1)
|
||||
del(src)
|
||||
if(newloc.density)
|
||||
return 0
|
||||
.=..()
|
||||
@@ -5561,29 +5561,6 @@
|
||||
else
|
||||
M.loc = locate(tx, ty, src.target.z)
|
||||
|
||||
/obj/effects/water/New()
|
||||
..()
|
||||
var/turf/T = src.loc
|
||||
if (istype(T, /turf))
|
||||
T.firelevel = 0
|
||||
spawn(70) del(src)
|
||||
|
||||
/obj/effects/water/Del()
|
||||
var/turf/T = src.loc
|
||||
if (istype(T, /turf))
|
||||
T.firelevel = 0
|
||||
..()
|
||||
|
||||
/obj/effects/water/Move(turf/newloc)
|
||||
var/turf/T = src.loc
|
||||
if (istype(T, /turf))
|
||||
T.firelevel = 0
|
||||
if (--src.life < 1)
|
||||
del(src)
|
||||
if(newloc.density)
|
||||
return 0
|
||||
.=..()
|
||||
|
||||
/mob/attackby(obj/item/weapon/W, mob/user)
|
||||
var/shielded = 0
|
||||
for(var/obj/item/weapon/shield/S in src)
|
||||
|
||||
@@ -132,6 +132,7 @@
|
||||
#include "Code\Machinery\Power\terminal.dm"
|
||||
#include "Code\Machinery\Power\turbine.dm"
|
||||
#include "Code\mob\ai.dm"
|
||||
#include "Code\mob\drone.dm"
|
||||
#include "Code\mob\drone.dm"
|
||||
#include "Code\Effects\water.dm"
|
||||
// END_INCLUDE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user