diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index eda95e2d7b1..de6a54d0b09 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -535,6 +535,5 @@ /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, - /obj/item/stack/cable_coil/random = 1, - /obj/item/powerdrill = 1 + /obj/item/stack/cable_coil/random = 1 ) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 72cbc876a6d..6079886817b 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -123,11 +123,12 @@ messengerbag = /obj/item/storage/backpack/messenger/engi belt_contents = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, - /obj/item/stack/cable_coil/random = 1, - /obj/item/powerdrill = 1 + /obj/item/stack/cable_coil/random = 1 ) /obj/outfit/job/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -189,13 +190,14 @@ tablet = /obj/item/modular_computer/handheld/preset/engineering/atmos belt_contents = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, /obj/item/device/t_scanner = 1, /obj/item/device/analyzer = 1, - /obj/item/pipewrench = 1, - /obj/item/powerdrill = 1 + /obj/item/pipewrench = 1 ) /obj/outfit/job/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -242,11 +244,12 @@ belt = /obj/item/storage/belt/utility belt_contents = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, - /obj/item/stack/cable_coil/random = 1, - /obj/item/powerdrill = 1 + /obj/item/stack/cable_coil/random = 1 ) headset = /obj/item/device/radio/headset/headset_eng @@ -275,13 +278,14 @@ belt = /obj/item/storage/belt/utility belt_contents = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, /obj/item/weldingtool = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, /obj/item/device/t_scanner = 1, /obj/item/device/analyzer = 1, - /obj/item/pipewrench = 1, - /obj/item/powerdrill = 1 + /obj/item/pipewrench = 1 ) headset = /obj/item/device/radio/headset/headset_eng diff --git a/code/game/jobs/job/event.dm b/code/game/jobs/job/event.dm index 09ee1ce9862..7be129ceb7a 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -123,11 +123,12 @@ SPECIES_VAURCA_BULWARK = null ) belt_contents = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, /obj/item/weldingtool/largetank = 1, /obj/item/crowbar = 1, /obj/item/wirecutters = 1, /obj/item/stack/cable_coil/random = 1, - /obj/item/powerdrill = 1, /obj/item/device/multitool = 1, /obj/item/hammer = 1 ) diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index a09de2281e1..f89d083ac35 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -67,7 +67,6 @@ /obj/item/reagent_containers/food/drinks/bottle/wine = 5, /obj/item/reagent_containers/food/drinks/bottle/rose_wine = 5, /obj/item/reagent_containers/food/drinks/bottle/whitewine = 5, - /obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha = 5, /obj/item/reagent_containers/food/drinks/bottle/drambuie = 4, /obj/item/reagent_containers/food/drinks/bottle/melonliquor = 2, /obj/item/reagent_containers/food/drinks/bottle/gin = 5, @@ -78,80 +77,28 @@ /obj/item/reagent_containers/food/drinks/bottle/bluecuracao = 2, /obj/item/reagent_containers/food/drinks/bottle/kahlua = 5, /obj/item/reagent_containers/food/drinks/bottle/triplesec = 5, - /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine = 2, /obj/item/reagent_containers/food/drinks/bottle/champagne = 5, /obj/item/reagent_containers/food/drinks/bottle/vodka = 5, - /obj/item/reagent_containers/food/drinks/bottle/vodka/mushroom = 2, /obj/item/reagent_containers/food/drinks/bottle/pulque = 5, /obj/item/reagent_containers/food/drinks/bottle/fireball = 2, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, - /obj/item/reagent_containers/food/drinks/bottle/victorygin = 2, /obj/item/reagent_containers/food/drinks/bottle/makgeolli = 2, /obj/item/reagent_containers/food/drinks/bottle/soju = 2, /obj/item/reagent_containers/food/drinks/bottle/sake = 1, /obj/item/reagent_containers/food/drinks/bottle/cremewhite = 4, /obj/item/reagent_containers/food/drinks/bottle/mintsyrup = 5, - /obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor = 2, - /obj/item/reagent_containers/food/drinks/bottle/chartreuseyellow =5, + /obj/item/reagent_containers/food/drinks/bottle/chartreuseyellow = 5, /obj/item/reagent_containers/food/drinks/bottle/messa_mead = 2, - /obj/item/reagent_containers/food/drinks/bottle/small/ale = 6, - /obj/item/reagent_containers/food/drinks/bottle/small/beer = 6, - /obj/item/reagent_containers/food/drinks/bottle/small/skrellbeerdyn = 15, - /obj/item/reagent_containers/food/drinks/bottle/small/xuizijuice = 8, - /obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz = 4, - /obj/item/reagent_containers/food/drinks/bottle/cola = 5, - /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 5, - /obj/item/reagent_containers/food/drinks/bottle/space_up = 5, - /obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda = 2, - /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water = 3, - /obj/item/reagent_containers/food/drinks/bottle/dominian_wine = 2, - /obj/item/reagent_containers/food/drinks/bottle/assunzione_wine = 2, - /obj/item/reagent_containers/food/drinks/bottle/algae_wine = 3, - /obj/item/reagent_containers/food/drinks/bottle/kvass = 3, - /obj/item/reagent_containers/food/drinks/bottle/tarasun = 3, - /obj/item/reagent_containers/food/drinks/bottle/valokki_wine = 3, - /obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive = 3, - /obj/item/reagent_containers/food/drinks/bottle/saintjacques = 1, /obj/item/reagent_containers/food/drinks/bottle/hooch = 1, - /obj/item/reagent_containers/food/drinks/bottle/nemiik = 2, - /obj/item/reagent_containers/food/drinks/bottle/ogogoro = 3, - /obj/item/reagent_containers/food/drinks/bottle/small/burukutu = 15, - /obj/item/reagent_containers/food/drinks/cans/grape_juice = 6, - /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2, - /obj/item/reagent_containers/food/drinks/cans/sodawater = 15, - /obj/item/reagent_containers/food/drinks/cans/tonic = 8, - /obj/item/reagent_containers/food/drinks/cans/threetowns = 6, - /obj/item/reagent_containers/food/drinks/cans/beer/rice = 8, - /obj/item/reagent_containers/food/drinks/carton/applejuice = 4, + /obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha = 2, /obj/item/reagent_containers/food/drinks/carton/cream = 4, - /obj/item/reagent_containers/food/drinks/carton/dynjuice = 4, /obj/item/reagent_containers/food/drinks/carton/limejuice = 4, /obj/item/reagent_containers/food/drinks/carton/lemonjuice = 4, /obj/item/reagent_containers/food/drinks/carton/orangejuice = 4, - /obj/item/reagent_containers/food/drinks/carton/tomatojuice = 4, - /obj/item/reagent_containers/food/drinks/carton/cranberryjuice = 4, - /obj/item/reagent_containers/food/drinks/carton/fatshouters = 2, - /obj/item/reagent_containers/food/drinks/carton/mutthir = 2, + /obj/item/reagent_containers/food/drinks/bottle/small/skrellbeerdyn = 8, + /obj/item/reagent_containers/food/drinks/bottle/small/xuizijuice = 8, /obj/item/reagent_containers/food/drinks/boba = 2, - /obj/item/reagent_containers/food/drinks/flask/barflask = 2, - /obj/item/reagent_containers/food/drinks/flask/vacuumflask = 2, /obj/item/reagent_containers/food/drinks/ice = 9, - /obj/item/reagent_containers/food/drinks/drinkingglass = 30, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/pint = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/square = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shake = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/goblet = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/wine = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/flute = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cognac = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cocktail = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 4, - /obj/item/reagent_containers/glass/beaker/pitcher = 4, - /obj/item/storage/box/fancy/vkrexi_swollen_organ = 2 ) contraband = list( /obj/item/reagent_containers/food/drinks/tea = 10 @@ -1024,6 +971,7 @@ /obj/item/seeds/soyaseed = 3, /obj/item/seeds/sthberryseed = 3, /obj/item/seeds/strawberryseed = 3, + /obj/item/seeds/cranberryseed = 3, /obj/item/seeds/sugarcaneseed = 3, /obj/item/seeds/sunflowerseed = 3, /obj/item/seeds/sugartree = 2, @@ -1104,6 +1052,7 @@ /obj/item/seeds/shandseed = 60, /obj/item/seeds/soyaseed = 40, /obj/item/seeds/strawberryseed = 40, + /obj/item/seeds/cranberryseed = 40, /obj/item/seeds/sugarcaneseed = 20, /obj/item/seeds/sunflowerseed = 20, /obj/item/seeds/sugartree = 40, @@ -1235,11 +1184,25 @@ name = "glasses vendor" desc = "A bar vendor for dispensing various glasses and cups." products = list( + /obj/item/reagent_containers/glass/beaker/pitcher = 4, /obj/item/reagent_containers/food/drinks/drinkingglass = 20, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3, - /obj/item/reagent_containers/glass/beaker/pitcher = 3, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6, /obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 12, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/pint = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/square = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shake = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/goblet = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/wine = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/flute = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cognac = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/cocktail = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot = 6, + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup = 6, + /obj/item/reagent_containers/food/drinks/flask/barflask = 2, + /obj/item/reagent_containers/food/drinks/flask/vacuumflask = 2, /obj/item/material/kitchen/utensil/fork = 6, /obj/item/material/kitchen/utensil/knife = 6, /obj/item/material/kitchen/utensil/spoon = 6, @@ -1314,7 +1277,6 @@ vend_id = "tools" products = list( /obj/item/device/multitool = 4, - /obj/item/powerdrill = 2, /obj/item/taperoll/engineering = 4, /obj/item/clothing/glasses/safety/goggles = 4, /obj/item/airlock_electronics = 20, @@ -1409,7 +1371,6 @@ /obj/item/wirecutters = 8, /obj/item/device/multitool = 8, /obj/item/wrench = 8, - /obj/item/powerdrill = 4, /obj/item/device/t_scanner = 8, /obj/item/stack/cable_coil/random = 10, /obj/item/cell = 5, @@ -2073,3 +2034,37 @@ If you want to expand this to more than primarily generic items, I recommend des /obj/item/clothing/shoes/heels = 6, /obj/item/clothing/shoes/winter = 6, ) + +/obj/machinery/vending/lavatory + name = "\improper Lavatory Essentials" + desc = "Vends things that make you less reviled in the work-place!" + icon_state = "lavatory" + icon_vend = "lavatory-vend" + icon_deny = "lavatory-deny" + product_ads = "Take a shower you hippie.;Get a haircut, hippie!;Reeking of Vaurca taint? Take a shower!;You reek! Freshen up!;Hey, you dropped something!;Cleansing the world, one person at a time!" + prices = list( + /obj/item/soap = 20, + /obj/item/mirror = 40, + /obj/item/haircomb/random = 40, + /obj/item/towel/random = 50, + /obj/item/reagent_containers/spray/cleaner/deodorant = 30, + /obj/item/reagent_containers/toothpaste = 40, + /obj/item/reagent_containers/toothbrush = 20, + /obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash = 30 + ) + products = list( + /obj/item/soap = 12, + /obj/item/mirror = 8, + /obj/item/haircomb/random = 8, + /obj/item/towel/random = 6, + /obj/item/reagent_containers/spray/cleaner/deodorant = 5, + /obj/item/reagent_containers/toothpaste = 5, + /obj/item/reagent_containers/toothbrush = 12, + /obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash = 5 + ) + premium = list( + /obj/item/grenade/chem_grenade/metalfoam = 0, + ) + contraband = list( + /obj/item/inflatable_duck = 1 + ) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index b459f2b1524..ebbfcf6514d 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -150,11 +150,12 @@ /obj/item/storage/belt/utility/very_full starts_with = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, /obj/item/weldingtool/largetank = 1, /obj/item/crowbar = 1, /obj/item/wirecutters/toolbelt = 1, /obj/item/stack/cable_coil/random = 1, - /obj/item/powerdrill = 1, /obj/item/device/multitool = 1, /obj/item/device/radio = 1 ) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index e7a2524a444..dd9afabf0e6 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1359,7 +1359,7 @@ new /obj/item/stack/material/steel(src, 2) /obj/item/storage/box/sawn_doublebarrel_shotgun - name = "sawn-off Dduble-barrel shotgun kit" + name = "sawn-off Double-barrel shotgun kit" desc = "A box containing a sawn-off double-barrel shotgun, an holster and some ammo." starts_with = list(/obj/item/gun/projectile/shotgun/doublebarrel/sawn = 1, /obj/item/ammo_casing/shotgun/pellet = 6, @@ -1397,3 +1397,91 @@ starts_with = list( /obj/item/reagent_containers/food/snacks/grown/wulumunusha/dried = 4 ) + +/obj/item/storage/box/ale + name = "pack of ale" + desc = "A box containing a six pack of ale." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/small/ale = 6 + ) + +/obj/item/storage/box/beer + name = "pack of beer" + desc = "A box containing a six pack of beer." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/small/beer = 6 + ) + +/obj/item/storage/box/skrellbeerdyn + name = "pack of dyn beer" + desc = "A box containing a six pack of dyn beer." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/small/skrellbeerdyn = 6 + ) + +/obj/item/storage/box/xuizijuice + name = "pack of xuizi juice" + desc = "A box containing a six pack of xuizi juice." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/small/xuizijuice = 6 + ) + +/obj/item/storage/box/khlibnyz + name = "pack of khlibnyz" + desc = "A box containing a six pack of khlibnyz." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz = 6 + ) + +/obj/item/storage/box/cola + name = "pack of cola" + desc = "A box containing a six pack of cola." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/cola = 6 + ) + +/obj/item/storage/box/space_mountain_wind + name = "pack of space mountain wind" + desc = "A box containing a six pack of space mountain wind." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 6 + ) + +/obj/item/storage/box/space_up + name = "pack of space-up" + desc = "A box containing a six pack of space-up." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/space_up = 6 + ) + +/obj/item/storage/box/hrozamal_soda + name = "pack of hrozamal soda" + desc = "A box containing a six pack of hrozamal soda." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda = 6 + ) + +/obj/item/storage/box/midynhr_water + name = "pack of midynhr water" + desc = "A box containing a six pack of midynhr water." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water = 6 + ) + +/obj/item/storage/box/midynhr_water + name = "pack of burukutu" + desc = "A box containing a six pack of burukutu." + illustration = "soda" + starts_with = list( + /obj/item/reagent_containers/food/drinks/bottle/small/burukutu = 6 + ) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 847a4b6f8a6..ecbca0085f6 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -86,7 +86,8 @@ contained_sprite = TRUE starts_with = list( /obj/item/crowbar = 1, - /obj/item/powerdrill = 1, + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, /obj/item/mining_scanner = 1, /obj/item/cell/high = 1, /obj/item/device/orbital_dropper/drill = 1 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 61f00b0e7a5..5a26574c165 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -23,26 +23,3 @@ new /obj/item/reagent_containers/food/drinks/bottle/small/beer(src) new /obj/item/reagent_containers/food/drinks/bottle/small/beer(src) new /obj/item/reagent_containers/food/drinks/bottle/small/beer(src) - -/obj/structure/closet/secure_closet/cabinet/beer - name = "beer closet" - desc = "A cabinet stacked end-to-end with six packs of beer." - req_access = null - storage_capacity = 45 - -/obj/structure/closet/secure_closet/cabinet/beer/fill() - new /obj/item/storage/box/fancy/yoke/beer(src) - new /obj/item/storage/box/fancy/yoke/beer(src) - new /obj/item/storage/box/fancy/yoke/ebisu(src) - new /obj/item/storage/box/fancy/yoke/ebisu(src) - new /obj/item/storage/box/fancy/yoke/shimauma(src) - new /obj/item/storage/box/fancy/yoke/shimauma(src) - new /obj/item/storage/box/fancy/yoke/moonlabor(src) - new /obj/item/storage/box/fancy/yoke/moonlabor(src) - new /obj/item/storage/box/fancy/yoke/earthmover(src) - new /obj/item/storage/box/fancy/yoke/earthmover(src) - new /obj/item/storage/box/fancy/yoke/whistlingforest(src) - new /obj/item/storage/box/fancy/yoke/whistlingforest(src) - -/obj/structure/closet/secure_closet/cabinet/beer/horizon - req_access = list(ACCESS_BAR) diff --git a/code/modules/cargo/items/engineering.dm b/code/modules/cargo/items/engineering.dm index fc836427e4e..b1b3403fd54 100644 --- a/code/modules/cargo/items/engineering.dm +++ b/code/modules/cargo/items/engineering.dm @@ -602,7 +602,7 @@ /singleton/cargo_item/debugger category = "engineering" - name = "Debugger" + name = "debugger" supplier = "hephaestus" description = "Used to debug electronic equipment." price = 50 @@ -614,6 +614,20 @@ groupable = TRUE spawn_amount = 2 +/singleton/cargo_item/powerdrill + category = "engineering" + name = "impact wrench" + supplier = "hephaestus" + description = "Wrenches and screws things. Faster." + price = 50 + items = list( + /obj/item/powerdrill + ) + access = ACCESS_ENGINE + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/paintgun category = "engineering" name = "paint gun" @@ -867,3 +881,5 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 + + diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm index 732cc069028..bbb8b1bb32b 100644 --- a/code/modules/cargo/items/hospitality.dm +++ b/code/modules/cargo/items/hospitality.dm @@ -488,6 +488,132 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/cream + category = "hospitality" + name = "milk cream carton" + supplier = "getmore" + description = "It's cream. Made from milk. What else did you think you'd find in there?" + price = 15 + items = list( + /obj/item/reagent_containers/food/drinks/carton/cream + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/fatshouters + category = "hospitality" + name = "fatshouters milk carton" + supplier = "getmore" + description = "Fatty fatshouters milk in a carton." + price = 20 + items = list( + /obj/item/reagent_containers/food/drinks/carton/fatshouters + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/orangejuice + category = "hospitality" + name = "orange juice carton" + supplier = "getmore" + description = "Full of vitamins and deliciousness!" + price = 15 + items = list( + /obj/item/reagent_containers/food/drinks/carton/orangejuice + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/tomatojuice + category = "hospitality" + name = "tomato juice carton" + supplier = "getmore" + description = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." + price = 15 + items = list( + /obj/item/reagent_containers/food/drinks/carton/tomatojuice + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/limejuice + category = "hospitality" + name = "lime juice carton" + supplier = "getmore" + description = "Sweet-sour goodness." + price = 15 + items = list( + /obj/item/reagent_containers/food/drinks/carton/limejuice + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/cranberryjuice + category = "hospitality" + name = "cranberry juice carton" + supplier = "getmore" + description = "Tart and sweet. A unique flavor for a unique berry." + price = 15 + items = list( + /obj/item/reagent_containers/food/drinks/carton/cranberryjuice + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/lemonjuice + category = "hospitality" + name = "lemon juice carton" + supplier = "getmore" + description = "This juice is VERY sour." + price = 15 + items = list( + /obj/item/reagent_containers/food/drinks/carton/lemonjuice + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/dynjuice + category = "hospitality" + name = "dyn juice carton" + supplier = "getmore" + description = "Juice from a Skrell medicinal herb. It's supposed to be diluted." + price = 20 + items = list( + /obj/item/reagent_containers/food/drinks/carton/dynjuice + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/applejuice + category = "hospitality" + name = "apple juice carton" + supplier = "getmore" + description = "Juice from an apple. Yes." + price = 15 + items = list( + /obj/item/reagent_containers/food/drinks/carton/applejuice + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/chipmultipackcrate category = "hospitality" name = "chip multipack crate" @@ -549,34 +675,6 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/burszi_ale - category = "hospitality" - name = "Burszi-ale" - supplier = "getmore" - description = "A half-dozen crate of Burszi-ale bottles, for cracking open a cold one." - price = 220 - items = list( - /obj/item/reagent_containers/food/drinks/bottle/small/ale - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 6 - -/singleton/cargo_item/beer - category = "hospitality" - name = "Virklunder beer (x6)" - supplier = "getmore" - description = "A half-dozen crate of Virklunder beers, for cracking open a cold one." - price = 220 - items = list( - /obj/item/reagent_containers/food/drinks/bottle/small/beer - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 6 - /singleton/cargo_item/champagne category = "hospitality" name = "Silverport champagne" @@ -771,3 +869,799 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 + +/singleton/cargo_item/beer + category = "hospitality" + name = "Virklunder beer (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Virklunder beers, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/fancy/yoke/beer + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/ebisu + category = "hospitality" + name = "Ebisu Super Dry rice beer (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Ebisu Super Dry rice beer, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/fancy/yoke/ebisu + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/shimauma + category = "hospitality" + name = "Shimauma Ichiban rice beer (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Shimauma Ichiban rice beer, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/fancy/yoke/shimauma + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/moonlabor + category = "hospitality" + name = "Moonlabor Malt's rice beer (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Moonlabor Malt's rice beer, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/fancy/yoke/moonlabor + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/moonlabor + category = "hospitality" + name = "Moonlabor Malt's rice beer (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Moonlabor Malt's rice beer, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/fancy/yoke/moonlabor + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/earthmover + category = "hospitality" + name = "Inverkeithing Imports Earthmover ale (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Inverkeithing Imports Earthmover ale, for cracking open a cold one." + price = 250 + items = list( + /obj/item/storage/box/fancy/yoke/earthmover + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/whistlingforest + category = "hospitality" + name = "Whistling Forest Pale Ale (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Whistling Forest Pale Ale, for cracking open a cold one." + price = 250 + items = list( + /obj/item/storage/box/fancy/yoke/whistlingforest + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/cola + category = "hospitality" + name = "Comet Cola (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Comet Cola for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/cola + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/space_mountain_wind + category = "hospitality" + name = "Stellar Jolt (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Stellar Jolt for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/space_mountain_wind + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/thirteenloko + category = "hospitality" + name = "Stellar Jolt (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Stellar Jolt for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/thirteenloko + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/thirteenloko + category = "hospitality" + name = "Getmore Energy (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/thirteenloko + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/thirteenloko + category = "hospitality" + name = "Getmore Energy (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/thirteenloko + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/dr_gibb + category = "hospitality" + name = "Getmore Root-Cola (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/dr_gibb + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/dr_gibb + category = "hospitality" + name = "Getmore Root-Cola (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/dr_gibb + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/starkist + category = "hospitality" + name = "Orange Starshine (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Orange Starshine for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/starkist + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/space_up + category = "hospitality" + name = "Vacuum Fizz (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Vacuum Fizz for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/space_up + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/space_up + category = "hospitality" + name = "Lemon-Lime (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Lemon-Lime for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/space_up + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/iced_tea + category = "hospitality" + name = "Silversun Wave Iced Tea (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Silversun Wave Iced Tea for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/iced_tea + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/grape_juice + category = "hospitality" + name = "Grapel Juice (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Grapel Juice for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/grape_juice + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/tonic + category = "hospitality" + name = "T-Borg's Tonic Water (x6)" + supplier = "getmore" + description = "A 6-pack yoke of T-Borg's Tonic Water for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/tonic + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/sodawater + category = "hospitality" + name = "Soda Water (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Soda Water for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/sodawater + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/root_beer + category = "hospitality" + name = "Getmore Root Beer (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Getmore Root Beer for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/root_beer + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/diet_cola + category = "hospitality" + name = "Diet Comet Cola (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Diet Comet Cola for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/diet_cola + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/peach_soda + category = "hospitality" + name = "Xanu Rush! Peach Soda (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Xanu Rush! Peach Soda for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/peach_soda + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/melon_soda + category = "hospitality" + name = "Kansumi Melon Soda (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Kansumi Melon Soda for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/melon_soda + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/himeokvass + category = "hospitality" + name = "Dorshafen Deluxe Kvass (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Dorshafen Deluxe Kvass for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/fancy/yoke/himeokvass + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/xanuchai + category = "hospitality" + name = "Brown Palace Champion Chai (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Brown Palace Champion Chai for cracking open a cold one." + price = 100 + items = list( + /obj/item/storage/box/fancy/yoke/xanuchai + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/beetle_milk + category = "hospitality" + name = "Hakhma Beetle Milk (x6)" + supplier = "getmore" + description = "A 6-pack yoke of Hakhma Beetle Milk for cracking open a cold one." + price = 80 + items = list( + /obj/item/storage/box/fancy/yoke/beetle_milk + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/burszi_ale + category = "hospitality" + name = "Burszi-ale (x6)" + supplier = "getmore" + description = "A half-dozen pack of Burszi-ale bottles, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/ale + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/beer + category = "hospitality" + name = "Virklunder Beer (x6)" + supplier = "getmore" + description = "A half-dozen pack of Virklunder beers, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/beer + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/skrellbeerdyn + category = "hospitality" + name = "Qel'Zvol Hospitality's Prestige Dyn Beer (x6)" + supplier = "getmore" + description = "A half-dozen pack of Qel'Zvol Hospitality's Prestige dyn beers, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/skrellbeerdyn + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/xuizijuice + category = "hospitality" + name = "Xuizi Juice (x6)" + supplier = "getmore" + description = "A half-dozen pack of Xuiji Juice, for cracking open a cold one." + price = 220 + items = list( + /obj/item/storage/box/xuizijuice + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/khlibnyz + category = "hospitality" + name = "Khlibnyz (x6)" + supplier = "getmore" + description = "A half-dozen pack of Khlibnyz, for cracking open a cold one." + price = 120 + items = list( + /obj/item/storage/box/khlibnyz + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/cola_bottle + category = "hospitality" + name = "Comet Cola Bottles (x6)" + supplier = "getmore" + description = "A half-dozen pack of Comet Cola, for cracking open a cold one." + price = 100 + items = list( + /obj/item/storage/box/cola + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/space_mountain_wind_bottle + category = "hospitality" + name = "Stellar Jolt Bottles (x6)" + supplier = "getmore" + description = "A half-dozen pack of Stellar Jolt, for cracking open a cold one." + price = 100 + items = list( + /obj/item/storage/box/space_mountain_wind + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/space_up_bottle + category = "hospitality" + name = "Space Up Bottles (x6)" + supplier = "getmore" + description = "A half-dozen pack of Space Up, for cracking open a cold one." + price = 100 + items = list( + /obj/item/storage/box/space_up + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/hrozamal_soda + category = "hospitality" + name = "Hrozamal Soda (x6)" + supplier = "getmore" + description = "A half-dozen pack of Hrozamal Soda, for cracking open a cold one." + price = 100 + items = list( + /obj/item/storage/box/hrozamal_soda + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/midynhr_water + category = "hospitality" + name = "Midynhr Water (x6)" + supplier = "getmore" + description = "A half-dozen pack of Midynhr Water, for cracking open a cold one." + price = 100 + items = list( + /obj/item/storage/box/midynhr_water + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/dental_hygiene + category = "hospitality" + name = "Dental Hygiene Kit" + supplier = "getmore" + description = "A box containing a toothbrush, a tube of toothpaste, and a bottle of mouthwash." + price = 150 + items = list( + /obj/item/storage/box/toothpaste + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/sencha + category = "hospitality" + name = "Sencha Tins (x7)" + supplier = "getmore" + description = "A box containing some tins of green tea leaves." + price = 100 + items = list( + /obj/item/storage/box/tea + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/sencha + category = "hospitality" + name = "Sencha-cha Tins (x7)" + supplier = "getmore" + description = "A box containing some tins of green tea leaves." + price = 100 + items = list( + /obj/item/storage/box/tea + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/tieguanyin + category = "hospitality" + name = "Tieguanyin-cha Tins (x7)" + supplier = "getmore" + description = "A box containing some tins of oolong tea leaves." + price = 100 + items = list( + /obj/item/storage/box/tea/tieguanyin + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/jaekseol + category = "hospitality" + name = "Jaeksol-cha Tins (x7)" + supplier = "getmore" + description = "A box containing some tins of black tea leaves." + price = 100 + items = list( + /obj/item/storage/box/tea/jaekseol + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/jaekseol + category = "hospitality" + name = "V'krexi Swollen Organ" + supplier = "getmore" + description = "A traditional Sedantian alcoholic drink, packaged in the stomach it's fermented in." + price = 150 + items = list( + /obj/item/storage/box/fancy/vkrexi_swollen_organ + ) + access = 0 + container_type = "crate" + groupable = TRUE + +/singleton/cargo_item/dominian_wine + category = "hospitality" + name = "Jadrani Consecrated Geneboosted Wine" + supplier = "getmore" + description = "A bottle of artisanally-crafted, highly sought-after Dominian red wine. Sanctified and exported via House Caladius." + price = 500 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/dominian_wine + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/algae_wine + category = "hospitality" + name = "Reacher's Triumph 2423 Algae Wine" + supplier = "getmore" + description = "A bottle of wine, brewed from algae, made in the traditional style of the Imperial Viceroyalty of Sun Reach, a Dominian frontier-world." + price = 500 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/algae_wine + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/assunzione_wine + category = "hospitality" + name = "\improper Assunzioni Sera Stellata di Dalyan Wine" + supplier = "getmore" + description = "A bottle of velvety smooth red wine from the underground vineyards of Dalyan, Assunzione." + price = 500 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/assunzione_wine + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/assunzione_wine + category = "hospitality" + name = "\improper Assunzioni Sera Stellata di Dalyan Wine" + supplier = "getmore" + description = "A bottle of velvety smooth red wine from the underground vineyards of Dalyan, Assunzione." + price = 500 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/assunzione_wine + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/skrellwineylpha + category = "hospitality" + name = "Federation's Finest Ylpha Wine" + supplier = "getmore" + description = "A popular type of Skrell wine made from fermented ylpha berries." + price = 300 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/mushroomvodka + category = "hospitality" + name = "Inverkeithing Import Mushroom Vodka" + supplier = "getmore" + description = "A mushroom-based vodka imported from the breweries of Inverkeithing on Himeo." + price = 300 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/vodka/mushroom + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/victorygin + category = "hospitality" + name = "Victory Gin" + supplier = "getmore" + description = "A Tajaran gin considered to be the official drink of the People's Republic of Adhomai." + price = 200 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/victorygin + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/nmshaan_liquor + category = "hospitality" + name = "Nm'shaan Liquor" + supplier = "getmore" + description = "A strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking." + price = 200 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/messa_mead + category = "hospitality" + name = "messa's mead" + supplier = "getmore" + description = "A bottle of Messa's mead. Bottled somewhere in the icy world of Adhomai." + price = 200 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/messa_mead + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/kvass + category = "hospitality" + name = "Neubach Original Kvass" + supplier = "getmore" + description = "A bottle of authentic Fisanduhian kvass, a cereal alcohol." + price = 200 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/kvass + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/tarasun + category = "hospitality" + name = "Frostdancer Distillery Tarasun" + supplier = "getmore" + description = "A bottle of Lyodii tarasun, an alcoholic beverage made from tenelote milk." + price = 200 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/tarasun + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/valokki_wine + category = "hospitality" + name = "Frostdancer Distillery Valokki Wine" + supplier = "getmore" + description = "A bottle of wine distilled from the Morozi cloudberry." + price = 400 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/valokki_wine + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/twentytwoseventyfive + category = "hospitality" + name = "2275 Classic Brandy" + supplier = "getmore" + description = "A bottle of Xanan mid-range brandy." + price = 350 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/saintjacques + category = "hospitality" + name = "Saint-Jacques Black Label Cognac" + supplier = "getmore" + description = "An expensive bottle of Saint-Jacques Black Label, a Xanan luxury cognac." + price = 400 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/saintjacques + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/nemiik + category = "hospitality" + name = "Vrozka Farms Ne'miik" + supplier = "getmore" + description = "A bottle of Ne'miik under the label 'Vrozka Farms' from Caprice. The Vaurcan analogue for milk." + price = 100 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/nemiik + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/ogogoro + category = "hospitality" + name = "Ogogoro Jar" + supplier = "getmore" + description = "A traditional Eridani palm wine drink, stored in a mason jar." + price = 150 + items = list( + /obj/item/reagent_containers/food/drinks/bottle/ogogoro + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 7d8db5f73f2..3bb9100cc34 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -411,15 +411,15 @@ gear_tweaks += new /datum/gear_tweak/path(comics) /datum/gear/toothpaste - display_name = "toothpaste and toothbrush" + display_name = "dental hygiene kit" path = /obj/item/storage/box/toothpaste /datum/gear/toothpaste/New() ..() var/list/toothpaste = list() - toothpaste["toothpaste and blue toothbrush"] = /obj/item/storage/box/toothpaste - toothpaste["toothpaste and green toothbrush"] = /obj/item/storage/box/toothpaste/green - toothpaste["toothpaste and red toothbrush"] = /obj/item/storage/box/toothpaste/red + toothpaste["dental hygiene kit, blue toothbrush"] = /obj/item/storage/box/toothpaste + toothpaste["dental hygiene kit, green toothbrush"] = /obj/item/storage/box/toothpaste/green + toothpaste["dental hygiene kit, red toothbrush"] = /obj/item/storage/box/toothpaste/red gear_tweaks += new /datum/gear_tweak/path(toothpaste) /datum/gear/photo diff --git a/code/modules/hydroponics/seed_datums/fruits.dm b/code/modules/hydroponics/seed_datums/fruits.dm index fa1381315ac..b3b33976eee 100644 --- a/code/modules/hydroponics/seed_datums/fruits.dm +++ b/code/modules/hydroponics/seed_datums/fruits.dm @@ -255,6 +255,22 @@ /obj/item/seeds/strawberryseed seed_type = "strawberries" + +/datum/seed/berry/cranberry + name = "cranberries" + seed_name = "cranberry" + display_name = "cranberry bush" + mutants = list("berries","poisonberries","glowberries") + chems = list(/singleton/reagent/nutriment = list(1,10), /singleton/reagent/drink/cranberryjuice = list(10,10)) + kitchen_tag = "cranberries" + +/datum/seed/berry/cranberry/setup_traits() + ..() + set_trait(TRAIT_PRODUCT_COLOUR,"#bb0202") + +/obj/item/seeds/cranberryseed + seed_type = "cranberries" + ////////////// // Apples // ////////////// diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index aa70536b782..188c2d2d13c 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -21,6 +21,7 @@ var/glass_name = null var/glass_desc = null var/glass_center_of_mass = null + var/condiment_icon = null var/condiment_icon_state = null var/condiment_name = null var/condiment_desc = null diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_skrell.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_skrell.dm index d9bc1c37a25..a54e7935aac 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_skrell.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_skrell.dm @@ -123,6 +123,11 @@ glass_name = "glass of dyn juice" glass_desc = "Juice from a dyn leaf. Good for you, but normally not consumed undiluted." + condiment_name = "dyn juice" + condiment_desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted." + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "dynjuice" + /singleton/reagent/drink/dynjuice/hot name = "Dyn Tea" taste_description = "peppermint water" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm index cb7455edc58..42d996e7d3a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm @@ -116,6 +116,11 @@ glass_desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs." glass_icon_state = "mutthir_glass" + condiment_name = "mutthir carton" + condiment_desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs." + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "mutthir" + /singleton/reagent/drink/milk/schlorrgo name = "Schlorrgo Milk" description = "An opaque white liquid produced by the mammary glands of the Schlorrgo." diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm index f11e58412d2..c8e72a221da 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_drinks.dm @@ -205,6 +205,11 @@ glass_name = "glass of lemon juice" glass_desc = "Sour..." + condiment_name = "lemon juice" + condiment_desc = "This juice is VERY sour." + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "lemonjuice" + /singleton/reagent/drink/limejuice name = "Lime Juice" description = "The sweet-sour juice of limes." @@ -216,6 +221,11 @@ glass_name = "glass of lime juice" glass_desc = "A glass of sweet-sour lime juice" + condiment_name = "lime juice" + condiment_desc = "Sweet-sour goodness." + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "limejuice" + /singleton/reagent/drink/orangejuice name = "Orange Juice" description = "Both delicious AND rich in Vitamin C, what more do you need?" @@ -226,6 +236,11 @@ glass_name = "glass of orange juice" glass_desc = "Vitamins! Yay!" + condiment_name = "orange juice" + condiment_desc = "Full of vitamins and deliciousness!" + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "orangejuice" + /singleton/reagent/drink/orangejuice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) ..() if(alien == IS_DIONA) @@ -242,6 +257,11 @@ glass_name = "glass of cranberry juice" glass_desc = "Fresh, tart, and sweet cranberry juice." + condiment_name = "cranberry juice" + condiment_desc = "Tart and sweet. A unique flavor for a unique berry." + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "cranberryjuice" + /singleton/reagent/drink/potatojuice name = "Potato Juice" description = "Juice of the potato. Bleh." @@ -263,6 +283,11 @@ glass_name = "glass of tomato juice" glass_desc = "Are you sure this is tomato juice?" + condiment_name = "tomato juice" + condiment_desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "tomatojuice" + /singleton/reagent/drink/tomatojuice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) ..() M.heal_organ_damage(0, 0.1 * removed) @@ -324,6 +349,11 @@ glass_name = "glass of apple juice" glass_desc = "Juice from an apple. The most basic beverage you can imagine." + condiment_name = "apple juice" + condiment_desc = "Juice from an apple. Yes." + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "applejuice" + /singleton/reagent/drink/pearjuice name = "Pear Juice" description = "Delicious sweet juice made from pears." diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_ingredients.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_ingredients.dm index 0d26dd6693e..46fa1e826f1 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_ingredients.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_ingredients.dm @@ -845,6 +845,11 @@ glass_name = "glass of milk" glass_desc = "White and nutritious goodness!" + condiment_name = "space milk" + condiment_desc = "It's milk. White and nutritious goodness!" + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "milk" + default_temperature = T0C + 5 /singleton/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) @@ -876,6 +881,11 @@ glass_name = "glass of cream" glass_desc = "Ewwww..." + condiment_name = "milk cream" + condiment_desc = "It's cream. Made from milk. What else did you think you'd find in there?" + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "cream" + /singleton/reagent/drink/milk/soymilk name = "Soy Milk" description = "An opaque white liquid made from soybeans." @@ -886,6 +896,11 @@ glass_name = "glass of soy milk" glass_desc = "White and nutritious soy goodness!" + condiment_name = "soy milk" + condiment_desc = "It's soy milk. White and nutritious goodness!" + condiment_icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi' + condiment_icon_state = "soymilk" + /singleton/reagent/drink/milk/chocolate name = "Chocolate Milk" description = "A mixture of perfectly healthy milk and delicious chocolate." diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm index 6fa0d208c43..011c90de48a 100644 --- a/code/modules/reagents/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/dispenser/cartridge_presets.dm @@ -123,6 +123,9 @@ /obj/item/reagent_containers/chem_disp_cartridge/wine spawn_reagent = /singleton/reagent/alcohol/wine +/obj/item/reagent_containers/chem_disp_cartridge/rice_beer + spawn_reagent = /singleton/reagent/alcohol/rice_beer + // Bar, soft /obj/item/reagent_containers/chem_disp_cartridge/apple diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm index de6b1c47a95..823029c26bf 100644 --- a/code/modules/reagents/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/dispenser/dispenser_presets.dm @@ -79,9 +79,6 @@ spawn_cartridges = list( /obj/item/reagent_containers/chem_disp_cartridge/water, /obj/item/reagent_containers/chem_disp_cartridge/ice, - /obj/item/reagent_containers/chem_disp_cartridge/coffee{temperature_override = 369}, - /obj/item/reagent_containers/chem_disp_cartridge/hot_coco{temperature_override = 349}, - /obj/item/reagent_containers/chem_disp_cartridge/cream, /obj/item/reagent_containers/chem_disp_cartridge/tea{temperature_override = 349}, /obj/item/reagent_containers/chem_disp_cartridge/icetea, /obj/item/reagent_containers/chem_disp_cartridge/cola, @@ -92,15 +89,7 @@ /obj/item/reagent_containers/chem_disp_cartridge/tonic, /obj/item/reagent_containers/chem_disp_cartridge/sodawater, /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/reagent_containers/chem_disp_cartridge/orange, - /obj/item/reagent_containers/chem_disp_cartridge/lime, - /obj/item/reagent_containers/chem_disp_cartridge/apple, - /obj/item/reagent_containers/chem_disp_cartridge/lemon, - /obj/item/reagent_containers/chem_disp_cartridge/cranberry, - /obj/item/reagent_containers/chem_disp_cartridge/watermelon, /obj/item/reagent_containers/chem_disp_cartridge/clean_kois, - /obj/item/reagent_containers/chem_disp_cartridge/banana, /obj/item/reagent_containers/chem_disp_cartridge/root_beer ) @@ -118,9 +107,6 @@ /obj/machinery/chemical_dispenser/bar_alc/full spawn_cartridges = list( /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime, - /obj/item/reagent_containers/chem_disp_cartridge/sugar, - /obj/item/reagent_containers/chem_disp_cartridge/orange, - /obj/item/reagent_containers/chem_disp_cartridge/lime, /obj/item/reagent_containers/chem_disp_cartridge/sodawater, /obj/item/reagent_containers/chem_disp_cartridge/tonic, /obj/item/reagent_containers/chem_disp_cartridge/beer, @@ -138,7 +124,8 @@ /obj/item/reagent_containers/chem_disp_cartridge/ale, /obj/item/reagent_containers/chem_disp_cartridge/mead, /obj/item/reagent_containers/chem_disp_cartridge/grenadine, - /obj/item/reagent_containers/chem_disp_cartridge/cream + /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/rice_beer ) /obj/machinery/chemical_dispenser/bar_alc/full/space //Spacebar away site. Gets much more to make the best drinks, hassle-free. @@ -167,6 +154,7 @@ /obj/item/reagent_containers/chem_disp_cartridge/mead, /obj/item/reagent_containers/chem_disp_cartridge/grenadine, /obj/item/reagent_containers/chem_disp_cartridge/cream, + /obj/item/reagent_containers/chem_disp_cartridge/rice_beer, /obj/item/reagent_containers/chem_disp_cartridge/ethanol, /obj/item/reagent_containers/chem_disp_cartridge/berryjuice, /obj/item/reagent_containers/chem_disp_cartridge/radium/small, @@ -214,5 +202,5 @@ /obj/machinery/chemical_dispenser/coffee/full spawn_cartridges = list( - /obj/item/reagent_containers/chem_disp_cartridge/espresso{temperature_override = 369.15} + /obj/item/reagent_containers/chem_disp_cartridge/coffee{temperature_override = 369} ) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 3a3785ab555..b547f39e6fe 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -47,6 +47,7 @@ var/singleton/reagent/master = reagents.get_primary_reagent_decl() name = master.condiment_name || (reagents.reagent_volumes.len == 1 ? "[lowertext(master.name)] bottle" : "condiment bottle") desc = master.condiment_desc || (reagents.reagent_volumes.len == 1 ? master.description : "A mixture of various condiments. [master.name] is one of them.") + icon = master.condiment_icon || 'icons/obj/item/reagent_containers/food/condiment.dmi' icon_state = master.condiment_icon_state || "mixedcondiments" center_of_mass = master.condiment_center_of_mass || list("x"=16, "y"=6) diff --git a/code/modules/reagents/reagent_containers/food/drinks/carton.dm b/code/modules/reagents/reagent_containers/food/drinks/carton.dm index fd9fb808b56..9dc8bbea874 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/carton.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/carton.dm @@ -54,7 +54,7 @@ /obj/item/reagent_containers/food/drinks/carton/lemonjuice name = "lemon juice" desc = "This juice is VERY sour." - icon_state = "lemoncarton" + icon_state = "lemonjuice" reagents_to_add = list(/singleton/reagent/drink/lemonjuice = 100) /obj/item/reagent_containers/food/drinks/carton/dynjuice diff --git a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm index cc699579d00..bdba5918b0c 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/yoke.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/yoke.dm @@ -78,12 +78,19 @@ /obj/item/reagent_containers/food/drinks/cans/sodawater, /obj/item/reagent_containers/food/drinks/cans/root_beer, /obj/item/reagent_containers/food/drinks/cans/diet_cola, + ) + var/list/rare_soda_options = list( /obj/item/reagent_containers/food/drinks/cans/peach_soda, /obj/item/reagent_containers/food/drinks/cans/melon_soda, /obj/item/reagent_containers/food/drinks/cans/himeokvass, - /obj/item/reagent_containers/food/drinks/cans/xanuchai + /obj/item/reagent_containers/food/drinks/cans/xanuchai, + /obj/item/reagent_containers/food/drinks/cans/beetle_milk, + /obj/item/reagent_containers/food/drinks/cans/threetowns ) + var/path = pick(soda_options) + if(prob(10)) + path = pick(rare_soda_options) if(starts_with[path]) starts_with[path] = starts_with[path] + 1 else @@ -107,6 +114,64 @@ starts_with[path] = 1 return ..() +// soda + +/obj/item/storage/box/fancy/yoke/cola + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/cola = 6) + +/obj/item/storage/box/fancy/yoke/space_mountain_wind + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 6) + +/obj/item/storage/box/fancy/yoke/thirteenloko + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 6) + +/obj/item/storage/box/fancy/yoke/dr_gibb + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/dr_gibb = 6) + +/obj/item/storage/box/fancy/yoke/starkist + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/starkist = 6) + +/obj/item/storage/box/fancy/yoke/space_up + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/space_up = 6) + +/obj/item/storage/box/fancy/yoke/lemon_lime + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/lemon_lime = 6) + +/obj/item/storage/box/fancy/yoke/iced_tea + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/iced_tea = 6) + +/obj/item/storage/box/fancy/yoke/grape_juice + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/grape_juice = 6) + +/obj/item/storage/box/fancy/yoke/tonic + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/tonic = 6) + +/obj/item/storage/box/fancy/yoke/sodawater + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/sodawater = 6) + +/obj/item/storage/box/fancy/yoke/root_beer + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/root_beer = 6) + +/obj/item/storage/box/fancy/yoke/diet_cola + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/diet_cola = 6) + +/obj/item/storage/box/fancy/yoke/peach_soda + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/peach_soda = 6) + +/obj/item/storage/box/fancy/yoke/melon_soda + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/melon_soda = 6) + +/obj/item/storage/box/fancy/yoke/himeokvass + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/himeokvass = 6) + +/obj/item/storage/box/fancy/yoke/xanuchai + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/xanuchai = 6) + +/obj/item/storage/box/fancy/yoke/beetle_milk + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 6) + +// alcoholic drinks + /obj/item/storage/box/fancy/yoke/beer starts_with = list(/obj/item/reagent_containers/food/drinks/cans/beer = 6) @@ -125,6 +190,11 @@ /obj/item/storage/box/fancy/yoke/whistlingforest starts_with = list(/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest = 6) +/obj/item/storage/box/fancy/yoke/threetowns + starts_with = list(/obj/item/reagent_containers/food/drinks/cans/threetowns = 6) + +// energy drinks + /obj/item/storage/box/fancy/yoke/energy icon_state = "yoke_energy" //energy drinks are 2 pixels taller diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index b7c318ffd86..18cb9ce6dfb 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -140,6 +140,13 @@ desc = "BLAM!-brand non-foaming space cleaner!" volume = 50 +/obj/item/reagent_containers/spray/cleaner/deodorant + name = "deodorant" + desc = "A can of Gold Standard spray deodorant - for when you're too lazy to shower." + volume = 35 + icon_state = "deodorant" + item_state = "deodorant" + /obj/item/reagent_containers/spray/cleaner/Initialize() . = ..() reagents.add_reagent(/singleton/reagent/spacecleaner, volume) diff --git a/html/changelogs/wezzy_scarcity.yml b/html/changelogs/wezzy_scarcity.yml new file mode 100644 index 00000000000..7a507c5e770 --- /dev/null +++ b/html/changelogs/wezzy_scarcity.yml @@ -0,0 +1,74 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# 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: + - rscadd: "Adds Lavatory vendors to the public bathrooms, that dispense hygiene goods." + - refactor: "Migrates bartender's supply of 6 pack beers and Sencha teas to the cargo database." + - refactor: "Migrates impact wrenches to the cargo database." + - balance: "Removes the extraneous dylovene, kelotane, bicaridine and coagzulug in medical. Migrates medication to the medication closet." + - balance: "Removes the unused Nanomed Minis in medical. Replaces the surgery side Nanomed Plus with a Nanomed Mini." + - balance: "Removes the two large medical kits from medical storage, and the kit in the exam room. Moves the wheelchairs from the morgue lift to medical storage." + - rscadd: "Adds cranberries to the game. Now you can actually make cranberry juice!" + - refactor: "Juices found in soda machines, booze dispensers and the booze-o-mat have been migrated to the cargo database. Except Orange, Lime and Lemon juice in the booze-o-mat." + - refactor: "Most lore-specific mostly flavor alcoholic bottles have been migrated to the cargo database." + - refactor: "Special glasses and flasks in the booze-o-mat have been moved to the drinking glass dispenser." + - qol: "Adjusts the bar's Chemical Heater to be less in the way." + - rscadd: "Cream and fatshouters milk cartons can be ordered from cargo." + - balance: "Certain juices are now cartons when separated in a CondiMaster." + - balance: "Removed coffee, milk and sugar from soda machines, as they are made redundant by CoffeeMasters." + - balance: "Non-CoffeeMaster coffee machines now just dispense coffee instead of espresso." + - balance: "Adds cream to the kitchen's fridge to supplement its removal from soda machines." + - rscadd: "Adds deodorant and a new sprite for mouthwash." diff --git a/icons/obj/hydroponics_machines.dmi b/icons/obj/hydroponics_machines.dmi index d3addf630d5..832663d967d 100644 Binary files a/icons/obj/hydroponics_machines.dmi and b/icons/obj/hydroponics_machines.dmi differ diff --git a/icons/obj/item/reagent_containers/food/drinks/carton.dmi b/icons/obj/item/reagent_containers/food/drinks/carton.dmi index d35d1fc6eed..06474bb26ec 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/carton.dmi and b/icons/obj/item/reagent_containers/food/drinks/carton.dmi differ diff --git a/icons/obj/item/reagent_containers/food/drinks/flask.dmi b/icons/obj/item/reagent_containers/food/drinks/flask.dmi index e75f5307f29..a9beb2d38f3 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/flask.dmi and b/icons/obj/item/reagent_containers/food/drinks/flask.dmi differ diff --git a/icons/obj/item/reagent_containers/food/drinks/soda.dmi b/icons/obj/item/reagent_containers/food/drinks/soda.dmi index c6384bd8ac8..3d9703b8f0f 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/soda.dmi and b/icons/obj/item/reagent_containers/food/drinks/soda.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 009571e4f61..9465cfb6c14 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/icons/obj/storage/boxes.dmi b/icons/obj/storage/boxes.dmi index 5c1c97ac144..379744117c9 100644 Binary files a/icons/obj/storage/boxes.dmi and b/icons/obj/storage/boxes.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 004d20790a2..b4c41aacd57 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index a0f0e06facf..75b30a57506 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -4962,10 +4962,7 @@ dir = 5 }, /obj/machinery/alarm/north, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/structure/closet/emcloset, -/obj/item/storage/toolbox/emergency, -/obj/item/crowbar/red, +/obj/machinery/vending/lavatory, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "aJn" = ( @@ -5715,12 +5712,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/stairwell/bridge) "aOu" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_two/fore/starboard) +/obj/effect/floor_decal/corner/green/diagonal, +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "aOv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning{ @@ -7577,6 +7571,7 @@ /area/horizon/kitchen/freezer) "bak" = ( /obj/effect/floor_decal/industrial/warning, +/obj/random/junk, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "bal" = ( @@ -20348,9 +20343,6 @@ icon_state = "sterilesprayblue"; name = "surgery cleaner" }, -/obj/machinery/vending/wallmed2{ - pixel_x = 28 - }, /turf/simulated/floor/tiled/white, /area/medical/ors) "cPI" = ( @@ -24734,12 +24726,6 @@ dir = 6 }, /obj/structure/table/standard, -/obj/item/storage/firstaid/large/adv{ - pixel_y = 10 - }, -/obj/item/storage/firstaid/large/adv{ - pixel_y = 5 - }, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "dva" = ( @@ -27337,16 +27323,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - dir = 4; - name = "Deck 2 Central Washroom Maintenance"; - req_access = list(12) - }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/obj/structure/engineer_maintenance/electric, +/obj/structure/engineer_maintenance/pipe{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "dQc" = ( /obj/effect/floor_decal/corner/blue/diagonal, @@ -30991,8 +30977,6 @@ /area/rnd/eva) "ere" = ( /obj/structure/table/rack, -/obj/item/towel, -/obj/random/soap, /obj/structure/window/reinforced{ dir = 4 }, @@ -33423,10 +33407,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 1 }, -/obj/structure/table/rack, -/obj/item/towel, -/obj/random/soap, -/obj/item/bikehorn/rubberducky, +/obj/machinery/vending/lavatory, /turf/simulated/floor/tiled/white, /area/operations/break_room) "eJw" = ( @@ -45461,9 +45442,6 @@ /turf/simulated/floor/wood, /area/horizon/cafeteria) "gwM" = ( -/obj/structure/table/rack, -/obj/random/loot, -/obj/random/loot, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "gwO" = ( @@ -48682,6 +48660,8 @@ /obj/item/reagent_containers/food/drinks/carton/soymilk, /obj/machinery/firealarm/east, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/reagent_containers/food/drinks/carton/cream, +/obj/item/reagent_containers/food/drinks/carton/cream, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "gTq" = ( @@ -63986,9 +63966,6 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 9 }, -/obj/machinery/vending/wallmed2{ - pixel_x = -28 - }, /turf/simulated/floor/tiled/white, /area/medical/ors) "jfZ" = ( @@ -65883,6 +65860,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 8 }, +/obj/item/bikehorn/rubberducky, /turf/simulated/floor/tiled/white, /area/operations/break_room) "juC" = ( @@ -71230,10 +71208,7 @@ /obj/item/material/knife{ pixel_x = -9 }, -/obj/item/storage/box/produce{ - pixel_x = 3; - pixel_y = -5 - }, +/obj/item/storage/box/produce, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "khv" = ( @@ -74734,10 +74709,6 @@ dir = 4 }, /obj/machinery/firealarm/south, -/obj/structure/engineer_maintenance/electric, -/obj/structure/engineer_maintenance/pipe{ - dir = 8 - }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "kHe" = ( @@ -76383,31 +76354,18 @@ /turf/simulated/floor/tiled/full, /area/engineering/storage_eva) "kUw" = ( -/obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/coffeemaster/full{ - pixel_x = -16; + pixel_x = -18; pixel_y = 16 }, -/obj/item/reagent_containers/glass/bottle/syrup/caramel{ - pixel_x = -15; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/syrup/chocolate{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/syrup/pumpkin{ - pixel_x = 1; - pixel_y = 4 - }, -/obj/item/reagent_containers/glass/bottle/syrup/vanilla{ - pixel_x = 9; - pixel_y = 4 - }, /obj/machinery/vending/dinnerware/bar{ pixel_y = 16; - pixel_x = 6 + pixel_x = 4 }, +/obj/machinery/chem_heater{ + pixel_y = 6 + }, +/obj/structure/table/stone/marble, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "kUx" = ( @@ -81365,11 +81323,6 @@ /obj/item/flame/lighter/zippo, /obj/item/storage/box/fancy/candle_box, /obj/item/storage/box/fancy/candle_box, -/obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash, -/obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash, -/obj/item/reagent_containers/toothpaste, -/obj/item/reagent_containers/toothpaste, -/obj/item/reagent_containers/toothpaste, /obj/item/device/quikpay, /obj/item/storage/box/fancy/matches, /obj/structure/extinguisher_cabinet/west, @@ -82945,7 +82898,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/chem_heater, /turf/simulated/floor/wood, /area/horizon/bar) "lRO" = ( @@ -83620,10 +83572,7 @@ /obj/item/material/knife{ pixel_x = -9 }, -/obj/item/storage/box/produce{ - pixel_x = 3; - pixel_y = -5 - }, +/obj/item/storage/box/produce, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "lWu" = ( @@ -84190,20 +84139,6 @@ }, /obj/machinery/firealarm/south, /obj/structure/table/standard, -/obj/item/storage/firstaid/toxin{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/storage/firstaid/o2{ - pixel_x = -3 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = 13; - pixel_y = 5 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 13 - }, /turf/simulated/floor/tiled, /area/medical/paramedic) "mbh" = ( @@ -86699,11 +86634,12 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/lab) "mtr" = ( -/obj/structure/closet/secure_closet/cabinet/beer/horizon, /obj/machinery/camera/network/service{ c_tag = "Service - Deck 2 - Bar Backroom"; dir = 8 }, +/obj/structure/closet/secure_closet/cabinet/bar, +/obj/item/reagent_containers/food/drinks/bottle/valokki_wine, /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "mtw" = ( @@ -87737,28 +87673,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "mBO" = ( -/obj/item/reagent_containers/toothpaste{ - pixel_x = -3 - }, -/obj/item/reagent_containers/toothpaste{ - pixel_x = -2 - }, -/obj/item/reagent_containers/toothbrush{ - name = "disposable toothbrush"; - pixel_y = 8 - }, -/obj/item/reagent_containers/toothbrush{ - name = "disposable toothbrush"; - pixel_y = 8 - }, -/obj/item/reagent_containers/toothbrush/red{ - name = "disposable toothbrush"; - pixel_y = 8 - }, -/obj/item/reagent_containers/toothbrush/red{ - name = "disposable toothbrush"; - pixel_y = 8 - }, /obj/structure/table/standard, /obj/effect/floor_decal/corner/green/full, /obj/machinery/alarm/south, @@ -88094,14 +88008,12 @@ pixel_x = 31 }, /obj/item/storage/pill_bottle/mortaphenyl, -/obj/item/storage/pill_bottle/dylovene, -/obj/item/storage/pill_bottle/dylovene, -/obj/item/storage/pill_bottle/bicaridine, -/obj/item/storage/pill_bottle/kelotane, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/item/storage/pill_bottle/ryetalyn, /obj/item/reagent_containers/syringe/antiparasitic, /obj/item/reagent_containers/syringe/antiparasitic, -/obj/item/reagent_containers/glass/bottle/antitoxin, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/reagent_containers/inhaler/pneumalin, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "mEq" = ( @@ -89357,12 +89269,14 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) "mPE" = ( -/obj/structure/reagent_dispensers/extinguisher, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/corner/green/diagonal, +/obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_two/fore/starboard) +/turf/simulated/floor/tiled/white, +/area/horizon/crew_quarters/washroom/central) "mPO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -93507,7 +93421,6 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "nuu" = ( -/obj/random/junk, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -93520,9 +93433,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_two/fore/starboard) +/obj/machinery/door/airlock/maintenance{ + dir = 4; + name = "Deck 2 Central Washroom Maintenance"; + req_access = list(12) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/horizon/crew_quarters/washroom/central) "nuv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -96661,7 +96579,7 @@ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/random/junk, +/obj/structure/reagent_dispensers/extinguisher, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "nTc" = ( @@ -114144,10 +114062,6 @@ pixel_y = -8 }, /obj/machinery/door/firedoor, -/obj/item/flame/candle{ - pixel_x = 12; - pixel_y = -3 - }, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar_shutter"; @@ -116442,12 +116356,10 @@ /area/horizon/crew_quarters/lounge/bar) "qLA" = ( /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/alarm/west, /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/vending/lavatory, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "qLL" = ( @@ -119010,10 +118922,6 @@ "rdo" = ( /obj/structure/table/stone/marble, /obj/machinery/door/firedoor, -/obj/item/flame/candle{ - pixel_x = -11; - pixel_y = 16 - }, /obj/item/glass_jar{ desc = "A small empty jar that is mostly used for giving a tip."; name = "tip jar"; @@ -121957,12 +121865,6 @@ /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_theatre) "rAM" = ( -/obj/item/reagent_containers/toothpaste{ - pixel_x = -3 - }, -/obj/item/reagent_containers/toothpaste{ - pixel_x = -2 - }, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, @@ -121971,25 +121873,6 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/item/reagent_containers/toothbrush/red{ - name = "disposable toothbrush"; - pixel_y = 12; - pixel_x = -4 - }, -/obj/item/reagent_containers/toothbrush{ - name = "disposable toothbrush"; - pixel_y = 12; - pixel_x = -4 - }, -/obj/item/reagent_containers/toothbrush/red{ - name = "disposable toothbrush"; - pixel_y = 12; - pixel_x = -4 - }, -/obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash{ - pixel_x = 7; - pixel_y = 16 - }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/showers) "rAP" = ( @@ -122424,15 +122307,10 @@ /obj/effect/floor_decal/corner/green/full{ dir = 8 }, -/obj/structure/sink{ - pixel_y = 28 - }, /obj/machinery/light/small{ dir = 8 }, -/obj/structure/mirror{ - pixel_x = -27 - }, +/obj/machinery/vending/lavatory, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/cryo/washroom) "rEl" = ( @@ -122974,7 +122852,7 @@ "rJq" = ( /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/bar_alc/full{ - pixel_x = -1; + pixel_x = -4; pixel_y = 16 }, /obj/item/reagent_containers/glass/rag{ @@ -127118,26 +126996,10 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "sqI" = ( -/obj/structure/closet/walllocker/medical/secure{ - name = "Medication Closet"; - pixel_x = 31 - }, -/obj/item/reagent_containers/glass/bottle/antitoxin, -/obj/item/storage/pill_bottle/mortaphenyl, -/obj/item/storage/pill_bottle/dylovene, -/obj/item/storage/pill_bottle/dylovene, -/obj/item/storage/pill_bottle/bicaridine, /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/item/storage/pill_bottle/kelotane, -/obj/item/reagent_containers/syringe/antibiotic, -/obj/item/reagent_containers/syringe/antibiotic, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /turf/simulated/floor/tiled, /area/medical/paramedic) "sqP" = ( @@ -131710,7 +131572,7 @@ "tbr" = ( /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/bar_soft/full{ - pixel_x = -8; + pixel_x = -10; pixel_y = 16 }, /obj/item/reagent_containers/food/drinks/shaker{ @@ -136186,8 +136048,6 @@ /area/rnd/xenoarch_atrium) "tIH" = ( /obj/structure/table/rack, -/obj/item/towel, -/obj/random/soap, /obj/structure/window/reinforced{ dir = 4 }, @@ -145764,11 +145624,6 @@ /turf/simulated/open, /area/hallway/primary/central_one) "vbf" = ( -/obj/machinery/vending/medical{ - density = 0; - pixel_x = -1; - pixel_y = 32 - }, /obj/effect/floor_decal/corner_wide/green{ dir = 1 }, @@ -145778,6 +145633,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/wallmed2{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "vbg" = ( @@ -149585,11 +149443,14 @@ "vDo" = ( /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8; - pixel_x = 4; - pixel_y = 3 + pixel_x = 8; + pixel_y = 8 }, /obj/machinery/door/firedoor, +/obj/machinery/chemical_dispenser/coffee/full{ + pixel_x = -10; + pixel_y = 8 + }, /obj/machinery/door/blast/shutters{ id = "shutters_deck2_kitchendesk"; name = "Kitchen Desk Shutter" @@ -151331,12 +151192,9 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, -/obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/item/storage/pill_bottle/mortaphenyl, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/storage/pill_bottle/dexalin, /turf/simulated/floor/tiled, /area/medical/paramedic) "vSp" = ( @@ -158324,9 +158182,6 @@ /obj/item/storage/belt/medical/paramedic, /obj/item/storage/belt/medical/paramedic, /obj/machinery/alarm/south, -/obj/machinery/vending/wallmed2{ - pixel_y = -29 - }, /obj/machinery/requests_console/east{ department = "Paramedic Bay" }, @@ -162924,9 +162779,6 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, -/obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -162947,15 +162799,12 @@ /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/breath/medical, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/item/storage/pill_bottle/dexalin, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "xvK" = ( @@ -163040,14 +162889,6 @@ dir = 1 }, /obj/structure/table/standard, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -4; - pixel_y = 8 - }, /turf/simulated/floor/tiled/white, /area/medical/exam) "xwA" = ( @@ -165667,28 +165508,6 @@ req_one_access = list(24,11,55) }, /obj/structure/table/stone/marble, -/obj/item/storage/box/tea{ - pixel_x = -9; - pixel_y = 17 - }, -/obj/item/storage/box/tea{ - pixel_x = -9; - pixel_y = 9 - }, -/obj/item/storage/box/tea/jaekseol{ - pixel_y = 17 - }, -/obj/item/storage/box/tea/jaekseol{ - pixel_y = 9 - }, -/obj/item/storage/box/tea/tieguanyin{ - pixel_x = 10; - pixel_y = 18 - }, -/obj/item/storage/box/tea/tieguanyin{ - pixel_x = 10; - pixel_y = 9 - }, /obj/random/pottedplant_small{ pixel_x = 6; pixel_y = -2 @@ -165936,6 +165755,9 @@ /obj/machinery/light/small/emergency{ dir = 8 }, +/obj/structure/table/rack, +/obj/random/loot, +/obj/random/loot, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_two/fore/starboard) "xRJ" = ( @@ -166332,14 +166154,29 @@ "xVd" = ( /obj/machinery/door/firedoor, /obj/structure/table/stone/marble, +/obj/machinery/chemical_dispenser/coffeemaster/full{ + pixel_y = 16 + }, +/obj/item/reagent_containers/glass/bottle/syrup/caramel{ + pixel_x = -15; + pixel_y = 4 + }, +/obj/item/reagent_containers/glass/bottle/syrup/chocolate{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/reagent_containers/glass/bottle/syrup/pumpkin{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/reagent_containers/glass/bottle/syrup/vanilla{ + pixel_x = 9; + pixel_y = 4 + }, /obj/machinery/door/blast/shutters{ id = "bar_shutter"; name = "Bar Shutter" }, -/obj/machinery/chemical_dispenser/coffeemaster/full{ - pixel_x = -16; - pixel_y = 16 - }, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "xVg" = ( @@ -264676,8 +264513,8 @@ dVJ flr qju nuu -aOu -mPE +iLo +iLo eJC eJC eJC @@ -264933,8 +264770,8 @@ jlR jlR iLo dQb -iLo -iLo +aOu +mPE eJC agA psp