cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates Syndie Ovens to Ranges + Ghost Cafe Kitchen QoL (#21769)

Browse Source 
* The Goods

- Adds some vinegar to the Ghost Cafe's kitchen (moths rejoice)
- Updates ovens to ranges in Icebox Interdyne, DS-2, and DS-2 Brig

* shuffling + Regular Interdyne

* Adds some welding fizz to the Cafe

For the beepers :D
This commit is contained in:
LovliestPlant
2023-06-20 07:40:03 -04:00
committed by GitHub
parent ada07c51b0
commit ec29b1dd8a
4 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
+2 -2
View File
@@ -1800,8 +1800,8 @@
/turf/open/floor/plating,
/area/ruin/syndicate_lava_base/medbay)
"oV" = (
/obj/machinery/oven,
/obj/machinery/light/directional/north,
/obj/machinery/deepfryer,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/syndicate_lava_base/bar)
"oW" = (
@@ -4908,10 +4908,10 @@
/turf/open/floor/iron/white,
/area/ruin/syndicate_lava_base/medbay)
"Tl" = (
/obj/machinery/deepfryer,
/obj/machinery/button/door/directional/north{
id = "interdynekitchen"
},
/obj/machinery/oven/range,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/syndicate_lava_base/bar)
"Tm" = (
_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
+2 -2
View File
@@ -1108,10 +1108,10 @@
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/cargo)
"kY" = (
/obj/machinery/deepfryer,
/obj/machinery/button/door/directional/north{
id = "interdynekitchen"
},
/obj/machinery/oven/range,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/syndicate_lava_base/bar)
"lf" = (
@@ -5177,8 +5177,8 @@
/turf/open/floor/iron/textured_half,
/area/ruin/syndicate_lava_base/main)
"ZS" = (
/obj/machinery/oven,
/obj/machinery/light/directional/north,
/obj/machinery/deepfryer,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/syndicate_lava_base/bar)
"ZW" = (
_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+17 -17
View File
@@ -3781,15 +3781,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"qa" = (
/obj/machinery/griddle,
/obj/effect/turf_decal/siding/dark{
dir = 1
},
/turf/open/floor/iron/kitchen{
dir = 4
},
/area/ruin/space/has_grav/skyrat/interdynefob/service/diner)
"qc" = (
/obj/structure/bed/double{
dir = 1
@@ -4453,10 +4444,10 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/skyrat/interdynefob/cargo)
"sZ" = (
/obj/machinery/oven,
/obj/effect/turf_decal/siding/dark{
dir = 1
},
/obj/machinery/oven/range,
/turf/open/floor/iron/kitchen{
dir = 4
},
@@ -6358,6 +6349,10 @@
"CH" = (
/turf/open/floor/carpet/red,
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/admiral)
"CJ" = (
/obj/machinery/oven/range,
/turf/open/floor/iron/white/textured_large,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"CS" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -8180,10 +8175,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/skyrat/interdynefob/security/armory)
"Lr" = (
/obj/machinery/oven,
/turf/open/floor/iron/white/textured_large,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"Ls" = (
/obj/effect/turf_decal/siding/yellow{
dir = 4
@@ -9232,6 +9223,15 @@
dir = 1
},
/area/ruin/space/has_grav/skyrat/interdynefob/research)
"PB" = (
/obj/effect/turf_decal/siding/dark{
dir = 1
},
/obj/machinery/griddle,
/turf/open/floor/iron/kitchen{
dir = 4
},
/area/ruin/space/has_grav/skyrat/interdynefob/service/diner)
"PM" = (
/obj/structure/cable,
/obj/effect/turf_decal/trimline/purple/corner{
@@ -12156,7 +12156,7 @@ BN
PP
lJ
kF
Lr
CJ
dI
ct
lb
@@ -14222,7 +14222,7 @@ xk
Od
Ui
pO
sZ
PB
Cf
tT
SG
@@ -14277,7 +14277,7 @@ bw
bw
bw
bw
qa
sZ
Cf
Cf
aC
_maps/map_files/generic/CentCom_skyrat_z2.dmm
+23 -10
View File
@@ -4500,7 +4500,7 @@
/area/centcom/interlink)
"buX" = (
/obj/machinery/vending/hydronutrients{
products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez = 50, /obj/item/reagent_containers/cup/bottle/nutrient/l4z = 20, /obj/item/reagent_containers/cup/bottle/nutrient/rh = 10, /obj/item/reagent_containers/spray/pestspray = 30, /obj/item/reagent_containers/syringe = 5, /obj/item/storage/bag/plants = 30, /obj/item/cultivator = 10, /obj/item/shovel/spade = 10, /obj/item/plant_analyzer = 10)
products = list(/obj/item/reagent_containers/cup/bottle/nutrient/ez=50,/obj/item/reagent_containers/cup/bottle/nutrient/l4z=20,/obj/item/reagent_containers/cup/bottle/nutrient/rh=10,/obj/item/reagent_containers/spray/pestspray=30,/obj/item/reagent_containers/syringe=5,/obj/item/storage/bag/plants=30,/obj/item/cultivator=10,/obj/item/shovel/spade=10,/obj/item/plant_analyzer=10)
},
/turf/open/indestructible/hoteltile{
icon_state = "darkfull"
@@ -7423,9 +7423,21 @@
"iZr" = (
/obj/structure/table/wood,
/obj/machinery/reagentgrinder{
pixel_y = 8
pixel_y = 8;
pixel_x = -2
},
/obj/structure/sign/poster/contraband/pwr_game/directional/north,
/obj/item/reagent_containers/cup/soda_cans/skyrat/welding_fizz{
pixel_x = 14;
pixel_y = 12
},
/obj/item/reagent_containers/cup/soda_cans/skyrat/welding_fizz{
pixel_x = 14;
pixel_y = 6
},
/obj/item/reagent_containers/cup/soda_cans/skyrat/welding_fizz{
pixel_x = 14
},
/turf/open/indestructible/hotelwood,
/area/centcom/holding/cafe)
"jaf" = (
@@ -10319,24 +10331,24 @@
/obj/item/storage/box/ingredients/american,
/obj/item/storage/box/ingredients/exotic,
/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour = 90);
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
volume = 90
},
/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour = 90);
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
volume = 90
},
/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice = 90);
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
},
/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice = 90);
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
},
@@ -11770,13 +11782,13 @@
/obj/item/storage/box/ingredients/american,
/obj/item/storage/box/ingredients/exotic,
/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour = 90);
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
volume = 90
},
/obj/item/reagent_containers/condiment/flour{
list_reagents = list(/datum/reagent/consumable/flour = 90);
list_reagents = list(/datum/reagent/consumable/flour=90);
name = "large flour sack";
possible_transfer_amounts = list(1,5,10,15,30,60,90);
volume = 90
@@ -12568,17 +12580,18 @@
/obj/item/reagent_containers/condiment/soysauce,
/obj/item/reagent_containers/condiment/sugar,
/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice = 90);
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
},
/obj/item/reagent_containers/condiment/rice{
list_reagents = list(/datum/reagent/consumable/rice = 90);
list_reagents = list(/datum/reagent/consumable/rice=90);
name = "large rice sack";
possible_transfer_amounts = list(1,5,10,15,20,25,30,50,60,90)
},
/obj/item/reagent_containers/condiment/cornmeal,
/obj/item/reagent_containers/condiment/cornmeal,
/obj/item/reagent_containers/condiment/vinegar,
/turf/open/indestructible/hoteltile{
icon_state = "cafeteria"
},