This repository was archived by the owner on Sep 26, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 28
Wardrobe Vendor Fixes #123
Open
ben10083-zz
wants to merge
5
commits into
DDMers:master
Choose a base branch
from
ben10083-zz:Wardrobe_Vender_Fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e12e9b7
Wardrobe Vendor Fixes
Peppii b3de5be
Oops
Peppii 323e79d
Merge branch 'master' into Wardrobe_Vender_Fix
Kmc2000 0494b5f
Merge branch 'master' into Wardrobe_Vender_Fix
Kmc2000 400b985
Merge branch 'master' into Wardrobe_Vender_Fix
Kmc2000 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
||
|
|
@@ -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,, | ||
| /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,, | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
|
@@ -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) | ||
|
|
@@ -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, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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." |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Two commas