Skip to content
This repository was archived by the owner on Sep 26, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 7 additions & 26 deletions code/modules/vending/wardrobes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,8 @@
/obj/item/storage/backpack/security = 3,
/obj/item/storage/backpack/satchel/sec = 3,
/obj/item/storage/backpack/duffelbag/sec = 3,
/obj/item/clothing/under/rank/security = 3,
/obj/item/clothing/shoes/jackboots = 3,
/obj/item/clothing/head/beret/sec = 3,
/obj/item/clothing/head/soft/sec = 3,
/obj/item/clothing/mask/bandana/red = 3,
/obj/item/clothing/under/rank/security/skirt = 3,
/obj/item/clothing/under/rank/security/grey = 3,
/obj/item/clothing/under/pants/khaki = 3,
/obj/item/clothing/under/rank/security/blueshirt = 3)
premium = list(/obj/item/clothing/under/rank/security/navyblue = 3,
/obj/item/clothing/suit/security/officer = 3,
/obj/item/clothing/head/beret/sec/navyofficer = 3)
/obj/item/clothing/under/trek/engsec/ds9 = 6,
/obj/item/clothing/shoes/jackboots = 3)
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
payment_department = ACCOUNT_SEC

Expand All @@ -44,17 +34,11 @@
/obj/item/storage/backpack/duffelbag/med = 4,
/obj/item/storage/backpack/medic = 4,
/obj/item/storage/backpack/satchel/med = 4,
/obj/item/clothing/suit/hooded/wintercoat/medical = 4,
/obj/item/clothing/under/rank/nursesuit = 4,
/obj/item/clothing/head/nursehat = 4,
/obj/item/clothing/under/rank/medical/blue = 4,
/obj/item/clothing/under/rank/medical/green = 4,
/obj/item/clothing/under/rank/medical/purple = 4,
/obj/item/clothing/under/rank/medical = 4,
/obj/item/clothing/under/trek/medsci/ds9 = 6,
/obj/item/clothing/head/nursehat = 4,,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two commas

/obj/item/clothing/suit/toggle/labcoat = 4,
/obj/item/clothing/suit/toggle/labcoat/emt = 4,
/obj/item/clothing/shoes/sneakers/white = 4,
/obj/item/clothing/head/soft/emt = 4,
/obj/item/clothing/shoes/sneakers/white = 4,,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two commas

/obj/item/clothing/suit/apron/surgical = 4,
/obj/item/clothing/mask/surgical = 4)
refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
Expand All @@ -72,9 +56,7 @@
/obj/item/storage/backpack/duffelbag/engineering = 3,
/obj/item/storage/backpack/industrial = 3,
/obj/item/storage/backpack/satchel/eng = 3,
/obj/item/clothing/suit/hooded/wintercoat/engineering = 3,
/obj/item/clothing/under/rank/engineer = 3,
/obj/item/clothing/under/rank/engineer/hazard = 3,
/obj/item/clothing/under/trek/engsec/ds9 = 6,
/obj/item/clothing/suit/hazardvest = 3,
/obj/item/clothing/shoes/workboots = 3,
/obj/item/clothing/head/hardhat = 3)
Expand Down Expand Up @@ -146,8 +128,7 @@
products = list(/obj/item/clothing/accessory/pocketprotector = 3,
/obj/item/storage/backpack/science = 3,
/obj/item/storage/backpack/satchel/tox = 3,
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
/obj/item/clothing/under/rank/scientist = 3,
/obj/item/clothing/under/trek/medsci/ds9 = 6,
/obj/item/clothing/suit/toggle/labcoat/science = 3,
/obj/item/clothing/shoes/sneakers/white = 3,
/obj/item/radio/headset/headset_sci = 3,
Expand Down
35 changes: 35 additions & 0 deletions html/changelogs/ben10083 - Vendor_Fixes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# spellcheck (typo fixes)
# experiment
#################################

# Your name.
author: ben10083

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Major department uniform vendors now have the correct items."