Skip to content

Commit

Permalink
Removes sword from XO weapon choice. (#4598)
Browse files Browse the repository at this point in the history
# About the pull request

Deletes the sword from XO sidearm choice, still accessible in dress
vendor.

# Explain why it's good for the game

The XO having a sword as their "personal weapon" is stupid and doesn't
fit.
They can still get a sword from the dress vendor if CO opens it because
its a ceremonial dress sword.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
del: XO can no longer take a sword as their personal weapon in their
vendor.
/:cl:
  • Loading branch information
CapCamIII authored Oct 9, 2023
1 parent 651a937 commit bc87c42
Showing 1 changed file with 0 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list(
list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
list("Ceremonial Sword", 0, /obj/item/storage/large_holster/ceremonial_sword/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),

list("COMBAT EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Officer M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/SO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY),
Expand Down

0 comments on commit bc87c42

Please sign in to comment.