shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into xantholne-christmas01

Browse Source
This commit is contained in:
Unknown
2019-12-06 17:21:08 -07:00
parent e929728666 0598c35d70
commit 97e686cf23
269 changed files with 10257 additions and 7157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/clothesmate.dm
+13 -1
View File
@@ -16,6 +16,7 @@
/obj/item/clothing/suit/jacket = 4,
/obj/item/clothing/suit/jacket/puffer/vest = 4,
/obj/item/clothing/suit/jacket/puffer = 4,
/obj/item/clothing/suit/hooded/cloak/david = 4,
/obj/item/clothing/under/suit_jacket/navy = 3,
/obj/item/clothing/under/suit_jacket/really_black = 3,
/obj/item/clothing/under/suit_jacket/burgundy = 3,
@@ -24,6 +25,12 @@
/obj/item/clothing/under/kilt = 3,
/obj/item/clothing/under/overalls = 3,
/obj/item/clothing/under/sl_suit = 3,
/obj/item/clothing/under/bb_sweater = 3,
/obj/item/clothing/under/bb_sweater/black = 3,
/obj/item/clothing/under/bb_sweater/purple = 3,
/obj/item/clothing/under/bb_sweater/green = 3,
/obj/item/clothing/under/bb_sweater/red = 3,
/obj/item/clothing/under/bb_sweater/blue = 3,
/obj/item/clothing/under/pants/jeans = 5,
/obj/item/clothing/under/pants/classicjeans = 5,
/obj/item/clothing/under/pants/camo = 3,
@@ -78,6 +85,10 @@
/obj/item/clothing/suit/ianshirt = 3,
/obj/item/clothing/shoes/laceup = 5,
/obj/item/clothing/shoes/sneakers/black = 6,
/obj/item/clothing/shoes/wraps = 3,
/obj/item/clothing/shoes/wraps/silver = 3,
/obj/item/clothing/shoes/wraps/red = 3,
/obj/item/clothing/shoes/wraps/blue = 3,
/obj/item/clothing/shoes/sandal = 3,
/obj/item/clothing/gloves/fingerless = 3,
/obj/item/clothing/glasses/orange = 5,
@@ -128,7 +139,8 @@
/obj/item/clothing/under/jabroni = 2,
/obj/item/clothing/suit/vapeshirt = 2,
/obj/item/clothing/under/geisha = 4,
/obj/item/clothing/accessory/syndi_pokadots = 4)
/obj/item/clothing/accessory/syndi_pokadots = 4,
/obj/item/clothing/under/keyholesweater = 3)
premium = list(/obj/item/clothing/under/suit_jacket/checkered = 4,
/obj/item/clothing/head/mailman = 2,
/obj/item/clothing/under/rank/mailman = 2,
code/modules/vending/drinnerware.dm
+9 -3
View File
@@ -6,7 +6,7 @@
products = list(/obj/item/storage/bag/tray = 8,
/obj/item/kitchen/fork = 6,
/obj/item/kitchen/knife = 6,
/obj/item/kitchen/rollingpin = 2,
/obj/item/kitchen/rollingpin = 4,
/obj/item/reagent_containers/food/drinks/drinkingglass = 8,
/obj/item/clothing/suit/apron/chef = 2,
/obj/item/storage/box/cups = 2,
@@ -17,7 +17,13 @@
/obj/item/reagent_containers/food/condiment/saltshaker = 5,
/obj/item/reagent_containers/food/condiment/peppermill = 5,
/obj/item/reagent_containers/glass/bowl = 30)
contraband = list(/obj/item/kitchen/rollingpin = 2,
/obj/item/kitchen/knife/butcher = 2)
contraband = list(
/obj/item/reagent_containers/food/snacks/monkeycube = 1,
/obj/item/kitchen/knife/butcher = 2,
/obj/item/reagent_containers/syringe = 3)
premium = list(
/obj/item/reagent_containers/food/condiment/enzyme = 1,
/obj/item/reagent_containers/food/condiment/soysauce = 1,
/obj/item/reagent_containers/glass/bottle/cryoxadone = 2) // Bartender can literally make this with upgraded parts, or it gets stolen from medical.
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
code/modules/vending/snack.dm
+10 -3
View File
@@ -11,9 +11,16 @@
/obj/item/reagent_containers/food/snacks/no_raisin = 6,
/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6)
contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6)
premium = list(/obj/item/storage/box/donkpockets = 1,
/obj/item/reagent_containers/food/snacks/poppypretzel = 3)
contraband = list(
/obj/item/reagent_containers/food/snacks/cracker = 12,
/obj/item/reagent_containers/food/snacks/beans = 2,
/obj/item/reagent_containers/food/snacks/honeybar = 6,
/obj/item/reagent_containers/food/snacks/syndicake = 6)
premium = list(
/obj/item/reagent_containers/food/snacks/lollipop = 2,
/obj/item/reagent_containers/food/snacks/spiderlollipop = 2,
/obj/item/reagent_containers/food/snacks/chococoin = 1,
/obj/item/storage/box/donkpockets = 2)
refill_canister = /obj/item/vending_refill/snack
var/chef_compartment_access = "28" //ACCESS_KITCHEN
code/modules/vending/wardrobes.dm
+3 -1
View File
@@ -278,7 +278,9 @@
/obj/item/storage/bag/trash = 1,
/obj/item/clothing/shoes/galoshes = 1,
/obj/item/watertank/janitor = 1,
/obj/item/storage/belt/janitor = 2)
/obj/item/storage/belt/janitor = 2,
/obj/item/screwdriver = 2,
/obj/item/stack/cable_coil/random = 4)
refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
/obj/item/vending_refill/wardrobe/jani_wardrobe