Skip to content

Commit

Permalink
pistol changes, pens are not factionally WY
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Sep 20, 2024
1 parent 78a5e3a commit 5311d42
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/tools/misc_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -244,31 +244,31 @@
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
desc = "It's a normal blue ink pen."
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
desc = "It's a normal red ink pen."
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
desc = "It's a normal green ink pen."
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
Expand Down
5 changes: 2 additions & 3 deletions code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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"
Expand Down

0 comments on commit 5311d42

Please sign in to comment.