From 1a153e0b99668c44e786847b978cd37234f44379 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Fri, 6 Sep 2024 21:54:41 -0400 Subject: [PATCH 1/2] Update code/game/objects/items/cards_ids.dm Co-authored-by: Doubleumc --- code/game/objects/items/cards_ids.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 7af0fbe4e0..642771db2f 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -398,7 +398,7 @@ /obj/item/dogtag name = "information dog tag" - desc = "A fallen serviceman's information dog tag." + desc = "A fallen servicemember's information dog tag." icon_state = "dogtag_taken" icon = 'icons/obj/items/card.dmi' w_class = SIZE_TINY From ec52a720bb92d71e77a5e9fba12f8fd44a62d856 Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Fri, 6 Sep 2024 21:54:49 -0400 Subject: [PATCH 2/2] Update code/game/machinery/vending/vendor_types/crew/commanding_officer.dm Co-authored-by: Doubleumc --- .../machinery/vending/vendor_types/crew/commanding_officer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm index 3e14f977e9..26c2b9f9b1 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Commanding Officer's M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/CO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Commanding Officer's M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/CO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), - list("Commanding Officer's Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), + list("Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),