Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Req Vendors Typo/Clarity/Remove RO mentions #7036

Merged
merged 3 commits into from
Aug 27, 2024
+5 −5
Merged

Req Vendors Typo/Clarity/Remove RO mentions #7036

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b087dc
Typo, replaces RO with QM, extends gun vend desc
MistChristmas Aug 25, 2024
3441358
Merge branch 'cmss13-devs:master' into NameSanityTheSequel
MistChristmas Aug 25, 2024
22db193
Merge branch 'cmss13-devs:master' into NameSanityTheSequel
MistChristmas Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/obj/structure/machinery/cm_vending/sorted/cargo_guns
name = "\improper ColMarTech Automated Armaments Vendor"
desc = "An automated supply rack hooked up to a big storage of various firearms and explosives. Can be accessed by the Requisitions Officer and Cargo Techs."
desc = "An automated supply rack hooked up to a big storage of various firearms, explosives, load carrying equipment and other miscellaneous items. Can be accessed by the Quartermaster and Cargo Technicians."
icon_state = "req_guns"
req_access = list(ACCESS_MARINE_CARGO)
vendor_theme = VENDOR_THEME_USCM
Expand Down Expand Up @@ -224,7 +224,7 @@

/obj/structure/machinery/cm_vending/sorted/cargo_ammo
name = "\improper ColMarTech Automated Munition Vendor"
desc = "An automated supply rack hooked up to a big storage of various ammunition types. Can be accessed by the Requisitions Officer and Cargo Techs."
desc = "An automated supply rack hooked up to a big storage of various ammunition types. Can be accessed by the Quartermaster and Cargo Technicians."
icon_state = "req_ammo"
req_access = list(ACCESS_MARINE_CARGO)
vendor_theme = VENDOR_THEME_USCM
Expand Down Expand Up @@ -367,7 +367,7 @@

/obj/structure/machinery/cm_vending/sorted/attachments
name = "\improper Armat Systems Attachments Vendor"
desc = "An automated supply rack hooked up to a big storage of weapons attachments. Can be accessed by the Requisitions Officer and Cargo Techs."
desc = "An automated supply rack hooked up to a big storage of weapons attachments. Can be accessed by the Quartermaster and Cargo Technicians."
req_access = list(ACCESS_MARINE_CARGO)
vendor_theme = VENDOR_THEME_USCM
icon_state = "req_attach"
Expand Down Expand Up @@ -436,7 +436,7 @@

/obj/structure/machinery/cm_vending/sorted/uniform_supply
name = "\improper ColMarTech Surplus Uniform Vendor"
desc = "An automated supply rack hooked up to a big storage of standard marine uniforms. Can be accessed by the Requisitions Officer and Cargo Techs."
desc = "An automated supply rack hooked up to a big storage of standard marine uniforms. Can be accessed by the Quartermaster and Cargo Technicians."
icon_state = "clothing"
req_access = list()
req_one_access = list(ACCESS_MARINE_CARGO)
Expand Down Expand Up @@ -466,7 +466,7 @@
list("ARMOR", -1, null, null),
list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),
list("M10 Pattern Technician Helmet", 20, /obj/item/clothing/head/helmet/marine/tech, VENDOR_ITEM_REGULAR),
list("M10 Pattern Corpman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR),
list("M10 Pattern Corpsman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR),
list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/carrier, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/padded, VENDOR_ITEM_REGULAR),
list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/medium/padless, VENDOR_ITEM_REGULAR),
Expand Down
Loading