Skip to content

Commit

Permalink
Adds chem machine to all bar templates, not just Citadel template (#1…
Browse files Browse the repository at this point in the history
…7522)

* adds chem machine (hoochmaster 9000) to all bar templates not just citadel template

* adding hoochmaster to gax, yogsmeta, and asteroid stations which have no bar template system
  • Loading branch information
Aquizit committed Jan 18, 2023
1 parent c5945ea commit da09924
Show file tree
Hide file tree
Showing 16 changed files with 372 additions and 326 deletions.
31 changes: 17 additions & 14 deletions _maps/RandomRuins/StationRuins/BoxStation/bar_arcade.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"af" = (
/obj/structure/sink/kitchen{
pixel_y = 28
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"ag" = (
/turf/closed/wall,
/area/crew_quarters/bar)
Expand Down Expand Up @@ -99,12 +93,6 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aA" = (
/obj/machinery/camera{
c_tag = "Bar Storage"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aB" = (
/turf/open/floor/wood,
/area/crew_quarters/bar)
Expand Down Expand Up @@ -731,6 +719,12 @@
/obj/item/toy/figure/chef,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"Ai" = (
/obj/machinery/chem_master/condimaster{
name = "HoochMaster 2000"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"Ak" = (
/obj/machinery/light,
/obj/machinery/firealarm{
Expand Down Expand Up @@ -909,6 +903,15 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"PG" = (
/obj/machinery/camera{
c_tag = "Bar Storage"
},
/obj/structure/sink/kitchen{
pixel_y = 28
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"PU" = (
/obj/structure/table,
/obj/machinery/light,
Expand Down Expand Up @@ -1317,7 +1320,7 @@ PU
ag
"}
(15,1,1) = {"
af
Ai
aB
aJ
bf
Expand All @@ -1334,7 +1337,7 @@ ag
"}
(16,1,1) = {"
ag
aA
PG
aK
ag
ag
Expand Down
31 changes: 17 additions & 14 deletions _maps/RandomRuins/StationRuins/BoxStation/bar_box.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"af" = (
/obj/structure/sink/kitchen{
pixel_y = 28
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"ag" = (
/turf/closed/wall,
/area/crew_quarters/bar)
Expand Down Expand Up @@ -186,12 +180,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"aA" = (
/obj/machinery/camera{
c_tag = "Bar Storage"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aB" = (
/turf/open/floor/wood,
/area/crew_quarters/bar)
Expand Down Expand Up @@ -1254,6 +1242,12 @@
},
/turf/open/floor/wood,
/area/crew_quarters/theatre)
"mQ" = (
/obj/machinery/chem_master/condimaster{
name = "HoochMaster 2000"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"pe" = (
/obj/machinery/griddle,
/turf/open/floor/plasteel/cafeteria,
Expand Down Expand Up @@ -1295,6 +1289,15 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"vb" = (
/obj/machinery/camera{
c_tag = "Bar Storage"
},
/obj/structure/sink/kitchen{
pixel_y = 28
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"vA" = (
/obj/structure/table/reinforced,
/obj/item/clothing/head/that{
Expand Down Expand Up @@ -1686,7 +1689,7 @@ dd
ag
"}
(15,1,1) = {"
af
mQ
aB
aJ
bf
Expand All @@ -1703,7 +1706,7 @@ ag
"}
(16,1,1) = {"
ag
aA
vb
aK
ag
ag
Expand Down
31 changes: 17 additions & 14 deletions _maps/RandomRuins/StationRuins/BoxStation/bar_casino.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/rockvault,
/area/crew_quarters/bar)
"aj" = (
/obj/structure/sink/kitchen{
pixel_y = 28
},
/turf/open/floor/plasteel/rockvault,
/area/crew_quarters/bar)
"ak" = (
/obj/machinery/door/window/southleft{
base_state = "left";
Expand Down Expand Up @@ -159,12 +153,6 @@
"ay" = (
/turf/open/floor/plasteel/rockvault,
/area/crew_quarters/bar)
"az" = (
/obj/machinery/camera{
c_tag = "Bar Storage"
},
/turf/open/floor/plasteel/rockvault,
/area/crew_quarters/bar)
"aB" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
Expand Down Expand Up @@ -730,6 +718,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/ameridiner,
/area/crew_quarters/kitchen)
"cC" = (
/obj/machinery/chem_master/condimaster{
name = "HoochMaster 2000"
},
/turf/open/floor/plasteel/rockvault,
/area/crew_quarters/bar)
"cI" = (
/obj/structure/chair/office/light{
dir = 1
Expand Down Expand Up @@ -962,6 +956,15 @@
},
/turf/open/floor/plating,
/area/crew_quarters/bar)
"PF" = (
/obj/machinery/camera{
c_tag = "Bar Storage"
},
/obj/structure/sink/kitchen{
pixel_y = 28
},
/turf/open/floor/plasteel/rockvault,
/area/crew_quarters/bar)
"Qz" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
Expand Down Expand Up @@ -1314,7 +1317,7 @@ da
ac
"}
(15,1,1) = {"
aj
cC
ay
aM
cc
Expand All @@ -1331,7 +1334,7 @@ ac
"}
(16,1,1) = {"
ag
az
PF
ba
ag
ag
Expand Down

0 comments on commit da09924

Please sign in to comment.