From e11e4b338561fbc729ac39be59e6ba3fbe4cd33c Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 12 Jan 2018 11:02:46 -0200 Subject: [PATCH] Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar Fix description of relabelled canisters --- code/modules/atmospherics/machinery/portable/canister.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index b14c17d875..13bef3ba1b 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -84,7 +84,7 @@ gas_type = /datum/gas/plasma /obj/machinery/portable_atmospherics/canister/bz - name = "BZ canister" + name = "\improper BZ canister" desc = "BZ, a powerful hallucinogenic nerve agent." icon_state = "purple" gas_type = /datum/gas/bz @@ -383,7 +383,7 @@ if(newtype) var/obj/machinery/portable_atmospherics/canister/replacement = newtype name = initial(replacement.name) - desc = initial(replacement.name) + desc = initial(replacement.desc) icon_state = initial(replacement.icon_state) if("restricted") restricted = !restricted