From 9ccf9b8141efd1e0c28dbe2bf6f0c8786ef1cd93 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 25 May 2024 20:57:02 +0200
Subject: [PATCH] [MIRROR] Fix airlock assembly renaming examine grammar issue
(#27840)
* Fix airlock assembly renaming examine grammar issue (#83365)
## About The Pull Request
At some point the examine line about what the resulting airlock will be
named got split off into a separate statement, but in the process some
things got crossed and it doubled up on the final half of the line.
Currently, an airlock might state:
> There is a small paper placard on the assembly labelled ",
written on it is 'Public Garden'".
So we cut out the ` labelled \"[doorname]\"` part and go back to just
having the `, written on it is '[created_name]'` part.
> There is a small paper placard on the assembly, written on it
is 'Public Garden'.
## Why It's Good For The Game
Comprehensible examine for airlock assemblies.
## Changelog
:cl:
spellcheck: Examining a renamed airlock assembly no longer says it has a
paper placard that is "labelled with written on it is".
/:cl:
* Fix airlock assembly renaming examine grammar issue
---------
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
---
code/game/objects/structures/door_assembly.dm | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index f75a8b9ce72..5daf96a01b8 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -61,9 +61,6 @@
/obj/structure/door_assembly/examine(mob/user)
. = ..()
- var/doorname = ""
- if(created_name)
- doorname = ", written on it is '[created_name]'"
switch(state)
if(AIRLOCK_ASSEMBLY_NEEDS_WIRES)
if(anchored)
@@ -80,8 +77,8 @@
. += span_notice("There are empty slots for mineral covers.")
else if(!glass && !noglass)
. += span_notice("There are empty slots for glass windows.")
- if(doorname)
- . += span_notice("There is a small paper placard on the assembly labelled \"[doorname]\".")
+ if(created_name)
+ . += span_notice("There is a small paper placard on the assembly, written on it is '[created_name]'.")
/obj/structure/door_assembly/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/pen) && !user.combat_mode)