Skip to content

Commit

Permalink
Merge pull request #68 from KnigTheThrasher/ghostcafe
Browse files Browse the repository at this point in the history
Removes erp leftovers from ghost cafe
  • Loading branch information
SynthTwo authored Sep 10, 2024
2 parents 629904b + faab950 commit fe2a559
Showing 1 changed file with 3 additions and 29 deletions.
32 changes: 3 additions & 29 deletions _maps/map_files/generic/CentCom_nova_z2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4598,13 +4598,6 @@
pixel_x = -12;
pixel_y = -42
},
/obj/item/fancy_pillow{
pixel_x = -22;
pixel_y = -7
},
/obj/item/fancy_pillow{
pixel_y = -1
},
/turf/open/floor/bamboo,
/area/centcom/holding/cafe)
"bAX" = (
Expand Down Expand Up @@ -4836,10 +4829,6 @@
/obj/structure/reagent_dispensers/plumbed,
/turf/open/floor/iron/white,
/area/centcom/interlink)
"bRc" = (
/obj/machinery/vending/dorms,
/turf/open/floor/iron/white,
/area/centcom/interlink)
"bSf" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/railing{
Expand Down Expand Up @@ -6109,7 +6098,6 @@
/turf/open/floor/iron/dark,
/area/centcom/interlink)
"egW" = (
/obj/machinery/vending/dorms,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/centcom/interlink)
Expand Down Expand Up @@ -6195,10 +6183,6 @@
/obj/machinery/duct,
/turf/open/floor/wood/tile,
/area/centcom/interlink)
"erP" = (
/obj/machinery/vending/dorms,
/turf/open/floor/iron/showroomfloor,
/area/centcom/holding/cafe)
"erR" = (
/obj/structure/flora/grass/jungle/b/style_5,
/mob/living/basic/rabbit,
Expand Down Expand Up @@ -11934,10 +11918,6 @@
pixel_x = -19;
pixel_y = -23
},
/obj/item/fancy_pillow{
pixel_x = -10;
pixel_y = -7
},
/turf/open/floor/bamboo,
/area/centcom/holding/cafe)
"osk" = (
Expand Down Expand Up @@ -12625,7 +12605,6 @@
/area/centcom/holding/cafe)
"pry" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/condom_pack,
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
Expand Down Expand Up @@ -14110,7 +14089,6 @@
/area/centcom/holding/cafepark)
"rHY" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/condom_pack,
/turf/open/floor/wood,
/area/centcom/interlink/dorm_rooms)
"rJC" = (
Expand Down Expand Up @@ -17457,10 +17435,6 @@
},
/turf/open/floor/iron,
/area/centcom/interlink)
"xqI" = (
/obj/machinery/vending/dorms,
/turf/open/indestructible/hotelwood,
/area/centcom/holding/cafe)
"xsf" = (
/obj/structure/flora/ash/stem_shroom,
/turf/open/floor/fakebasalt,
Expand Down Expand Up @@ -26575,7 +26549,7 @@ dCa
hIH
aYX
aWb
bRc
aWb
tvw
hlh
tvw
Expand Down Expand Up @@ -65662,7 +65636,7 @@ ajx
aUo
aUo
aUo
xqI
aUo
aqf
vTT
vTT
Expand Down Expand Up @@ -76240,7 +76214,7 @@ noq
noq
qWA
gCR
erP
aNY
aNY
gCR
ajj
Expand Down

0 comments on commit fe2a559

Please sign in to comment.