Skip to content

Commit

Permalink
Merge branch 'master' into qdel_optimize
Browse files Browse the repository at this point in the history
  • Loading branch information
FeenieRU authored Oct 15, 2024
2 parents 0f4be15 + 65718ef commit 5e95ea5
Show file tree
Hide file tree
Showing 33 changed files with 632 additions and 682 deletions.
6 changes: 1 addition & 5 deletions _maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1698,10 +1698,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/beach/oceantown/shop)
"ww" = (
/obj/structure/statue/sandstone/assistant,
/turf/open/floor/plating/asteroid/sand/lit,
/area/overmap_encounter/planetoid/beachplanet/explored)
"wF" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
Expand Down Expand Up @@ -7687,7 +7683,7 @@ sa
sa
Ud
sa
ww
sa
sa
Ud
sa
Expand Down
4 changes: 3 additions & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,9 @@
/area/overmap_encounter/planetoid/jungle/explored)
"bU" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/statue/sandstone/assistant,
/obj/item/kirbyplants{
icon_state = "plant-10"
},
/obj/machinery/light_switch{
pixel_y = 21;
pixel_x = -10
Expand Down
2 changes: 0 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2024,7 +2024,6 @@
/turf/open/floor/engine/hull/interior,
/area/overmap_encounter/planetoid/lava/explored)
"Hl" = (
/obj/structure/statue/sandstone/assistant,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
Expand Down Expand Up @@ -2380,7 +2379,6 @@
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_starwalker)
"Mk" = (
/obj/structure/statue/sandstone/assistant,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/light,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2155,6 +2155,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/hostile/human/syndicate/ranged/smg/space/stormtrooper,
/turf/open/floor/plasteel/dark,
/area/ruin/lavaland/factory/dorms)
"tN" = (
Expand Down Expand Up @@ -6370,7 +6371,7 @@ LP
vE
DB
Cc
KX
yQ
Gn
hv
JO
Expand Down Expand Up @@ -6424,7 +6425,7 @@ vE
EU
Vw
Id
KX
yQ
PR
KX
PR
Expand Down Expand Up @@ -6478,7 +6479,7 @@ ab
vQ
LL
Kg
KX
yQ
Gw
KX
Gw
Expand Down Expand Up @@ -6532,7 +6533,7 @@ yQ
yQ
yQ
yQ
KX
yQ
KX
KX
KX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@
/obj/machinery/door/airlock/hatch{
welded = 1
},
/turf/template_noop,
/turf/open/floor/plating,
/area/ruin/whitesands/pubbycrash/split)
"ET" = (
/obj/structure/cable/yellow{
Expand Down
22 changes: 15 additions & 7 deletions _maps/shuttles/independent/independent_mudskipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo)
"xR" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/machinery/door/poddoor/shutters{
id = "mudskipper_window"
},
/turf/open/floor/plating,
/area/ship/hallway/aft)
"xU" = (
/obj/machinery/power/terminal{
dir = 1
Expand Down Expand Up @@ -1051,7 +1059,7 @@
/obj/machinery/door/poddoor/shutters{
id = "mudskipper_window"
},
/obj/structure/window/fulltile,
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/ship/cargo)
"yB" = (
Expand Down Expand Up @@ -1431,7 +1439,7 @@
dir = 4;
id = "mudskipper_bridge"
},
/obj/effect/spawner/structure/window,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/ship/bridge)
"Gq" = (
Expand Down Expand Up @@ -1811,7 +1819,7 @@
/obj/machinery/door/poddoor/shutters{
id = "mudskipper_window"
},
/obj/structure/window/fulltile,
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/ship/hallway/aft)
"PU" = (
Expand All @@ -1823,10 +1831,10 @@
"Qt" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/layer_manifold,
/obj/structure/window/reinforced/fulltile,
/obj/machinery/door/poddoor/shutters{
id = "mudskipper_window"
},
/obj/structure/window/fulltile,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Qu" = (
Expand Down Expand Up @@ -2224,7 +2232,7 @@
/obj/machinery/door/poddoor/shutters{
id = "mudskipper_window"
},
/obj/structure/window/fulltile,
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/ship/hallway/aft)
"XI" = (
Expand Down Expand Up @@ -2278,7 +2286,7 @@
/obj/machinery/door/poddoor/shutters{
id = "mudskipper_window"
},
/obj/structure/window/fulltile,
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/ship/crew)
"Yi" = (
Expand Down Expand Up @@ -2566,7 +2574,7 @@ cs
hX
cs
cs
Xm
xR
yg
XK
Ni
Expand Down
Loading

0 comments on commit 5e95ea5

Please sign in to comment.