From 5311d426f3ba49cc252862e6bcb44ef2b24cae9e Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Fri, 20 Sep 2024 13:57:37 -0400 Subject: [PATCH] pistol changes, pens are not factionally WY --- .../vending/vendor_types/squad_prep/squad_prep.dm | 2 +- code/game/objects/items/storage/belt.dm | 6 +++--- code/game/objects/items/tools/misc_tools.dm | 8 ++++---- code/modules/gear_presets/upp.dm | 5 ++--- 4 files changed, 10 insertions(+), 11 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 31011e4977..90a968a3fe 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 @@ -236,7 +236,7 @@ list("Shotgun Shell Pouch", round(scale * 15), /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR), list("Medium General Pouch", round(scale * 15), /obj/item/storage/pouch/general/medium, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", round(scale * 15), /obj/item/storage/pouch/magazine/pistol, VENDOR_ITEM_REGULAR), - list("Pistol Pouch", round(scale * 15), /obj/item/storage/pouch/pistol, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", round(scale * 15), /obj/item/storage/pouch/pistol/alt, VENDOR_ITEM_REGULAR), list("Type 50 E-Tool Pouch", round(scale * 15), /obj/item/storage/pouch/etool, VENDOR_ITEM_REGULAR), list("RESTRICTED POUCHES", -1, null, null, null), diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index d8be5761bb..7441a0d8c0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -526,9 +526,9 @@ new /obj/item/restraint/handcuffs(src) new /obj/item/restraint/handcuffs(src) new /obj/item/reagent_container/spray/pepper(src) - new /obj/item/ammo_magazine/pistol/np92(src) - new /obj/item/ammo_magazine/pistol/np92(src) - new /obj/item/ammo_magazine/pistol/np92(src) + new /obj/item/ammo_magazine/pistol/t73(src) + new /obj/item/ammo_magazine/pistol/t73(src) + new /obj/item/ammo_magazine/pistol/t73(src) /obj/item/storage/belt/security/MP/CMB name = "\improper CMB duty belt" diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 831b89b58b..805f72d4c1 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -244,7 +244,7 @@ obj_target.renamedByPlayer = FALSE /obj/item/tool/pen/clicky - desc = "It's a WY brand extra clicky black ink pen." + desc = "It's an extra clicky black ink pen." clicky = TRUE /obj/item/tool/pen/blue @@ -252,7 +252,7 @@ pen_color = "blue" /obj/item/tool/pen/blue/clicky - desc = "It's a WY brand extra clicky blue ink pen." + desc = "It's an extra clicky blue ink pen." clicky = TRUE /obj/item/tool/pen/red @@ -260,7 +260,7 @@ pen_color = "red" /obj/item/tool/pen/red/clicky - desc = "It's a WY brand extra clicky red ink pen." + desc = "It's an extra clicky red ink pen." clicky = TRUE /obj/item/tool/pen/green @@ -268,7 +268,7 @@ pen_color = "green" /obj/item/tool/pen/green/clicky - desc = "It's a WY brand extra clicky green ink pen." + desc = "It's an extra clicky green ink pen." clicky = TRUE /obj/item/tool/pen/invisible diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index c09785e72b..bb337a2dc6 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -1148,7 +1148,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/t73, WEAR_IN_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE) /datum/equipment_preset/upp/police/riot @@ -1191,7 +1191,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/t73, WEAR_IN_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/type23, WEAR_R_HAND) @@ -1215,7 +1215,6 @@ //limb new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - /datum/equipment_preset/upp/police/mss name = "UPP MSS Agent" assignment = "Ministry of Space Security Operative"