From b7b4b48ecafa654f871683adac46ca2d8818a7ef Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 29 Aug 2020 21:31:18 +0200 Subject: [PATCH] [MIRROR] Fix grammar on random vent names (#558) * Merge pull request #53230 from AutomaticFrenzy/patch/vent-names Fix grammar on random vent names Iteration upon #52398. Before, inconsistent: That's a hZ2l6 Atmospherics Hallway Vent Pump. That's RJkb5 Departure Lounge Air Scrubber. After, consistent: That's Atmospherics Hallway vent pump hZ2l6. That's Departure Lounge air scrubber 29m5z. * Fix grammar on random vent names Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> --- .../machinery/components/unary_devices/vent_pump.dm | 5 +++-- .../machinery/components/unary_devices/vent_scrubber.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index b09a68a1da2..8ec9c3c7ce1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -159,8 +159,9 @@ var/area/vent_area = get_area(src) if(!GLOB.air_vent_names[id_tag]) - // If we do not have a name, assign one - name = "[assign_random_name()] [vent_area.name] Vent Pump" // matching case + // If we do not have a name, assign one. + // Produces names like "Port Quarter Solar vent pump hZ2l6". + name = "\proper [vent_area.name] vent pump [assign_random_name()]" GLOB.air_vent_names[id_tag] = name vent_area.air_vent_info[id_tag] = signal.data diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 5257c1c2fba..260c8a589dd 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -117,7 +117,7 @@ var/area/scrub_area = get_area(src) if(!GLOB.air_scrub_names[id_tag]) // If we do not have a name, assign one - name = "[assign_random_name()] [scrub_area.name] Air Scrubber" // matching case + name = "\proper [scrub_area.name] air scrubber [assign_random_name()]" GLOB.air_scrub_names[id_tag] = name scrub_area.air_scrub_info[id_tag] = signal.data