From 3d63c8785e7a7f981cced3da1cb70583cec6f862 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Wed, 12 Oct 2022 08:20:38 +1100 Subject: [PATCH] Regal Pipeguns can be stored in high-vis vests/wet floor signs (#70345) --- code/modules/clothing/suits/jobs.dm | 1 + code/modules/clothing/suits/wetfloor.dm | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index f22f3084593..21b03f85ff4 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -147,6 +147,7 @@ /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, + /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime, ) resistance_flags = NONE species_exception = list(/datum/species/golem) diff --git a/code/modules/clothing/suits/wetfloor.dm b/code/modules/clothing/suits/wetfloor.dm index d5448b185be..ed50704b1b0 100644 --- a/code/modules/clothing/suits/wetfloor.dm +++ b/code/modules/clothing/suits/wetfloor.dm @@ -16,3 +16,8 @@ attack_verb_simple = list("warn", "caution", "smash") armor = list(MELEE = 5, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0) species_exception = list(/datum/species/golem) + allowed = list( + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime, + )