From f354ad2e7a64c3126f12afaa4d3511a75b850fc5 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Tue, 10 Sep 2024 03:03:29 -0400 Subject: [PATCH] Final Vendor changes --- .../machinery/vending/vendor_types/squad_prep/squad_prep.dm | 3 +-- code/modules/clothing/masks/gasmask.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 1686110a62..dbd8486066 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -216,8 +216,7 @@ list("Sling Pouch", round(scale * 1.25), /obj/item/storage/pouch/sling, VENDOR_ITEM_REGULAR), list("MASK", -1, null, null, null), - list("PMK-63 Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas/upp, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", round(scale * 10), /obj/item/clothing/mask/rebreather/scarf/tan, VENDOR_ITEM_REGULAR), + list("ShMB/4 Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas/upp, VENDOR_ITEM_REGULAR), list("MISCELLANEOUS", -1, null, null, null), list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR), diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 25b10cf9ca..fe3faa4529 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -38,7 +38,7 @@ item_state = "m5_gasmask" /obj/item/clothing/mask/gas/upp - name = "\improper PMK-63 gasmask" + name = "\improper ShMB/4 gasmask" desc = "The standard issue gasmask utilized by the UPP Armed Collective and many UPP civilian organizations." flags_inv_hide = HIDEEARS|HIDEFACE|HIDEALLHAIR flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB