Skip to content

Commit

Permalink
Qol improvements for the ghost bar (#23421)
Browse files Browse the repository at this point in the history
* Added some garbage bins, added a vender for the ghost bar kitchen

* Fixed the floor under a table

* Moved the shadycig vender a bit more to the wall and removed a beaker that I placed on accident

* Removed a wall behind a vender

* fuck you merge masters

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
  • Loading branch information
Fluffyzack21 and S34NW committed Dec 31, 2023
1 parent a13e91a commit a069966
Showing 1 changed file with 33 additions and 21 deletions.
54 changes: 33 additions & 21 deletions _maps/map_files/generic/centcomm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,7 @@
dir = 4;
pixel_y = 8
},
/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/wood,
/area/ghost_bar)
"gT" = (
Expand Down Expand Up @@ -3686,7 +3687,7 @@
/area/admin)
"mz" = (
/obj/machinery/economy/vending/boozeomat,
/turf/simulated/wall/indestructible/riveted,
/turf/simulated/floor/wood,
/area/ghost_bar)
"mA" = (
/obj/structure/sign/poster/official/fruit_bowl,
Expand Down Expand Up @@ -5137,6 +5138,12 @@
/obj/item/stack/sheet/metal/fifty,
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"rq" = (
/obj/structure/closet/crate/can,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
/area/ghost_bar)
"rr" = (
/obj/structure/table,
/obj/item/storage/box/beakers,
Expand Down Expand Up @@ -5679,10 +5686,10 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"tr" = (
/turf/simulated/floor/wood{
broken = 1;
icon_state = "wood-broken"
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/wood,
/area/ghost_bar)
"ts" = (
/obj/machinery/atmospherics/portable/canister/oxygen,
Expand Down Expand Up @@ -6703,6 +6710,7 @@
desc = "Used to grind things up into raw materials and liquids.";
pixel_y = 5
},
/obj/item/reagent_containers/glass/beaker/large,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
Expand Down Expand Up @@ -6987,7 +6995,6 @@
"xU" = (
/obj/structure/table/reinforced,
/obj/machinery/kitchen_machine/microwave/upgraded,
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
Expand All @@ -6997,10 +7004,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ghost_bar)
"xY" = (
/obj/machinery/economy/vending/cigarette,
/obj/machinery/light/small{
dir = 1
},
/obj/structure/closet/crate/can,
/turf/simulated/floor/wood,
/area/ghost_bar)
"xZ" = (
Expand Down Expand Up @@ -7288,6 +7292,13 @@
/obj/machinery/computer/cryopod/robot,
/turf/simulated/wall/indestructible/riveted,
/area/centcom/specops)
"zP" = (
/obj/machinery/light/small,
/obj/machinery/economy/vending/dinnerware,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
/area/ghost_bar)
"zQ" = (
/obj/machinery/light/small,
/turf/simulated/floor/plasteel/freezer,
Expand Down Expand Up @@ -13851,6 +13862,7 @@
/obj/machinery/light/small{
dir = 8
},
/obj/structure/closet/crate/can,
/turf/simulated/floor/wood,
/area/ghost_bar)
"Xb" = (
Expand Down Expand Up @@ -72235,7 +72247,7 @@ Jy
vd
vd
vd
Jy
rf
Me
EX
Jy
Expand Down Expand Up @@ -72492,7 +72504,7 @@ Jy
vd
cX
vd
rf
xY
Me
wh
rd
Expand Down Expand Up @@ -73785,8 +73797,8 @@ Me
Me
Me
Me
xY
Jy
Me
tr
Jy
qH
Nm
Expand Down Expand Up @@ -74041,8 +74053,8 @@ es
Oj
zj
fF
Me
Jy
rq
aT
Jy
ip
Jy
Expand Down Expand Up @@ -74298,9 +74310,9 @@ es
es
es
es
es
Uk
Jy
Jy
ol
ol
Hz
Expand Down Expand Up @@ -74555,8 +74567,8 @@ wN
Dk
zY
xU
zP
Me
tr
Jy
rG
hU
Expand Down Expand Up @@ -74812,8 +74824,8 @@ Me
Me
Me
Me
aT
Jy
Me
Me
Jy
RX
RX
Expand Down Expand Up @@ -75070,9 +75082,9 @@ ps
ps
ps
Me
Jy
Me
gS
Jy
xY
Me
Me
Me
Expand Down

0 comments on commit a069966

Please sign in to comment.