Skip to content

Commit

Permalink
Merge branch 'master' into box_confirent_rework
Browse files Browse the repository at this point in the history
  • Loading branch information
Drsmail authored Nov 30, 2024
2 parents a7848fd + 044aee6 commit 26c030e
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions _maps/map_files220/stations/metastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,7 @@
},
/obj/machinery/alarm/directional/west,
/obj/machinery/computer/prisoner{
dir = 4;
req_access = list(2)
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
Expand Down Expand Up @@ -27116,9 +27115,7 @@
},
/area/station/hallway/primary/central)
"bTD" = (
/obj/structure/closet/secure_closet/bar{
req_access = list(25)
},
/obj/structure/closet/secure_closet/bar,
/obj/machinery/light/small/directional/west,
/turf/simulated/floor/wood,
/area/station/service/bar)
Expand Down Expand Up @@ -40210,9 +40207,7 @@
/area/station/science/toxins/launch)
"cOA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/bar{
req_access = list(25)
},
/obj/structure/closet/secure_closet/bar,
/obj/machinery/light_switch/north,
/obj/effect/spawner/random/id_skins/no_chance,
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -73383,6 +73378,10 @@
pixel_x = 7;
pixel_y = 10
},
/obj/item/storage/fancy/vials{
pixel_x = -2;
pixel_y = 2
},
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whitegreen"
Expand Down Expand Up @@ -79137,8 +79136,7 @@
/area/station/security/permabrig)
"tAF" = (
/obj/machinery/computer/prisoner{
dir = 1;
req_access = list(2)
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
Expand Down Expand Up @@ -84984,8 +84982,7 @@
/area/station/maintenance/fsmaint)
"wAJ" = (
/obj/machinery/computer/prisoner{
dir = 8;
req_access = list(2)
dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
Expand Down

0 comments on commit 26c030e

Please sign in to comment.