From 82b1b28d6b89d9b3a967b2c5158b6e9037b0660b Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 30 Mar 2017 16:06:07 -0400 Subject: [PATCH 1/2] Ports all decals to Initialize --- code/game/objects/effects/decals/Cleanable/humans.dm | 2 +- code/game/objects/effects/decals/Cleanable/misc.dm | 6 +++--- code/game/objects/effects/decals/Cleanable/robots.dm | 2 +- code/game/objects/effects/decals/crayon.dm | 11 +++++------ code/game/objects/effects/decals/misc.dm | 9 +++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index ab4c6e858be..d94a68a1afc 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -50,7 +50,7 @@ random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6") mergeable_decal = 0 -/obj/effect/decal/cleanable/blood/gibs/New() +/obj/effect/decal/cleanable/blood/gibs/Initialize() ..() reagents.add_reagent("liquidgibs", 5) diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index d59f9bc2a2d..1ad2b2e0804 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -11,7 +11,7 @@ icon_state = "ash" mergeable_decal = 0 -/obj/effect/decal/cleanable/ash/New() +/obj/effect/decal/cleanable/ash/Initialize() ..() reagents.add_reagent("ash", 30) pixel_x = rand(-5, 5) @@ -21,7 +21,7 @@ name = "large pile of ashes" icon_state = "big_ash" -/obj/effect/decal/cleanable/ash/large/New() +/obj/effect/decal/cleanable/ash/large/Initialize() ..() reagents.add_reagent("ash", 30) //double the amount of ash. @@ -149,7 +149,7 @@ if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion. qdel(src) -/obj/effect/decal/cleanable/shreds/New() +/obj/effect/decal/cleanable/shreds/Initialize() pixel_x = rand(-10, 10) pixel_y = rand(-10, 10) ..() diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm index ebcf6f9f7ca..862d21ad6b3 100644 --- a/code/game/objects/effects/decals/Cleanable/robots.dm +++ b/code/game/objects/effects/decals/Cleanable/robots.dm @@ -48,7 +48,7 @@ blood_state = BLOOD_STATE_OIL bloodiness = MAX_SHOE_BLOODINESS -/obj/effect/decal/cleanable/oil/New() +/obj/effect/decal/cleanable/oil/Initialize() ..() reagents.add_reagent("oil", 30) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index e7cea3cbab6..0b80d6b0d92 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -6,10 +6,9 @@ gender = NEUTER var/do_icon_rotate = TRUE -/obj/effect/decal/cleanable/crayon/New(location, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null) +/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null) ..() - loc = location - + name = e_name desc = "A [name] vandalizing the station." if(type == "poseur tag") @@ -32,17 +31,17 @@ do_icon_rotate = FALSE //These are designed to always face south, so no rotation please. var/datum/gang/gang -/obj/effect/decal/cleanable/crayon/gang/New(location, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0) +/obj/effect/decal/cleanable/crayon/gang/Initialize(mapload, var/datum/gang/G, var/e_name = "gang tag", var/rotation = 0) if(!type || !G) qdel(src) - var/area/territory = get_area(location) + var/area/territory = get_area(src) gang = G var/newcolor = G.color_hex icon_state = G.name G.territory_new |= list(territory.type = territory.name) - ..(location, newcolor, icon_state, e_name, rotation) + ..(mapload, newcolor, icon_state, e_name, rotation) /obj/effect/decal/cleanable/crayon/gang/Destroy() var/area/territory = get_area(src) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 762c702df1c..16b5e1be14a 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -5,11 +5,12 @@ layer = POINT_LAYER duration = 25 -/obj/effect/overlay/temp/point/New(atom/target, set_invis = 0) +/obj/effect/overlay/temp/point/New(mapload, set_invis = 0) ..() - loc = get_turf(target) - pixel_x = target.pixel_x - pixel_y = target.pixel_y + var/atom/old_loc = loc + loc = get_turf(src) + pixel_x = old_loc.pixel_x + pixel_y = old_loc.pixel_y invisibility = set_invis //Used by spraybottles. From e780145d6669837081a54cd7fdc6440f0c12382c Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Sat, 1 Apr 2017 17:56:39 -0400 Subject: [PATCH 2/2] Update misc.dm --- code/game/objects/effects/decals/misc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 16b5e1be14a..2994a6a629e 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -5,7 +5,7 @@ layer = POINT_LAYER duration = 25 -/obj/effect/overlay/temp/point/New(mapload, set_invis = 0) +/obj/effect/overlay/temp/point/Initialize(mapload, set_invis = 0) ..() var/atom/old_loc = loc loc = get_turf(src) @@ -31,4 +31,4 @@ desc = "A lightweight support lattice." icon = 'icons/obj/smooth_structures/lattice.dmi' icon_state = "lattice" - density = 1 \ No newline at end of file + density = 1