Skip to content

Commit

Permalink
Merge branch 'new_maps_galore' of https://github.com/dwasint/Monkesta…
Browse files Browse the repository at this point in the history
…tion2.0 into new_maps_galore
  • Loading branch information
dwasint committed Jul 5, 2024
2 parents aae38af + e51d229 commit a2ad058
Show file tree
Hide file tree
Showing 270 changed files with 13,564 additions and 10,529 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@
"BL" = (
/obj/structure/table/wood,
/obj/item/folder/white,
/obj/item/stamp/rd,
/obj/item/stamp/head/rd,
/turf/open/floor/iron/grimy,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"BM" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/waystation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
pixel_x = 7;
pixel_y = 4
},
/obj/item/stamp/qm{
/obj/item/stamp/head/qm{
pixel_x = 7;
pixel_y = -2
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2904,7 +2904,7 @@
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/item/folder/white,
/obj/item/stamp/rd{
/obj/item/stamp/head/rd{
pixel_x = 3;
pixel_y = -2
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomZLevels/undergroundoutpost45.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5519,7 +5519,7 @@
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/item/folder/white,
/obj/item/stamp/rd{
/obj/item/stamp/head/rd{
pixel_x = 3;
pixel_y = -2
},
Expand Down Expand Up @@ -10161,7 +10161,7 @@
/obj/item/clothing/glasses/meson{
pixel_y = 4
},
/obj/item/stamp/ce,
/obj/item/stamp/head/ce,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron{
heat_capacity = 1e+006
Expand Down
Loading

0 comments on commit a2ad058

Please sign in to comment.