From 9de76932103e9ecc72b950adede75c9048cd1aba Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 13 Feb 2022 20:49:37 -0800 Subject: [PATCH] Fixes ABS reports getting sanitized by initialize() (#8391) * Fixes ABS reports getting sanitized by initialize() * Linting --- code/game/machinery/adv_med.dm | 2 +- code/modules/paperwork/paper.dm | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index d4b1ead2ec..211efc6927 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -340,7 +340,7 @@ var/name = occupant ? occupant.name : "Unknown" P.info = "
Body Scan - [name]

" P.info += "Time of scan: [worldtime2stationtime(world.time)]

" - P.info += "[generate_printing_text()]" + P.info += generate_printing_text() P.info += "

Notes:
" P.name = "Body Scan - [name] ([worldtime2stationtime(world.time)]" else diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 52ae9da475..99a96b7440 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -107,25 +107,22 @@ //lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm! /obj/item/weapon/paper/Initialize(mapload, var/text, var/title) - . = ..() - - if(istext(title)) - name = title - if(istext(text)) - info = text - - if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player. - was_maploaded = TRUE - -/obj/item/weapon/paper/Initialize() . = ..() + + if(istext(title)) + name = title + if(istext(text)) + info = text + addtimer(CALLBACK(src, .proc/update_info), 0) + + if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player. + was_maploaded = TRUE + pixel_y = rand(-8, 8) pixel_x = rand(-9, 9) stamps = "" - addtimer(CALLBACK(src, .proc/update_info), 0) /obj/item/weapon/paper/proc/update_info() - if(name != "paper") desc = "This is a paper titled '" + name + "'."