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

Adds a new satchel to the synth vendor #4666

Closed
wants to merge 4 commits into from
Closed

Adds a new satchel to the synth vendor #4666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1da031e
New USCM Tactical Satchel
Greg-Joffer Oct 12, 2023
a04d8d3
Merge branch 'cmss13-devs:master' into master
Greg-Joffer Oct 13, 2023
734c543
Update backpack.dm
Greg-Joffer Oct 13, 2023
1aa4df3
Update synthetic.dm
Greg-Joffer Oct 13, 2023
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
Binary file added back.dmi
View file
Open in desktop
Binary file not shown.
Binary file added backpacks.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@

//------------SNOWFLAKE VENDOR---------------

GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(

Check failure on line 183 in code/game/machinery/vending/vendor_types/crew/synthetic.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

got '1', expected one of: operator, field access, ')', ','
list("USCM UNIFORMS", 0, null, null, null),
list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -297,6 +297,7 @@
list("Satchel, Leather", 12, /obj/item/storage/backpack/satchel, null, VENDOR_ITEM_REGULAR),
list("Satchel, Medical", 12, /obj/item/storage/backpack/satchel/med, null, VENDOR_ITEM_REGULAR),
list("USCM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR),
list("USCM Tactical Satchel", /obj/item/storage/backpack/lightpack, null VENDOR_ITEM_REGULAR)
list("USCM Welderpack", 12, /obj/item/storage/backpack/marine/engineerpack, null, VENDOR_ITEM_REGULAR),
list("USCM Weldersatchel", 12, /obj/item/storage/backpack/marine/engineerpack/satchel, null, VENDOR_ITEM_REGULAR),
list("USCM Welder Chestrig", 12, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, null, VENDOR_ITEM_REGULAR),
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,12 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
icon_state = "ERT_satchel"
worn_accessible = TRUE

/obj/item/storage/backpack/lightpack
name = "USCM Tactical Satchel"
desc = "A sleek lightweight bag made for carrying what you need while remaing stylish."
icon_state = "tacsatch"
worn_accessible = TRUE

/obj/item/storage/backpack/lightpack/five_slot
max_storage_space = 15

Expand Down
Loading