From e5275ffb0f4c8f7cab8c5e86012d103c0e8313b7 Mon Sep 17 00:00:00 2001
From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Date: Wed, 17 Aug 2022 22:32:12 -0400
Subject: [PATCH] Fixes Hilbert Hotel's 'note to the institute' and Cybersun's
password (#69237)
* Fixes Hilbert Hotel's paper
Initialize has to set the raw text before calling parent, as paper's base Initialize is when it checks for raw text to add onto the paper.
All other papers already follow this standard, this was just the odd one out.
* I lied, there was another case.
---
code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm | 2 +-
code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
index 4d035dfa137..926a0cc8143 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
@@ -55,10 +55,10 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
name = "Old pamphlet"
/obj/item/paper/fluff/ruins/forgottenship/password/Initialize(mapload)
- . = ..()
default_raw_text = "Welcome to most advanced cruiser owned by Cyber Sun Industries!
You might notice, that this cruiser is equipped with 12 prototype laser turrets making any hostile boarding attempts futile.
Other facilities built on the ship are: Simple atmospheric system, Camera system with built-in X-ray visors and Safety module, enabling emergency engines in case of... you know, emergency.
Emergency system will bring you to nearest syndicate pod containing everything needed for human life.
In case of emergency, you must remember the pod-door activation code - [GLOB.fscpassword]
Cyber Sun Industries (C) 2484."
icon_state = "paper_words"
inhand_icon_state = "paper"
+ return ..()
/obj/item/paper/fluff/ruins/forgottenship/powerissues
name = "Power issues"
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index 379ff0690f4..59dbd3796ed 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -541,7 +541,6 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
name = "note to the institute"
/obj/item/paper/crumpled/ruins/note_institute/Initialize(mapload)
- . = ..()
default_raw_text = {"Note to the Institute
If you're reading this, I hope you're from the Institute. First things first, I should apologise. I won't be coming back to teach in the new semester.
We've made some powerful enemies. Very powerful. More powerful than any of you can imagine, and so we can't come back.
@@ -550,6 +549,8 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
Best of luck with the research. From all of us in the Hilbert Group, it's been a pleasure working with you.
- David, Phil, Fiona and Jen"}
+ return ..()
+
/obj/item/paper/crumpled/ruins/postdocs_memo
name = "memo to the postdocs"
default_raw_text = {"Memo to the Postdocs