From ed15c439ef556ea99616e4a2c0a60b7fe69b72e2 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 14 Mar 2021 14:04:04 +0200 Subject: [PATCH] Laser Vest Fix (#11421) --- code/modules/clothing/sets/laser_tag.dm | 3 ++- html/changelogs/geeves-laser_vest_fix.yml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-laser_vest_fix.yml diff --git a/code/modules/clothing/sets/laser_tag.dm b/code/modules/clothing/sets/laser_tag.dm index 61069d2be82..e5de5d5469c 100644 --- a/code/modules/clothing/sets/laser_tag.dm +++ b/code/modules/clothing/sets/laser_tag.dm @@ -38,7 +38,8 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/card/id/ID = H.GetIdCard() - user_name = ID.registered_name + if(ID) + user_name = ID.registered_name var/list/num_to_word = list("one", "two", "three", "four", "five") visible_message("[capitalize_first_letters(name)] says, \"[SPAN_NOTICE("[user_name] armor health set to [num_to_word[set_health]].")]\".") return diff --git a/html/changelogs/geeves-laser_vest_fix.yml b/html/changelogs/geeves-laser_vest_fix.yml new file mode 100644 index 00000000000..8d2f727b444 --- /dev/null +++ b/html/changelogs/geeves-laser_vest_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixes laser tag vests gently breaking when you try to change their health without an ID on your person." \ No newline at end of file