From d36bc75074bd9c4ff33c0b3c98ed1cfbc1099022 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 31 May 2017 19:29:20 -0500 Subject: [PATCH] Fixes posters --- code/game/objects/effects/contraband.dm | 8 ++++---- code/game/objects/effects/wanted_poster.dm | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 14333c2bc1..2ee81b0422 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -12,8 +12,8 @@ var/poster_type var/obj/structure/sign/poster/poster_structure -/obj/item/weapon/poster/New(loc, obj/structure/sign/poster/new_poster_structure) - ..() +/obj/item/weapon/poster/Initialize(mapload, obj/structure/sign/poster/new_poster_structure) + . = ..() poster_structure = new_poster_structure if(!new_poster_structure && poster_type) poster_structure = new poster_type(src) @@ -58,8 +58,8 @@ var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here." var/poster_item_icon_state = "rolled_poster" -/obj/structure/sign/poster/New() - ..() +/obj/structure/sign/poster/Initialize() + . = ..() if(random_basetype) randomise(random_basetype) if(!ruined) diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm index 6d4f309aeb..746283f487 100644 --- a/code/game/objects/effects/wanted_poster.dm +++ b/code/game/objects/effects/wanted_poster.dm @@ -1,19 +1,18 @@ /obj/item/weapon/poster/wanted icon_state = "rolled_poster" -/obj/item/weapon/poster/wanted/New(turf/loc, icon/person_icon, wanted_name, description) - var/obj/structure/sign/poster/wanted/wanted_poster = new(person_icon, wanted_name, description) - ..(loc, wanted_poster) +/obj/item/weapon/poster/wanted/Initialize(mapload, icon/person_icon, wanted_name, description) + . = ..(mapload, new /obj/structure/sign/poster/wanted(src, person_icon, wanted_name, description)) name = "wanted poster ([wanted_name])" desc = "A wanted poster for [wanted_name]." /obj/structure/sign/poster/wanted var/wanted_name -/obj/structure/sign/poster/wanted/New(var/icon/person_icon, var/person_name, var/description) +/obj/structure/sign/poster/wanted/Initialize(mapload, icon/person_icon, person_name, description) + . = ..() if(!person_icon) - qdel(src) - return + return INITIALIZE_HINT_QDEL name = "wanted poster ([person_name])" wanted_name = person_name desc = description