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 new synthetic cosmetics #4026

Merged
merged 4 commits into from
Jul 29, 2023
Merged

Adds new synthetic cosmetics #4026

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
486089b
Adds stethoscope and some armbands to snowflake
Katskan Jul 27, 2023
db06e0d
Merge branch 'cmss13-devs:master' into Adds-New-Synthetic-Cosmetics
Katskan Jul 27, 2023
b6aa935
Update code/game/machinery/vending/vendor_types/crew/synthetic.dm
Katskan Jul 27, 2023
560f9a7
Merge branch 'master' into Adds-New-Synthetic-Cosmetics
Katskan Jul 27, 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
7 changes: 7 additions & 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 @@ -76,6 +76,7 @@
list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR),
list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR),
list("Machete Scabbard (Full)", 2, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR)
Katskan marked this conversation as resolved.
Show resolved Hide resolved
list("Stethoscope", 2, /obj/item/clothing/accessory/stethoscope, null, VENDOR_ITEM_REGULAR)

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

View workflow job for this annotation

GitHub Actions / Run Linters 

got 'list', expected one of: operator, field access, ')', ','

)

Expand Down Expand Up @@ -263,6 +264,12 @@
list("USCM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, 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("OTHER", 0, null, null, null),
list("Red Armband", 6, /obj/item/clothing/accessory/armband, null, VENDOR_ITEM_REGULAR),
list("Yellow Armband", 6, /obj/item/clothing/accessory/armband/engine, null, VENDOR_ITEM_REGULAR),
list("Green Armband", 6, /obj/item/clothing/accessory/armband/medgreen, null, VENDOR_ITEM_REGULAR),

))

/obj/structure/machinery/cm_vending/clothing/synth/snowflake
Expand Down
Loading