cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"

Browse Source
This commit is contained in:
Novacat
2022-08-27 08:49:56 -04:00
committed by GitHub
parent 0be7af4774
commit 1aa4c73e8d
599 changed files with 3329 additions and 4983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/Cleanable/fuel.dm
+9 -14
View File
@@ -9,31 +9,26 @@
generic_filth = TRUE
persistent = FALSE
/obj/effect/decal/cleanable/liquid_fuel/Initialize(var/ml, amt=1, nologs=1)
. = ..(ml)
if(!isturf(loc))
return INITIALIZE_HINT_QDEL
/obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,amt=1,nologs=1)
if(!nologs)
message_admins("Liquid fuel has spilled in [loc.name] ([loc.x],[loc.y],[loc.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>JMP</a>)")
log_game("Liquid fuel has spilled in [loc.name] ([loc.x],[loc.y],[loc.z])")
message_admins("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[newLoc.x];Y=[newLoc.y];Z=[newLoc.z]'>JMP</a>)")
log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])")
src.amount = amt
var/has_spread = 0
//Be absorbed by any other liquid fuel in the tile.
for(var/obj/effect/decal/cleanable/liquid_fuel/other in loc)
for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc)
if(other != src)
other.amount += src.amount
other.Spread()
has_spread = 1
break
. = ..()
if(!has_spread)
Spread()
else
return INITIALIZE_HINT_QDEL
qdel(src)
/obj/effect/decal/cleanable/liquid_fuel/proc/Spread(exclude=list())
//Allows liquid fuels to sometimes flow into other tiles.
@@ -58,10 +53,10 @@
icon_state = "mustard"
anchored = FALSE
/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Initialize(var/ml, amt = 1, d = 0)
/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/New(newLoc, amt = 1, d = 0)
set_dir(d) //Setting this direction means you won't get torched by your own flamethrower.
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
if(istype(newLoc, /turf/simulated))
var/turf/simulated/T = newLoc
T.hotspot_expose((T20C*2) + 380,500) //Ignite the fuel.
. = ..()
code/game/objects/effects/decals/Cleanable/humans.dm
+6 -6
View File
@@ -37,8 +37,8 @@ var/global/list/image/splatter_cache=list()
amount = 0
..(ignore=1)
/obj/effect/decal/cleanable/blood/Initialize()
. = ..()
/obj/effect/decal/cleanable/blood/New()
..()
update_icon()
if(istype(src, /obj/effect/decal/cleanable/blood/gibs))
return
@@ -144,8 +144,8 @@ var/global/list/image/splatter_cache=list()
amount = 0
var/list/drips = list()
/obj/effect/decal/cleanable/blood/drip/Initialize()
. = ..()
/obj/effect/decal/cleanable/blood/drip/New()
..()
drips |= icon_state
/obj/effect/decal/cleanable/blood/writing
@@ -156,8 +156,8 @@ var/global/list/image/splatter_cache=list()
amount = 0
var/message
/obj/effect/decal/cleanable/blood/writing/Initialize()
. = ..()
/obj/effect/decal/cleanable/blood/writing/New()
..()
if(random_icon_states.len)
for(var/obj/effect/decal/cleanable/blood/writing/W in loc)
random_icon_states.Remove(W.icon_state)
code/game/objects/effects/decals/Cleanable/misc.dm
+2 -2
View File
@@ -24,8 +24,8 @@
/obj/effect/decal/cleanable/greenglow
/obj/effect/decal/cleanable/greenglow/Initialize()
. = ..()
/obj/effect/decal/cleanable/greenglow/New()
..()
QDEL_IN(src, 2 MINUTES)
/obj/effect/decal/cleanable/dirt