diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
new file mode 100644
index 00000000000..8fdc459c863
--- /dev/null
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
@@ -0,0 +1,770 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/turf/simulated/wall/mineral/titanium,
+/area/shuttle/freegolem)
+"ac" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/shuttle,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"ad" = (
+/obj/structure/closet/crate/golemgear,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"ae" = (
+/obj/item/storage/toolbox/mechanical,
+/obj/item/reagent_containers/spray/cleaner,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"af" = (
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"ag" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"ah" = (
+/obj/structure/shuttle/engine/heater{
+ icon_state = "heater";
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"ai" = (
+/obj/structure/shuttle/engine/propulsion{
+ dir = 4;
+ icon_state = "burst_l"
+ },
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"aj" = (
+/obj/machinery/light/small,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"ak" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"al" = (
+/obj/structure/table/wood,
+/obj/item/disk/design_disk/golem_shell,
+/obj/item/areaeditor/golem,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"am" = (
+/obj/machinery/vending/hydronutrients,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"an" = (
+/obj/machinery/vending/hydroseeds,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"ao" = (
+/obj/machinery/light{
+ dir = 1;
+ on = 1
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"ap" = (
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aq" = (
+/turf/simulated/shuttle/wall{
+ icon_state = "swallc2";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"ar" = (
+/obj/effect/mob_spawn/human/golem/adamantine,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"as" = (
+/obj/machinery/vending/coffee/free,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"at" = (
+/obj/machinery/mineral/equipment_vendor/golem,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"au" = (
+/obj/machinery/door/airlock/shuttle,
+/obj/structure/fans/tiny,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"av" = (
+/turf/simulated/shuttle/wall{
+ icon_state = "swall12";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"aw" = (
+/obj/machinery/door/airlock/shuttle,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"ax" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"ay" = (
+/obj/machinery/mineral/ore_redemption/golem,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"az" = (
+/turf/simulated/shuttle/wall{
+ icon_state = "swallc1";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"aA" = (
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/powered/golem_ship)
+"aB" = (
+/obj/structure/window/full/shuttle{
+ icon_state = "16"
+ },
+/obj/structure/grille,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"aC" = (
+/obj/structure/statue/gold/rd{
+ name = "statue of the Liberator"
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ pixel_x = 0
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aD" = (
+/obj/structure/computerframe,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aE" = (
+/turf/simulated/shuttle/wall{
+ icon_state = "swall3";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"aF" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aG" = (
+/obj/machinery/door/airlock/shuttle,
+/obj/structure/fans/tiny,
+/obj/docking_port/stationary{
+ area_type = /area/ruin/powered/golem_ship;
+ dir = 8;
+ dwidth = 8;
+ height = 20;
+ id = "freegolem_lavaland";
+ name = "Lavaland Surface";
+ turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
+ width = 16
+ },
+/obj/docking_port/mobile{
+ dir = 8;
+ dwidth = 8;
+ height = 20;
+ id = "freegolem";
+ name = "Free Golem Ship";
+ width = 16
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aH" = (
+/obj/structure/window/full/shuttle{
+ icon_state = "15"
+ },
+/obj/structure/grille,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"aI" = (
+/obj/structure/window/reinforced{
+ dir = 4;
+ pixel_x = 0
+ },
+/obj/structure/table/wood,
+/obj/item/bedsheet/rd/royal_cape{
+ layer = 3;
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/obj/item/book/manual/research_and_development{
+ name = "Sacred Text of the Liberator";
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aJ" = (
+/obj/machinery/light,
+/obj/structure/chair/comfy/purp{
+ icon_state = "comfychair";
+ dir = 1
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aK" = (
+/turf/simulated/shuttle/wall{
+ tag = "icon-swall13";
+ icon_state = "swall13";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"aL" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/shuttle,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aM" = (
+/turf/simulated/shuttle/wall{
+ tag = "icon-swall11";
+ icon_state = "swall11";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"aN" = (
+/obj/item/resonator/upgraded,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aO" = (
+/obj/machinery/autolathe,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aP" = (
+/obj/machinery/computer/shuttle/golem_ship/recall,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/powered/golem_ship)
+"aQ" = (
+/obj/structure/table/wood,
+/obj/machinery/reagentgrinder,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aR" = (
+/turf/simulated/shuttle/wall{
+ icon_state = "swallc4"
+ },
+/area/shuttle/freegolem)
+"aS" = (
+/turf/simulated/shuttle/wall{
+ icon_state = "swall4";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"aT" = (
+/obj/machinery/light,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aU" = (
+/obj/structure/table/wood,
+/obj/item/resonator,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aV" = (
+/obj/machinery/vending/snack/free,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aW" = (
+/obj/structure/table/wood,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/brute,
+/obj/item/storage/firstaid/brute,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aX" = (
+/obj/structure/table/wood,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid/fire,
+/obj/machinery/light,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"aY" = (
+/obj/structure/table/wood,
+/obj/item/storage/firstaid/adv,
+/obj/item/storage/firstaid/adv,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"ba" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"bb" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"bc" = (
+/obj/structure/ore_box,
+/turf/simulated/shuttle/plating,
+/area/shuttle/freegolem)
+"be" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/obj/machinery/light,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor5"
+ },
+/area/shuttle/freegolem)
+"bf" = (
+/turf/simulated/shuttle/wall{
+ icon_state = "swallc3";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+"bh" = (
+/turf/simulated/shuttle/wall{
+ tag = "icon-swall14";
+ icon_state = "swall14";
+ dir = 2
+ },
+/area/shuttle/freegolem)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aq
+aB
+aH
+bf
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+av
+aC
+aI
+av
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(3,1,1) = {"
+aa
+aa
+aa
+aq
+aE
+au
+aR
+aD
+aJ
+ab
+au
+aE
+bf
+aa
+aa
+aa
+"}
+(4,1,1) = {"
+aa
+aa
+aa
+av
+am
+ap
+ax
+ap
+ap
+ax
+ap
+as
+av
+aa
+aa
+aa
+"}
+(5,1,1) = {"
+aa
+aa
+aa
+av
+an
+ap
+ap
+ap
+ap
+ap
+ap
+aV
+av
+aa
+aa
+aa
+"}
+(6,1,1) = {"
+aq
+aE
+aE
+aK
+ao
+ap
+ap
+ap
+ap
+ap
+ap
+aT
+bh
+aE
+aE
+bf
+"}
+(7,1,1) = {"
+av
+ad
+af
+aw
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aw
+af
+bc
+av
+"}
+(8,1,1) = {"
+av
+ad
+af
+aw
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aw
+af
+bc
+av
+"}
+(9,1,1) = {"
+av
+ad
+aj
+av
+ao
+ap
+ap
+ap
+ap
+ap
+ap
+aT
+av
+ba
+bc
+av
+"}
+(10,1,1) = {"
+av
+ad
+af
+av
+ap
+ap
+ar
+aU
+aU
+ar
+ap
+ap
+av
+af
+bc
+av
+"}
+(11,1,1) = {"
+av
+ad
+af
+av
+ap
+ap
+ar
+aU
+aU
+ar
+ap
+ap
+av
+af
+bc
+av
+"}
+(12,1,1) = {"
+av
+ad
+aj
+av
+ao
+ap
+ap
+ap
+ap
+ap
+ap
+aT
+av
+ba
+bc
+av
+"}
+(13,1,1) = {"
+av
+ad
+af
+aw
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aw
+af
+bc
+av
+"}
+(14,1,1) = {"
+av
+ad
+af
+aw
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aw
+af
+bc
+av
+"}
+(15,1,1) = {"
+av
+ae
+af
+av
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aW
+av
+af
+ae
+av
+"}
+(16,1,1) = {"
+ac
+af
+aj
+av
+ao
+ap
+ap
+ap
+ap
+ap
+ap
+aX
+av
+ba
+af
+ac
+"}
+(17,1,1) = {"
+ac
+af
+af
+av
+ap
+ap
+ap
+ap
+ap
+aN
+ap
+aY
+av
+af
+af
+ac
+"}
+(18,1,1) = {"
+av
+ag
+ak
+av
+at
+ap
+ay
+ap
+ap
+aO
+aQ
+al
+av
+bb
+bb
+av
+"}
+(19,1,1) = {"
+av
+ah
+ah
+av
+ah
+ah
+aS
+aF
+be
+aS
+ah
+ah
+av
+ah
+ah
+av
+"}
+(20,1,1) = {"
+az
+ai
+ai
+aM
+ai
+ai
+aM
+aG
+aL
+aM
+ai
+ai
+aM
+ai
+ai
+aR
+"}
+(21,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aA
+aA
+aA
+aP
+aa
+aa
+aa
+aa
+aa
+aa
+"}
diff --git a/_maps/map_files/cyberiad/z3.dmm b/_maps/map_files/cyberiad/z3.dmm
index 7e8d296ba7d..26d46280ae3 100644
--- a/_maps/map_files/cyberiad/z3.dmm
+++ b/_maps/map_files/cyberiad/z3.dmm
@@ -353,104 +353,10 @@
},
/turf/simulated/floor/plating,
/area/tcommsat/powercontrol)
-"aI" = (
-/turf/simulated/mineral/random,
-/area/mine/dangerous/explored/golem)
-"aJ" = (
-/turf/simulated/floor/plating/asteroid/airless,
-/area/mine/dangerous/explored/golem)
-"aK" = (
-/turf/simulated/mineral/random/high_chance,
-/area/mine/dangerous/explored/golem)
-"aL" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f6";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aM" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall12";
- icon_state = "swall12";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aN" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/shuttle{
- id_tag = "s_docking_airlock";
- locked = 1
- },
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
-"aO" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swall8";
- tag = "icon-swall12"
- },
-/area/shuttle/freegolem)
-"aP" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swall3";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aQ" = (
-/obj/structure/closet/crate/golemgear,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
-"aR" = (
-/obj/item/storage/toolbox/mechanical,
-/obj/item/reagent_containers/spray/cleaner,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
-"aS" = (
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
"aT" = (
/obj/structure/lattice,
/turf/space,
/area/space/nearstation)
-"aU" = (
-/obj/structure/reagent_dispensers/watertank/high,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
-"aV" = (
-/obj/structure/shuttle/engine/heater{
- icon_state = "heater";
- dir = 4
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"aW" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 4;
- icon_state = "burst_l"
- },
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"aX" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
-"aY" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall13";
- icon_state = "swall13";
- dir = 2
- },
-/area/shuttle/freegolem)
-"aZ" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
"ba" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall_s6";
@@ -479,24 +385,6 @@
dir = 2
},
/area/space/nearstation)
-"be" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall14";
- dir = 2
- },
-/area/shuttle/freegolem)
-"bf" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
-"bg" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bh" = (
-/turf/simulated/wall/mineral/titanium/interior,
-/area/shuttle/freegolem)
"bi" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall7";
@@ -536,33 +424,12 @@
dir = 2
},
/area/space/nearstation)
-"bn" = (
-/obj/machinery/vending/hydroseeds,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bo" = (
-/obj/machinery/vending/hydronutrients,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"bp" = (
/obj/machinery/door/unpowered/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/space/nearstation)
-"bq" = (
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"br" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/shuttle{
- id_tag = "s_docking_airlock";
- locked = 1
- },
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
"bs" = (
/turf/simulated/shuttle/floor{
icon_state = "floor3"
@@ -573,13 +440,6 @@
dir = 2
},
/area/space/nearstation)
-"bt" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"bu" = (
/turf/simulated/shuttle/floor{
icon_state = "floor3"
@@ -590,18 +450,6 @@
dir = 2
},
/area/space/nearstation)
-"bv" = (
-/obj/machinery/light{
- dir = 1;
- on = 1
- },
-/obj/effect/landmark/free_golem_spawn,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bw" = (
-/obj/effect/landmark/free_golem_spawn,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"bx" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall_s5";
@@ -623,171 +471,6 @@
dir = 2
},
/area/space/nearstation)
-"bA" = (
-/obj/machinery/vending/coffee/free,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bB" = (
-/turf/simulated/shuttle/wall{
- tag = "icon-swall14";
- icon_state = "swall4";
- dir = 2
- },
-/area/shuttle/freegolem)
-"bC" = (
-/turf/simulated/shuttle/wall{
- dir = 2;
- icon_state = "swallc1";
- tag = "icon-swall12"
- },
-/area/shuttle/freegolem)
-"bD" = (
-/obj/structure/window/full/shuttle{
- icon_state = "16"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"bE" = (
-/obj/structure/statue/gold/rd{
- name = "statue of the Liberator"
- },
-/obj/structure/window/reinforced{
- dir = 4;
- pixel_x = 0
- },
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"bF" = (
-/obj/machinery/mineral/equipment_vendor/golem,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bG" = (
-/obj/item/resonator,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bH" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bI" = (
-/obj/item/gun/energy/kinetic_accelerator,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bJ" = (
-/obj/structure/window/full/shuttle{
- icon_state = "15"
- },
-/obj/structure/grille,
-/turf/simulated/shuttle/plating,
-/area/shuttle/freegolem)
-"bK" = (
-/obj/structure/window/reinforced{
- dir = 4;
- pixel_x = 0
- },
-/obj/structure/table/wood,
-/obj/item/bedsheet/rd/royal_cape{
- layer = 3;
- pixel_x = 5;
- pixel_y = 9
- },
-/obj/item/book/manual/research_and_development{
- name = "Sacred Text of the Liberator";
- pixel_x = -4;
- pixel_y = 3
- },
-/turf/simulated/shuttle/floor{
- icon_state = "floor5"
- },
-/area/shuttle/freegolem)
-"bL" = (
-/obj/machinery/mineral/ore_redemption/golem,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bM" = (
-/obj/machinery/computer/shuttle/golem_ship,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bN" = (
-/turf/space,
-/turf/simulated/shuttle/wall{
- icon_state = "swall_f5";
- dir = 2
- },
-/area/shuttle/freegolem)
-"bO" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bP" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bQ" = (
-/turf/simulated/shuttle/wall{
- icon_state = "swallc4"
- },
-/area/shuttle/freegolem)
-"bR" = (
-/obj/machinery/door/airlock/shuttle{
- id_tag = "s_docking_airlock";
- locked = 1
- },
-/obj/structure/fans/tiny,
-/obj/docking_port/mobile{
- dir = 8;
- dwidth = 8;
- height = 20;
- id = "freegolem";
- name = "Free Golem Ship";
- roundstart_move = "freegolem_transit";
- width = 16
- },
-/obj/docking_port/stationary{
- dir = 8;
- dwidth = 8;
- height = 20;
- id = "freegolem_z3";
- name = "Small Asteroid";
- width = 16
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bS" = (
-/obj/machinery/light,
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bT" = (
-/obj/machinery/light/small,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bU" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/shuttle{
- id_tag = "s_docking_airlock";
- locked = 1
- },
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"bV" = (
-/obj/item/resonator/upgraded,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"bW" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -1397,10 +1080,6 @@
},
/turf/simulated/floor/plasteel,
/area/tcommsat/computer)
-"dr" = (
-/obj/machinery/autolathe,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"ds" = (
/obj/machinery/atmospherics/unary/vent_pump{
dir = 4;
@@ -1814,15 +1493,6 @@
},
/turf/simulated/floor/plating,
/area/tcommsat/chamber)
-"ej" = (
-/obj/structure/table/wood,
-/obj/machinery/reagentgrinder,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"ek" = (
-/obj/machinery/computer/arcade/battle,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"el" = (
/obj/machinery/door/window/brigdoor{
dir = 1;
@@ -1876,10 +1546,6 @@
/obj/structure/lattice,
/turf/space,
/area/turret_protected/tcomsat)
-"eq" = (
-/obj/machinery/computer/arcade/orion_trail,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"er" = (
/obj/structure/window/reinforced{
dir = 4
@@ -1957,10 +1623,6 @@
temperature = 80
},
/area/tcommsat/chamber)
-"ex" = (
-/obj/machinery/light,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"ey" = (
/obj/structure/cable{
d1 = 4;
@@ -2004,11 +1666,6 @@
temperature = 80
},
/area/tcommsat/chamber)
-"eA" = (
-/obj/machinery/light,
-/obj/effect/landmark/free_golem_spawn,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"eB" = (
/turf/simulated/floor/bluegrid{
icon_state = "dark";
@@ -2103,10 +1760,6 @@
/obj/structure/lattice,
/turf/space,
/area/turret_protected/tcomsat)
-"eI" = (
-/obj/machinery/vending/snack/free,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"eJ" = (
/obj/structure/cable{
d1 = 1;
@@ -2188,13 +1841,6 @@
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"eQ" = (
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/brute,
-/obj/item/storage/firstaid/brute,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"eR" = (
/obj/structure/window/reinforced{
dir = 8
@@ -2464,12 +2110,6 @@
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
-"fp" = (
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/adv,
-/obj/item/storage/firstaid/adv,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"fq" = (
/obj/structure/grille,
/obj/structure/cable{
@@ -2578,15 +2218,6 @@
temperature = 80
},
/area/tcommsat/chamber)
-"fy" = (
-/obj/structure/table/wood,
-/obj/structure/table/wood,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
-/obj/machinery/light,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
"fz" = (
/obj/machinery/telecomms/processor/preset_four,
/turf/simulated/floor/plasteel{
@@ -2862,18 +2493,6 @@
temperature = 80
},
/area/tcommsat/chamber)
-"fY" = (
-/obj/structure/table/wood,
-/obj/item/areaeditor/golem,
-/obj/item/disk/design_disk/golem_shell,
-/turf/simulated/floor/mineral/titanium/purple,
-/area/shuttle/freegolem)
-"fZ" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
"ga" = (
/obj/machinery/telecomms/server/presets/command,
/turf/simulated/floor/plasteel{
@@ -2898,10 +2517,6 @@
temperature = 80
},
/area/tcommsat/chamber)
-"gc" = (
-/obj/machinery/chem_master,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
"gd" = (
/obj/machinery/camera{
c_tag = "Telecomms Server Room South";
@@ -2923,10 +2538,6 @@
temperature = 80
},
/area/tcommsat/chamber)
-"ge" = (
-/obj/structure/ore_box,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
"gf" = (
/obj/structure/cable{
d1 = 1;
@@ -2970,10 +2581,6 @@
"gj" = (
/turf/simulated/wall/r_wall,
/area/turret_protected/tcomfoyer)
-"gk" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/shuttle/freegolem)
"gr" = (
/obj/structure/window/reinforced,
/obj/machinery/light{
@@ -16115,10 +15722,10 @@ aa
aa
aa
aa
-aL
-bD
-bJ
-bN
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -16372,10 +15979,10 @@ aa
aa
aa
aa
-aM
-bE
-bK
-aM
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -16626,16 +16233,16 @@ aa
aa
aa
aa
-aL
-aP
-br
-aY
-bM
-bS
-be
-br
-aP
-bN
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -16883,16 +16490,16 @@ aa
aa
aa
aa
-aM
-bo
-bq
-aZ
-bq
-bq
-bg
-bq
-eq
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -17140,16 +16747,16 @@ aa
aa
aa
aa
-aM
-bn
-bq
-aZ
-bq
-bq
-bg
-bq
-ek
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -17394,22 +17001,22 @@ aa
aa
aa
aa
-aL
-aP
-aP
-aY
-bt
-bq
-bh
-bq
-bq
-bh
-bq
-ex
-be
-aP
-aP
-bN
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -17651,22 +17258,22 @@ aa
aa
aa
aa
-aM
-aQ
-aS
-bg
-bq
-bq
-bh
-bq
-bq
-bh
-bq
-bq
-bg
-aS
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -17908,22 +17515,22 @@ aa
aa
aa
aa
-aM
-aQ
-aS
-bg
-bq
-bq
-bh
-bO
-bq
-bh
-bq
-bq
-bg
-aS
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -18165,22 +17772,22 @@ aa
aa
aa
aa
-aM
-aQ
-aX
-bh
-bv
-bG
-bh
-bq
-bq
-bh
-bG
-eA
-bh
-fZ
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -18422,22 +18029,22 @@ aa
aa
aa
aa
-aM
-aQ
-aS
-bh
-bw
-bG
-bh
-bq
-bq
-bh
-bG
-bw
-bh
-aS
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -18679,22 +18286,22 @@ aa
aa
aa
aa
-aM
-aQ
-aS
-bh
-bh
-bg
-bh
-bg
-bg
-bh
-bg
-bh
-bh
-aS
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -18936,22 +18543,22 @@ aa
aa
aa
aa
-aM
-aQ
-aX
-bh
-bA
-bq
-bH
-bq
-bq
-bH
-bq
-eI
-bh
-fZ
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -19193,22 +18800,22 @@ aa
aa
aa
aa
-aM
-aQ
-aS
-bg
-bq
-bq
-bq
-bq
-bq
-bq
-bq
-bq
-bg
-aS
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -19450,22 +19057,22 @@ aa
aa
aa
aa
-aM
-aQ
-aS
-bg
-bq
-bq
-bq
-bq
-bq
-bq
-bq
-bq
-bg
-aS
-ge
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -19707,22 +19314,22 @@ aa
aa
aa
aa
-aM
-aR
-aS
-bh
-bq
-bq
-bq
-bq
-bq
-bq
-bq
-eQ
-bh
-aS
-aR
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -19964,22 +19571,22 @@ aa
aa
aa
aa
-aN
-aS
-aX
-bh
-bt
-bq
-bq
-bq
-bq
-bq
-bq
-fy
-bh
-fZ
-aS
-aN
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -20221,22 +19828,22 @@ aa
aa
aa
aa
-aN
-aS
-aS
-bh
-bq
-bq
-bI
-bq
-bq
-bV
-bq
-fp
-bh
-aS
-aS
-aN
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -20478,22 +20085,22 @@ aa
aa
aa
aa
-aM
-aU
-bf
-bh
-bF
-bq
-bL
-bq
-bq
-dr
-ej
-fY
-bh
-gc
-gk
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -20733,24 +20340,24 @@ aa
aa
aa
aa
-aI
-aI
-aM
-aV
-aV
-bB
-aV
-aV
-bB
-bP
-bT
-bB
-aV
-aV
-bB
-aV
-aV
-aM
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -20990,25 +20597,25 @@ aa
aa
aa
aa
-aI
-aI
-aO
-aW
-aW
-aO
-aW
-aW
-bC
-bR
-bU
-bQ
-aW
-aW
-aO
-aW
-aW
-aO
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -21247,25 +20854,25 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aJ
-aJ
-aJ
-aJ
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -21504,25 +21111,25 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aJ
-aJ
-aJ
-aJ
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -21761,25 +21368,25 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -22016,27 +21623,27 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -22273,27 +21880,27 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -22530,26 +22137,26 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aK
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -22787,26 +22394,26 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aK
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -23044,28 +22651,28 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -23301,28 +22908,28 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -23558,28 +23165,28 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -23815,28 +23422,28 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aK
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -24072,26 +23679,26 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -24329,26 +23936,26 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aK
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -24588,27 +24195,27 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aJ
-aJ
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -24846,26 +24453,26 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -25103,26 +24710,26 @@ aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
aa
aa
aa
aa
-aI
-aI
-aI
-aI
-aI
-aI
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
diff --git a/_maps/map_files/cyberiad/z4.dmm b/_maps/map_files/cyberiad/z4.dmm
index 1d4f0c698ea..08d56927445 100644
--- a/_maps/map_files/cyberiad/z4.dmm
+++ b/_maps/map_files/cyberiad/z4.dmm
@@ -4862,6 +4862,17 @@
},
/turf/simulated/floor/plating/airless,
/area/constructionsite/engineering)
+"zH" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 8;
+ height = 20;
+ id = "freegolem_z4";
+ name = "Near Construction Site";
+ width = 16
+ },
+/turf/space,
+/area/space)
(1,1,1) = {"
aa
@@ -43872,7 +43883,7 @@ aa
aa
aa
aa
-aa
+zH
aa
aa
aa
diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm
index e51ec171e34..f47b299a8d7 100644
--- a/_maps/map_files/cyberiad/z6.dmm
+++ b/_maps/map_files/cyberiad/z6.dmm
@@ -53932,7 +53932,7 @@ aa
aa
aa
aa
-wr
+aa
aa
aa
aa
@@ -54188,7 +54188,7 @@ aa
aa
aa
aa
-aa
+wr
aa
aa
aa
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 5792aff1725..e33238bb291 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -80,9 +80,6 @@
var/auto_cryo_ssd_mins = 0
var/ssd_warning = 0
- var/prob_free_golems = 75 //chance for free golems spawners to appear roundstart
- var/unrestricted_free_golems = FALSE //if true, free golems can appear on all roundtypes
-
var/traitor_objectives_amount = 2
var/shadowling_max_age = 0
@@ -310,12 +307,6 @@
if("jobs_have_minimal_access")
config.jobs_have_minimal_access = 1
- if("prob_free_golems")
- config.prob_free_golems = text2num(value)
-
- if("unrestricted_free_golems")
- config.unrestricted_free_golems = TRUE
-
if("shadowling_max_age")
config.shadowling_max_age = text2num(value)
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index d98a23a80c2..67e5438656e 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -46,6 +46,15 @@ datum/map_template/ruin/lavaland/ash_walker
cost = 20
allow_duplicates = FALSE
+/datum/map_template/ruin/lavaland/free_golem
+ name = "Free Golem Ship"
+ id = "golem-ship"
+ description = "Lumbering humanoids, made out of precious metals, move inside this ship. They frequently leave to mine more minerals, which they somehow turn into more of them. \
+ Seem very intent on research and individual liberty, and also geology based naming?"
+ cost = 20
+ suffix = "lavaland_surface_golem_ship.dmm"
+ allow_duplicates = FALSE
+
/datum/map_template/ruin/lavaland/animal_hospital
name = "Animal Hospital"
id = "animal-hospital"
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index 84df75d01b1..d72c6cc0406 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -16,7 +16,7 @@
icon_state = "dk_yellow"
/area/ruin/powered/golem_ship
- name = "Free Golem Ship"
+ name = "Free Golem Landing"
icon_state = "dk_yellow"
/area/ruin/powered/greed
diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm
index 0f8e52a90b2..df61106c4ab 100644
--- a/code/game/gamemodes/blob/blob.dm
+++ b/code/game/gamemodes/blob/blob.dm
@@ -14,7 +14,6 @@ var/list/blob_nodes = list()
required_enemies = 1
recommended_enemies = 1
restricted_jobs = list("Cyborg", "AI")
- free_golems_disabled = TRUE
var/declared = 0
var/burst = 0
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 90ab53dfde2..021eb7461f5 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -43,7 +43,6 @@ var/global/list/all_cults = list()
required_players = 30
required_enemies = 3
recommended_enemies = 4
- free_golems_disabled = TRUE
var/datum/mind/sacrifice_target = null
var/finished = 0
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index e344c2b2029..aa366415f31 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -27,7 +27,6 @@
var/recommended_enemies = 0
var/newscaster_announcements = null
var/ert_disabled = 0
- var/free_golems_disabled = FALSE
var/uplink_welcome = "Syndicate Uplink Console:"
var/uplink_uses = 20
@@ -81,7 +80,6 @@
// feedback_set_details("revision","[revdata.revision]")
feedback_set_details("server_ip","[world.internet_address]:[world.port]")
generate_station_goals()
- check_free_golems()
start_state = new /datum/station_state()
start_state.count()
return 1
@@ -513,12 +511,6 @@ proc/display_roundstart_logout_report()
var/datum/station_goal/G = V
G.print_result()
-/datum/game_mode/proc/check_free_golems() //check config and gamemode for free golems setting and run the prob to check if the round will have free golems spawned or not
- if((config.unrestricted_free_golems || !free_golems_disabled) && prob(config.prob_free_golems))
- for(var/obj/effect/landmark/free_golem_spawn/L in GLOB.landmarks_list)
- if(isturf(L.loc))
- new /obj/effect/mob_spawn/human/golem/adamantine(L.loc)
-
/datum/game_mode/proc/update_eventmisc_icons_added(datum/mind/mob_mind)
var/datum/atom_hud/antag/antaghud = huds[ANTAG_HUD_EVENTMISC]
antaghud.join_hud(mob_mind.current)
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 4e9d507c9ea..cf808f3709d 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -12,7 +12,6 @@ proc/issyndicate(mob/living/M as mob)
required_players = 30 // 30 players - 5 players to be the nuke ops = 25 players remaining
required_enemies = 5
recommended_enemies = 5
- free_golems_disabled = TRUE
var/const/agents_possible = 5 //If we ever need more syndicate agents.
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index e1f9ac2725d..5ac62401d23 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -7,7 +7,6 @@
required_players = 20
required_enemies = 1
recommended_enemies = 1
- free_golems_disabled = TRUE
var/use_huds = 0
var/finished = 0
var/but_wait_theres_more = 0
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index d404db8ae0a..a34a49ca051 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -334,9 +334,6 @@
/obj/item/circuitboard/white_ship
name = "circuit Board (White Ship)"
build_path = /obj/machinery/computer/shuttle/white_ship
-/obj/item/circuitboard/golem_ship
- name = "circuit Board (Golem Ship)"
- build_path = /obj/machinery/computer/shuttle/golem_ship
/obj/item/circuitboard/shuttle/syndicate
name = "circuit board (Syndicate Shuttle)"
build_path = /obj/machinery/computer/shuttle/syndicate
@@ -346,7 +343,9 @@
/obj/item/circuitboard/shuttle/syndicate/drop_pod
name = "circuit board (Syndicate Drop Pod)"
build_path = /obj/machinery/computer/shuttle/syndicate/drop_pod
-
+/obj/item/circuitboard/shuttle/golem_ship
+ name = "circuit Board (Golem Ship)"
+ build_path = /obj/machinery/computer/shuttle/golem_ship
/obj/item/circuitboard/HolodeckControl
name = "Circuit board (Holodeck Control)"
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 9d6ca608759..1001a2aa514 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -474,7 +474,9 @@
new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500),
new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000),
new /datum/data/mining_equipment("KA Trigger Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1000),
+ new /datum/data/mining_equipment("Shuttle Console Board", /obj/item/circuitboard/shuttle/golem_ship, 2000),
new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000)
+
)
/datum/data/mining_equipment
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 5fad9348769..51ba6c6bad1 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -503,7 +503,7 @@
SSair.remove_from_active(T1)
T1.CalculateAdjacentTurfs()
SSair.add_to_active(T1,1)
-
+
T1.lighting_build_overlay()
T0.ChangeTurf(turf_type)
@@ -836,20 +836,6 @@
shuttleId = "whiteship"
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4"
-/obj/machinery/computer/shuttle/golem_ship
- name = "Golem Ship Console"
- desc = "Used to control the Golem Ship."
- circuit = /obj/item/circuitboard/golem_ship
- shuttleId = "freegolem"
- possible_destinations = "freegolem_z3;freegolem_z5;freegolem_z1;freegolem_z6"
- resistance_flags = INDESTRUCTIBLE
-
-/obj/machinery/computer/shuttle/golem_ship/attack_hand(mob/user)
- if(!isgolem(user))
- to_chat(user, "The console is unresponsive. Seems only golems can use it.")
- return
- ..()
-
/obj/machinery/computer/shuttle/engineering
name = "Engineering Shuttle Console"
desc = "Used to call and send the engineering shuttle."
@@ -893,6 +879,25 @@
possible_destinations = "trade_sol_base;trade_dock"
shuttleId = "trade_sol"
+/obj/machinery/computer/shuttle/golem_ship
+ name = "Golem Ship Console"
+ desc = "Used to control the Golem Ship."
+ circuit = /obj/item/circuitboard/shuttle/golem_ship
+ shuttleId = "freegolem"
+ possible_destinations = "freegolem_lavaland;freegolem_z5;freegolem_z4;freegolem_z6"
+
+/obj/machinery/computer/shuttle/golem_ship/attack_hand(mob/user)
+ if(!isgolem(user) && !isobserver(user))
+ to_chat(user, "The console is unresponsive. Seems only golems can use it.")
+ return
+ ..()
+
+/obj/machinery/computer/shuttle/golem_ship/recall
+ name = "golem ship recall terminal"
+ desc = "Used to recall the Golem Ship."
+ possible_destinations = "freegolem_lavaland"
+ resistance_flags = INDESTRUCTIBLE
+
//#undef DOCKING_PORT_HIGHLIGHT
/turf/proc/copyTurf(turf/T)
diff --git a/config/example/config.txt b/config/example/config.txt
index 89b8767feab..ed2496b6770 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -119,12 +119,6 @@ PROBABILITY ABDUCTION 0
PROBABILITY DEVIL 0
PROBABILITY DEVILAGENTS 0
-## Probability in % for Free Golems to spawn at roundstart, set to 0 for no golems
-PROB_FREE_GOLEMS 75
-
-## Uncomment to allow free golems on all roundtypes. Otherwise, disabled on cult, wiz, raging mages, blob, and nuclear.
-#UNRESTRICTED_FREE_GOLEMS
-
## Maximum cycles shadowlings can remain unhatched before they take damage. 1800 = 60 minutes, 900 = 30 minutes, 0 = feature disabled.
SHADOWLING_MAX_AGE 0