Skip to content

Commit

Permalink
Merge branch 'master' into convert_span_to_macro
Browse files Browse the repository at this point in the history
  • Loading branch information
@AyIong
AyIong authored Apr 13, 2024
2 parents 9a2060e + 330eb74 commit 2fa7fe1
Show file tree
Hide file tree
Showing 11 changed files with 166 additions and 470 deletions.
48 changes: 24 additions & 24 deletions _maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
/area/ruin/space/spacehotelv1/engi2)
"bC" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/obj/structure/dresser,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/guestroom5)
Expand Down Expand Up @@ -281,7 +281,7 @@
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"cb" = (
/obj/machinery/power/apc/off_station/west,
/obj/machinery/power/apc/off_station/directional/west,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
Expand Down Expand Up @@ -374,7 +374,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/obj/structure/table/wood/fancy/blue,
/obj/item/bee_briefcase,
/turf/simulated/floor/carpet/royalblack,
Expand Down Expand Up @@ -656,7 +656,7 @@
/obj/structure/railing/cap{
dir = 10
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
Expand Down Expand Up @@ -1380,7 +1380,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/obj/structure/chair/wood{
dir = 1
},
Expand Down Expand Up @@ -1560,7 +1560,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/obj/structure/table/reinforced/brass,
/obj/item/paper_bin,
/obj/item/pen/multi,
Expand Down Expand Up @@ -1677,7 +1677,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
Expand Down Expand Up @@ -1992,7 +1992,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/obj/structure/chair/comfy/black{
dir = 8
},
Expand Down Expand Up @@ -2483,7 +2483,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station/west,
/obj/machinery/power/apc/off_station/directional/west,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
Expand Down Expand Up @@ -2869,7 +2869,7 @@
/area/ruin/space/spacehotelv1/engi1)
"uI" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/obj/machinery/light_switch{
dir = 8;
pixel_x = 24
Expand Down Expand Up @@ -3088,7 +3088,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station/east,
/obj/machinery/power/apc/off_station/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "cmo"
},
Expand Down Expand Up @@ -3472,7 +3472,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station/west,
/obj/machinery/power/apc/off_station/directional/west,
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
Expand Down Expand Up @@ -4228,7 +4228,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/obj/structure/chair/comfy/brown{
dir = 8
},
Expand Down Expand Up @@ -4501,7 +4501,7 @@
/area/ruin/space/spacehotelv1/entryhallway)
"FP" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station/east,
/obj/machinery/power/apc/off_station/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -5094,7 +5094,7 @@
/area/ruin/space/spacehotelv1/centralhallway)
"Ki" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/obj/structure/chair/comfy/black{
dir = 1
},
Expand Down Expand Up @@ -5292,7 +5292,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/spacehotelv1/reception)
"Lw" = (
Expand Down Expand Up @@ -5721,7 +5721,7 @@
/area/ruin/space/spacehotelv1/guestroom6)
"Oy" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station/south,
/obj/machinery/power/apc/off_station/directional/south,
/obj/structure/chair/sofa/right{
dir = 1
},
Expand Down Expand Up @@ -5832,7 +5832,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/obj/effect/turf_decal/siding/wood{
dir = 1
},
Expand Down Expand Up @@ -5888,7 +5888,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/obj/effect/spawner/random_spawners/dirt_often,
/obj/machinery/atmospherics/portable/canister/nitrogen,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -5979,7 +5979,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station/east,
/obj/machinery/power/apc/off_station/directional/east,
/obj/vehicle/janicart,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/spacehotelv1/janitor)
Expand Down Expand Up @@ -6029,7 +6029,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/machinery/economy/atm/west,
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/centralhallway)
"QO" = (
Expand Down Expand Up @@ -6348,7 +6348,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
"TN" = (
Expand Down Expand Up @@ -6624,7 +6624,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station/north,
/obj/machinery/power/apc/off_station/directional/north,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/guestroom2)
"VH" = (
Expand Down Expand Up @@ -7010,7 +7010,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station/east,
/obj/machinery/power/apc/off_station/directional/east,
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi2)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files220/RandomZLevels/gate_lizard.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7107,7 +7107,7 @@
icon_state = "0-8"
},
/obj/effect/spawner/random_spawners/dirt_frequent,
/obj/machinery/power/apc/off_station/empty_charge/east,
/obj/machinery/power/apc/off_station/empty_charge/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellowcorner"
Expand Down Expand Up @@ -9564,7 +9564,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station/empty_charge/south,
/obj/machinery/power/apc/off_station/empty_charge/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
Expand Down
Loading

0 comments on commit 2fa7fe1

Please sign in to comment.