Merge pull request #12291 from Heroman3003/8330-fix

8330 fix
This commit is contained in:
Casey
2022-02-19 17:32:34 -05:00
committed by CHOMPStation2
parent ddf594534e
commit 58a5611395
11 changed files with 1652 additions and 1198 deletions

View File

@@ -105,11 +105,16 @@
return
/obj/item/weapon/paper/Initialize(mapload)
. = ..()
/obj/item/weapon/paper/Initialize(mapload, var/text, var/title)
. = ..()
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
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/New(var/newloc, var/text, var/title)
..()