Skip to content

Commit

Permalink
Merge branch 'master' into berettam9
Browse files Browse the repository at this point in the history
  • Loading branch information
@TakeItEasyiloveyou
TakeItEasyiloveyou authored Oct 21, 2023
2 parents 28b3ab7 + ee0e68f commit 735ad8b
Show file tree
Hide file tree
Showing 28 changed files with 5,691 additions and 3,089 deletions.
4 changes: 1 addition & 3 deletions _maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1445,9 +1445,7 @@
/obj/effect/spawner/random_spawners/blood_often,
/obj/effect/spawner/random_spawners/dirt_often,
/obj/item/organ/external/hand,
/obj/machinery/power/apc/off_station/empty_charge{
pixel_x = -24
},
/obj/machinery/power/apc/off_station/empty_charge/west,
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered/requires_power_space)
"Ok" = (
Expand Down
107 changes: 23 additions & 84 deletions _maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,7 @@
/area/ruin/space/spacehotelv1/engi2)
"bC" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/obj/structure/dresser,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/guestroom5)
Expand Down Expand Up @@ -283,10 +281,7 @@
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"cb" = (
/obj/machinery/power/apc/off_station{
dir = 8;
pixel_x = -24
},
/obj/machinery/power/apc/off_station/west,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
Expand Down Expand Up @@ -379,10 +374,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/obj/structure/table/wood/fancy/blue,
/obj/item/bee_briefcase,
/turf/simulated/floor/carpet/royalblack,
Expand Down Expand Up @@ -664,10 +656,7 @@
/obj/structure/railing/cap{
dir = 10
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
Expand Down Expand Up @@ -1391,9 +1380,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/obj/structure/chair/wood{
dir = 1
},
Expand Down Expand Up @@ -1573,9 +1560,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/obj/structure/table/reinforced/brass,
/obj/item/paper_bin,
/obj/item/pen/multi,
Expand Down Expand Up @@ -1692,9 +1677,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
Expand Down Expand Up @@ -2009,10 +1992,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/obj/structure/chair/comfy/black{
dir = 8
},
Expand Down Expand Up @@ -2503,10 +2483,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station{
dir = 8;
pixel_x = -24
},
/obj/machinery/power/apc/off_station/west,
/obj/effect/turf_decal/siding/wood{
dir = 8
},
Expand Down Expand Up @@ -2892,9 +2869,7 @@
/area/ruin/space/spacehotelv1/engi1)
"uI" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/obj/machinery/light_switch{
dir = 8;
pixel_x = 24
Expand Down Expand Up @@ -3113,10 +3088,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station{
dir = 4;
pixel_x = 24
},
/obj/machinery/power/apc/off_station/east,
/turf/simulated/floor/plasteel{
icon_state = "cmo"
},
Expand Down Expand Up @@ -3498,10 +3470,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station{
dir = 8;
pixel_x = -24
},
/obj/machinery/power/apc/off_station/west,
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
Expand Down Expand Up @@ -4258,10 +4227,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/obj/structure/chair/comfy/brown{
dir = 8
},
Expand Down Expand Up @@ -4534,10 +4500,7 @@
/area/ruin/space/spacehotelv1/entryhallway)
"FP" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station{
dir = 4;
pixel_x = 24
},
/obj/machinery/power/apc/off_station/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -5130,9 +5093,7 @@
/area/ruin/space/spacehotelv1/centralhallway)
"Ki" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/obj/structure/chair/comfy/black{
dir = 1
},
Expand Down Expand Up @@ -5330,9 +5291,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/spacehotelv1/reception)
"Lw" = (
Expand Down Expand Up @@ -5761,9 +5720,7 @@
/area/ruin/space/spacehotelv1/guestroom6)
"Oy" = (
/obj/structure/cable,
/obj/machinery/power/apc/off_station{
pixel_y = -24
},
/obj/machinery/power/apc/off_station/south,
/obj/structure/chair/sofa/right{
dir = 1
},
Expand Down Expand Up @@ -5874,10 +5831,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/obj/effect/turf_decal/siding/wood{
dir = 1
},
Expand Down Expand Up @@ -5933,10 +5887,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/obj/effect/spawner/random_spawners/dirt_often,
/obj/machinery/atmospherics/portable/canister/nitrogen,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -6028,10 +5979,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station{
dir = 4;
pixel_x = 24
},
/obj/machinery/power/apc/off_station/east,
/obj/vehicle/janicart,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/spacehotelv1/janitor)
Expand Down Expand Up @@ -6400,10 +6348,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi1)
"TN" = (
Expand Down Expand Up @@ -6679,10 +6624,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/apc/off_station{
dir = 1;
pixel_y = 24
},
/obj/machinery/power/apc/off_station/north,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/guestroom2)
"VH" = (
Expand Down Expand Up @@ -7068,10 +7010,7 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/power/apc/off_station{
dir = 4;
pixel_x = 24
},
/obj/machinery/power/apc/off_station/east,
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/engi2)
Expand Down
Loading

0 comments on commit 735ad8b

Please sign in to comment.