From 727be7d03fab479af113809330488ec7c0af501c Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Mon, 26 Aug 2019 18:23:09 -0400 Subject: [PATCH] WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?! --- code/game/objects/effects/decals/Cleanable/fuel.dm | 6 +++--- code/game/objects/effects/decals/Cleanable/humans.dm | 8 ++++---- code/game/objects/effects/decals/Cleanable/misc.dm | 8 ++++---- code/game/objects/effects/decals/cleanable.dm | 1 - code/game/objects/effects/decals/crayon.dm | 5 ++--- code/game/objects/items/random_items.dm | 4 ++-- code/game/objects/items/toys.dm | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index c4c903474ef..6c7ea8f3247 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -6,18 +6,18 @@ anchored = TRUE var/amount = 1 //Basically moles. -/obj/effect/decal/cleanable/liquid_fuel/Initialize(newLoc, amt = 1) +/obj/effect/decal/cleanable/liquid_fuel/Initialize(mapload, amt = 1) + . = ..() amount = amt //Be absorbed by any other liquid fuel in the tile. - for(var/obj/effect/decal/cleanable/liquid_fuel/other in newLoc) + for(var/obj/effect/decal/cleanable/liquid_fuel/other in loc) if(other != src) other.amount += amount spawn other.Spread() qdel(src) Spread() - . = ..() /obj/effect/decal/cleanable/liquid_fuel/proc/Spread() //Allows liquid fuels to sometimes flow into other tiles. diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 98f1387f90d..d9210f66e8b 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -33,7 +33,7 @@ var/global/list/image/splatter_cache = list() return ..() -/obj/effect/decal/cleanable/blood/Initialize() +/obj/effect/decal/cleanable/blood/Initialize(mapload) . = ..() update_icon() if(GAMEMODE_IS_CULT) @@ -137,7 +137,7 @@ var/global/list/image/splatter_cache = list() amount = 0 var/message -/obj/effect/decal/cleanable/blood/writing/Initialize() +/obj/effect/decal/cleanable/blood/writing/Initialize(mapload) . = ..() if(random_icon_states.len) for(var/obj/effect/decal/cleanable/blood/writing/W in loc) @@ -210,7 +210,7 @@ var/global/list/image/splatter_cache = list() break -/obj/effect/decal/cleanable/blood/old/Initialize() +/obj/effect/decal/cleanable/blood/old/Initialize(mapload) . = ..() bloodiness = 0 dry() @@ -218,7 +218,7 @@ var/global/list/image/splatter_cache = list() /obj/effect/decal/cleanable/blood/old/can_bloodcrawl_in() return FALSE -/obj/effect/decal/cleanable/blood/gibs/old/Initialize() +/obj/effect/decal/cleanable/blood/gibs/old/Initialize(mapload) . = ..() bloodiness = 0 dry() diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 60f5e6e3490..893250bf862 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -31,8 +31,8 @@ smooth = SMOOTH_MORE mouse_opacity = FALSE -/obj/effect/decal/cleanable/dirt/Initialize() - ..() +/obj/effect/decal/cleanable/dirt/Initialize(mapload) + . = ..() icon_state = "" /obj/effect/decal/cleanable/dirt/blackpowder @@ -56,7 +56,7 @@ desc = "It's foam." color = "#EBEBEB" -/obj/effect/decal/cleanable/flour/foam/Initialize() +/obj/effect/decal/cleanable/flour/foam/Initialize(mapload) . = ..() QDEL_IN(src, 15 SECONDS) @@ -99,7 +99,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "molten" mergeable_decal = FALSE - + /obj/effect/decal/cleanable/molten_object/large name = "big gooey grey mass" icon_state = "big_molten" diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index 1d5de9688dd..3f50a9e3bb7 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -65,7 +65,6 @@ if(smooth) queue_smooth(src) queue_smooth_neighbors(src) - ..() /obj/effect/decal/cleanable/Destroy() if(smooth) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index ac0007e42ae..566c84a081c 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -7,9 +7,8 @@ anchored = TRUE -/obj/effect/decal/cleanable/crayon/New(location, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune") - ..() - loc = location +/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune") + . = ..() name = e_name desc = "A [name] drawn in crayon." diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index e51bac10005..65f00e98781 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -18,8 +18,8 @@ /obj/effect/decal/cleanable/random name = "Random Mess" -/obj/effect/decal/cleanable/random/New() - ..() +/obj/effect/decal/cleanable/random/Initialize(mapload) + . = ..() var/list/list = subtypesof(/obj/effect/decal/cleanable) - list(/obj/effect/decal/cleanable/random,/obj/effect/decal/cleanable/cobweb,/obj/effect/decal/cleanable/cobweb2) var/T = pick(list) new T(loc) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a8ddcf6d315..eda3088199e 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -299,7 +299,7 @@ /obj/effect/decal/cleanable/ash/snappop_phoenix var/respawn_time = 300 -/obj/effect/decal/cleanable/ash/snappop_phoenix/New() +/obj/effect/decal/cleanable/ash/snappop_phoenix/Initialize(mapload) . = ..() addtimer(CALLBACK(src, .proc/respawn), respawn_time)