diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index fba342e359d..fd7abbc02fc 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -1,249 +1,269 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/turf/simulated/wall/mineral/titanium/nodiagonal, +"am" = ( +/obj/structure/closet/freegolem, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" + }, /area/shuttle/freegolem) -"c" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/titanium, +"bq" = ( +/turf/simulated/wall/mineral/titanium, +/area/shuttle/freegolem) +"bF" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/freegolem) +"bH" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/hydroponics{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/reagentgrinder{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"bQ" = ( +/obj/machinery/door/airlock/external, +/obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plating, /area/shuttle/freegolem) -"d" = ( -/obj/structure/closet/crate/golemgear, -/turf/simulated/floor/plating, +"ca" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" + }, /area/shuttle/freegolem) -"e" = ( -/obj/item/storage/toolbox/mechanical, -/obj/item/reagent_containers/spray/cleaner, -/turf/simulated/floor/plating, -/area/shuttle/freegolem) -"f" = ( -/turf/simulated/floor/plating, -/area/shuttle/freegolem) -"g" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/simulated/floor/plating, -/area/shuttle/freegolem) -"i" = ( +"cg" = ( /obj/structure/shuttle/engine/propulsion{ dir = 4; icon_state = "burst_l" }, /turf/simulated/floor/plating/lavaland_air, /area/shuttle/freegolem) -"j" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/shuttle/freegolem) -"k" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/shuttle/freegolem) -"l" = ( -/obj/machinery/door/airlock/titanium, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"m" = ( -/obj/machinery/economy/vending/hydronutrients, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"n" = ( -/obj/machinery/economy/vending/hydroseeds, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"o" = ( -/obj/machinery/light{ - dir = 1; - on = 1 +"cr" = ( +/turf/template_noop, +/area/template_noop) +"cQ" = ( +/obj/structure/closet/freegolem, +/obj/effect/turf_decal/box/white/corners, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" }, -/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"p" = ( -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"q" = ( -/obj/machinery/mineral/equipment_vendor/golem, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"s" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"t" = ( -/obj/effect/mob_spawn/human/alive/golem/adamantine, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"u" = ( -/obj/machinery/mineral/ore_redemption/golem, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"v" = ( -/obj/effect/spawner/window/shuttle, -/turf/simulated/floor/plating, -/area/shuttle/freegolem) -"w" = ( -/obj/structure/statue/gold/rd{ - name = "statue of the Liberator" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"x" = ( -/obj/structure/computerframe, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"y" = ( -/obj/structure/table/wood, -/obj/item/resonator, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"z" = ( -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"A" = ( +"df" = ( +/obj/machinery/computer/shuttle/golem_ship/recall, /obj/effect/mapping_helpers/no_lava, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/powered/golem_ship) -"B" = ( -/obj/machinery/door/airlock/titanium, -/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/free_golem, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"C" = ( +"dm" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/table/wood, /obj/item/bedsheet/rd/royal_cape{ layer = 3; - pixel_x = 5; - pixel_y = 9 + pixel_x = 2; + pixel_y = 4 }, +/obj/structure/table, +/obj/item/areaeditor/golem{ + pixel_x = -2; + pixel_y = 5 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/freegolem) +"fC" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"fQ" = ( +/obj/structure/computerframe, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/freegolem) +"hg" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"hu" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"hL" = ( +/turf/simulated/wall/mineral/titanium/nodiagonal, +/area/shuttle/freegolem) +"iq" = ( +/obj/effect/turf_decal/loading_area, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"iW" = ( +/obj/machinery/economy/vending/snack/free, +/turf/simulated/floor/plasteel{ + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"jr" = ( +/obj/effect/mob_spawn/human/alive/golem/adamantine{ + pixel_y = 5 + }, +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" + }, +/area/shuttle/freegolem) +"jD" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"jY" = ( +/obj/effect/mapping_helpers/no_lava, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/powered/golem_ship) +"mL" = ( +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/freegolem) +"nX" = ( +/obj/machinery/door/airlock/external, +/obj/docking_port/mobile/free_golem, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/shuttle/freegolem) +"oD" = ( +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/shuttle/freegolem) +"pa" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/catwalk, +/area/shuttle/freegolem) +"pt" = ( +/obj/structure/sign/vacuum/external{ + pixel_y = 32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/catwalk, +/area/shuttle/freegolem) +"pL" = ( +/turf/simulated/floor/catwalk, +/area/shuttle/freegolem) +"qT" = ( +/obj/structure/table, /obj/item/book/manual/research_and_development{ name = "Sacred Text of the Liberator"; pixel_x = -4; pixel_y = 3 }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"D" = ( -/obj/machinery/light, -/obj/structure/chair/comfy/purp{ - dir = 1 +/obj/item/disk/design_disk/golem_shell{ + pixel_y = 4; + pixel_x = 3 }, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"E" = ( -/obj/structure/extinguisher_cabinet{ - name = "south bump"; - pixel_y = -30 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" }, -/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"F" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/titanium, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"G" = ( -/obj/item/resonator/upgraded, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"H" = ( -/obj/machinery/autolathe, -/obj/machinery/light{ - dir = 4 +"rr" = ( +/obj/machinery/economy/vending/hydronutrients, +/turf/simulated/floor/plasteel{ + icon_state = "whitecorner" }, -/turf/simulated/floor/mineral/titanium/purple, /area/shuttle/freegolem) -"I" = ( -/obj/structure/table/wood, -/obj/machinery/reagentgrinder, -/obj/item/book/manual/wiki/hydroponics, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"J" = ( -/obj/machinery/economy/vending/coffee/free, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"K" = ( -/obj/machinery/economy/vending/snack/free, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"L" = ( -/obj/machinery/light, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"M" = ( -/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) -"N" = ( -/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) -"O" = ( -/obj/structure/table/wood, -/obj/item/storage/firstaid/adv, -/obj/item/storage/firstaid/adv, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"P" = ( -/obj/effect/mapping_helpers/no_lava, -/turf/template_noop, -/area/template_noop) -"Q" = ( -/obj/structure/table/wood, -/obj/item/disk/design_disk/golem_shell, -/obj/item/areaeditor/golem, -/turf/simulated/floor/mineral/titanium/purple, -/area/shuttle/freegolem) -"R" = ( -/obj/machinery/light/small{ - dir = 1 +"rY" = ( +/obj/structure/table, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -6 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 5; + pixel_y = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" }, -/turf/simulated/floor/plating, /area/shuttle/freegolem) -"S" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, +"tz" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/shuttle/freegolem) -"T" = ( +"uD" = ( /obj/structure/ore_box, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitecorner" + }, /area/shuttle/freegolem) -"U" = ( +"uR" = ( +/obj/structure/sign/poster/official/random/directional/north, +/turf/simulated/floor/plasteel{ + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"uT" = ( +/obj/machinery/economy/vending/hydroseeds, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"vd" = ( +/obj/effect/turf_decal/delivery/blue/hollow, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"vM" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 6; + pixel_x = -2 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"wp" = ( /obj/structure/shuttle/engine/heater{ dir = 4 }, @@ -252,503 +272,718 @@ }, /turf/simulated/floor/plating/lavaland_air, /area/shuttle/freegolem) -"V" = ( -/obj/effect/mapping_helpers/no_lava, +"wN" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"xj" = ( +/obj/machinery/light/small, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/catwalk, +/area/shuttle/freegolem) +"xQ" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"yn" = ( +/obj/structure/extinguisher_cabinet{ + name = "east bump"; + pixel_x = 27 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"zn" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"zW" = ( +/obj/structure/table, +/obj/effect/spawner/random/plushies, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"Aw" = ( +/obj/structure/chair/comfy/purp{ + dir = 1 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/freegolem) +"AT" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"BU" = ( +/obj/effect/mob_spawn/human/alive/golem/adamantine{ + pixel_y = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" + }, +/area/shuttle/freegolem) +"DJ" = ( +/obj/machinery/mineral/ore_redemption/golem, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"Ea" = ( +/obj/structure/statue/gold/rd{ + name = "statue of the Liberator" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/mineral/plastitanium, +/area/shuttle/freegolem) +"EB" = ( +/obj/machinery/autolathe, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"EE" = ( /obj/effect/mapping_helpers/no_lava, /turf/template_noop, /area/template_noop) -"W" = ( -/obj/machinery/door/airlock/titanium, -/obj/structure/fans/tiny, -/turf/simulated/floor/mineral/titanium/purple, +"FQ" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"HE" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"Jg" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"JF" = ( +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"Mh" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"MD" = ( +/obj/machinery/door/airlock/external, +/obj/structure/fans/tiny, +/obj/effect/spawner/random/dirt/maybe, +/turf/simulated/floor/plating, +/area/shuttle/freegolem) +"Ob" = ( +/obj/machinery/door/airlock/titanium/glass, +/turf/simulated/floor/plasteel, +/area/shuttle/freegolem) +"OC" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"OL" = ( +/obj/machinery/economy/vending/coffee/free, +/turf/simulated/floor/plasteel{ + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"QD" = ( +/obj/machinery/mineral/equipment_vendor/golem, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"Rr" = ( +/obj/effect/mob_spawn/human/alive/golem/adamantine{ + pixel_y = 5 + }, +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" + }, +/area/shuttle/freegolem) +"Sv" = ( +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"Sz" = ( +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/catwalk, +/area/shuttle/freegolem) +"SQ" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"UB" = ( +/obj/effect/turf_decal/delivery/green/hollow, +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"WF" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating, +/area/shuttle/freegolem) +"Xj" = ( +/obj/structure/closet/freegolem, +/obj/effect/turf_decal/box/white/corners{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplefull" + }, +/area/shuttle/freegolem) +"Ya" = ( +/obj/effect/turf_decal/delivery/red/hollow, +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitehall" + }, +/area/shuttle/freegolem) +"YN" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitecorner" + }, +/area/shuttle/freegolem) +"YZ" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/delivery/red/hollow, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitecorner" + }, /area/shuttle/freegolem) -"X" = ( -/obj/machinery/computer/shuttle/golem_ship/recall, -/obj/effect/mapping_helpers/no_lava, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/ruin/powered/golem_ship) (1,1,1) = {" -a -a -a -P -V -P -P -P -b -v -v -b -P -P -P -V -P -a -a -a +cr +cr +cr +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +cr +cr +cr +cr +cr "} (2,1,1) = {" -a -a -a -P -V -P -P -P -b -w -C -b -P -P -P -V -P -a -a -a +cr +cr +EE +EE +EE +EE +EE +bq +WF +WF +bq +EE +EE +EE +EE +EE +cr +cr +cr +cr "} (3,1,1) = {" -a -a -a -P -P -b -b -W -b -x -D -b -W -b -b -P -P -a -a -a +cr +EE +EE +bq +WF +WF +bq +hL +rr +uT +hL +WF +WF +WF +bq +EE +EE +cr +cr +cr "} (4,1,1) = {" -P -P -P -P -P -b -m -p -s -p -p -s -p -J -b -P -P -P -P -P +cr +EE +EE +bq +Ea +dm +bq +bH +fC +wN +AT +zW +rY +vM +bq +EE +EE +EE +EE +cr "} (5,1,1) = {" -P -P -P -P -P -b -n -p -p -p -p -p -p -K -b -P -P -P -P -P +EE +EE +EE +bq +fQ +Aw +bq +OL +oD +oD +oD +oD +tz +jD +hL +bq +bq +EE +EE +cr "} (6,1,1) = {" -P -P -b -b -b -b -o -p -p -p -p -p -p -L -b -b -b -b -P -P +EE +EE +EE +bq +bF +mL +bq +iW +oD +oD +oD +oD +oD +wN +ca +UB +bq +EE +EE +EE "} (7,1,1) = {" -P -P -b -d -f -l -p -p -p -p -p -p -p -p -l -f -T -b -P -P +EE +bq +bq +bq +bq +Ob +bq +uR +oD +oD +oD +oD +oD +oD +oD +vd +bq +EE +EE +EE "} (8,1,1) = {" -P -P -b -d -f -l -p -p -p -p -p -p -p -p -l -f -T -b -P -P +EE +bq +xQ +ca +AT +Jg +Ob +YN +zn +hg +hg +hg +hg +Mh +oD +Ya +bq +EE +EE +EE "} (9,1,1) = {" -P -P -b -d -j -b -o -p -p -p -p -p -p -L -b -R -T -b -P -P +EE +bq +HE +oD +oD +FQ +hL +bq +bq +Ob +bq +bq +hL +yn +hg +YZ +bq +EE +EE +EE "} (10,1,1) = {" -P -P -b -d -f -b -p -p -t -y -y -t -p -p -b -f -T -b -P -P +EE +bq +HE +oD +oD +wN +iq +DJ +JF +AT +qT +EB +hL +bq +bq +hL +bq +bq +hL +EE "} (11,1,1) = {" -P -P -b -d -f -b -p -p -t -y -y -t -p -p -b -f -T -b -P -P +EE +bq +uR +oD +oD +oD +oD +oD +oD +oD +oD +wN +ca +AT +Jg +bQ +pa +Sz +MD +EE "} (12,1,1) = {" -P -P -b -d -j -b -o -p -p -p -p -p -p -L -b -R -T -b -P -P +EE +bq +HE +oD +oD +oD +oD +oD +oD +oD +oD +oD +oD +oD +hu +bQ +pL +Sz +MD +EE "} (13,1,1) = {" -P -P -b -d -f -l -p -p -p -p -p -p -p -p -l -f -T -b -P -P +EE +bq +HE +oD +oD +oD +oD +oD +oD +oD +oD +oD +oD +oD +FQ +hL +bq +bq +hL +EE "} (14,1,1) = {" -P -P -b -d -f -l -p -p -p -p -p -p -p -p -l -f -T -b -P -P +EE +bq +YN +zn +Mh +oD +oD +oD +oD +oD +oD +oD +oD +oD +wN +QD +bq +wp +wp +EE "} (15,1,1) = {" -P -P -b -e -f -b -p -p -p -p -p -p -p -M -b -f -e -b -V -V +EE +hL +bq +hL +HE +oD +oD +oD +oD +oD +oD +oD +oD +oD +oD +hu +bq +cg +cg +EE "} (16,1,1) = {" -P -P -c -f -j -b -o -p -p -p -p -p -p -N -b -R -f -c -V -V +EE +wp +wp +bq +Sv +hg +hg +hg +zn +hg +hg +zn +Mh +oD +oD +hu +bq +EE +EE +EE "} (17,1,1) = {" -P -P -c -f -f -b -p -p -p -p -p -G -p -O -b -f -f -c -V -V +EE +cg +cg +bq +Rr +BU +BU +jr +hL +bQ +bQ +hL +HE +oD +oD +FQ +bq +EE +EE +cr "} (18,1,1) = {" -P -P -b -g -k -b -q -p -u -p -p -H -I -Q -b -S -S -b -V -V +EE +EE +EE +bq +Xj +am +am +cQ +bq +pL +pL +bq +uD +SQ +SQ +OC +bq +EE +cr +cr "} (19,1,1) = {" -P -P -b -U -U -b -U -U -b -z -E -b -U -U -b -U -U -b -P -P +cr +EE +EE +bq +bq +hL +wp +wp +bq +pt +xj +bq +wp +wp +hL +bq +bq +EE +cr +cr "} (20,1,1) = {" -P -P -b -i -i -b -i -i -b -B -F -b -i -i -b -i -i -b -P -P +cr +cr +EE +EE +EE +bq +cg +cg +hL +nX +MD +hL +cg +cg +bq +EE +EE +cr +cr +cr "} (21,1,1) = {" -P -P -P -P -P -P -P -P -A -A -A -X -P -P -P -P -P -P -P -P +cr +cr +cr +EE +EE +EE +EE +EE +jY +jY +jY +df +EE +EE +EE +EE +cr +cr +cr +cr "} (22,1,1) = {" -P -P -P -P -P -P -P -P -P -P -P -P -P -P -P -P -P -P -P -P +cr +cr +cr +cr +cr +EE +EE +EE +EE +EE +EE +EE +EE +EE +EE +cr +cr +cr +cr +cr "} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm b/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm index 69cccd6b10c..c621f78b207 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm @@ -152,8 +152,8 @@ a a a a -a -a +H +x a "} (5,1,1) = {" @@ -185,9 +185,9 @@ a a a a -a -a -a +H +x +x a "} (6,1,1) = {" @@ -220,8 +220,8 @@ a a a a -a -a +x +H a "} (7,1,1) = {" @@ -253,9 +253,9 @@ a a a a -a -a -a +x +x +x a "} (8,1,1) = {" @@ -287,9 +287,9 @@ a a a a -a -a -a +x +x +x a "} (9,1,1) = {" @@ -321,8 +321,8 @@ a a a a -a -a +x +x a a "} @@ -920,11 +920,11 @@ a a a a -H -x -x -x -x +a +a +a +a +a a a a @@ -953,12 +953,12 @@ a a a a -H -x -x -x -x -x +a +a +a +a +a +a a a a @@ -988,10 +988,10 @@ a a a a -x -H -x -x +a +a +a +a a a a diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm index 73cc3f1168e..7d646927949 100644 --- a/code/__DEFINES/misc_defines.dm +++ b/code/__DEFINES/misc_defines.dm @@ -747,6 +747,12 @@ do { \ //! The number of seconds between the start of the UNIX and BYOND epochs. #define BYOND_EPOCH_UNIX 946702800 +// Use this define to register something as a purchasable! +// * n — The proper name of the purchasable +// * o — The object type path of the purchasable to spawn +// * p — The price of the purchasable in mining points +#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p) + #define BRIDGE_SPAWN_SUCCESS 0 #define BRIDGE_SPAWN_TOO_WIDE 1 #define BRIDGE_SPAWN_TOO_NARROW 2 diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 326f7f2b839..c6547d77d74 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -69,23 +69,6 @@ if(..()) qdel(src) -//free golem blueprints, like permit but can claim as much as needed - -/obj/item/areaeditor/golem - name = "Golem Land Claim" - desc = "Used to define new areas in space." - fluffnotice = "Praise the Liberator!" - -/obj/item/areaeditor/golem/attack_self__legacy__attackchain(mob/user) - . = ..() - var/area/our_area = get_area(src) - if(get_area_type() == AREA_STATION) - . += "

According to [src], you are now in \"[sanitize(our_area.name)]\".

" - var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) - popup.set_content(.) - popup.open() - onclose(usr, "blueprints") - //Station blueprints!!! /obj/item/areaeditor/blueprints name = "station blueprints" diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index ba79745ea69..b1f3e9a3941 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -618,17 +618,6 @@ new /obj/item/reagent_containers/cooking/bowl(src) new /obj/item/reagent_containers/cooking/bowl(src) -//crates of gear in the free golem ship -/obj/structure/closet/crate/golemgear/populate_contents() - new /obj/item/storage/backpack/industrial(src) - new /obj/item/shovel(src) - new /obj/item/pickaxe(src) - new /obj/item/t_scanner/adv_mining_scanner/lesser(src) - new /obj/item/storage/bag/ore(src) - new /obj/item/clothing/glasses/meson(src) - new /obj/item/card/id/golem(src) - new /obj/item/flashlight/lantern(src) - #define RECURSION_PANIC_AMOUNT 10 /obj/structure/closet/crate/surplus diff --git a/code/modules/awaymissions/mission_code/ruins/freegolems.dm b/code/modules/awaymissions/mission_code/ruins/freegolems.dm new file mode 100644 index 00000000000..7d4e92a25e2 --- /dev/null +++ b/code/modules/awaymissions/mission_code/ruins/freegolems.dm @@ -0,0 +1,135 @@ +/obj/item/storage/firstaid/freegolem + name = "golem emergency treatment kit" + desc = "A box of essential medical supplies, formulated for golems' hard skin." + icon_state = "medbriefcase" + +/obj/item/storage/firstaid/freegolem/populate_contents() + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/patch/styptic/small(src) + new /obj/item/reagent_containers/patch/styptic/small(src) + new /obj/item/reagent_containers/patch/silver_sulf/small(src) + new /obj/item/reagent_containers/patch/silver_sulf/small(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) + +/obj/structure/closet/freegolem + name = "free golem equipment locker" + icon_state = "freegolem" + +/obj/structure/closet/freegolem/populate_contents() + new /obj/item/storage/backpack/industrial(src) + new /obj/item/shovel(src) + new /obj/item/pickaxe(src) + new /obj/item/t_scanner/adv_mining_scanner/lesser(src) + new /obj/item/storage/bag/ore(src) + new /obj/item/clothing/glasses/meson(src) + new /obj/item/card/id/golem(src) + new /obj/item/flashlight/lantern(src) + new /obj/item/resonator/upgraded(src) + new /obj/item/storage/firstaid/freegolem(src) + +/** + * # Ore Redemption Machine (Golem) + * + * Golem variant of the ORM. + */ +/obj/machinery/mineral/ore_redemption/golem + req_access = list(ACCESS_FREE_GOLEMS) + req_access_claim = ACCESS_FREE_GOLEMS + +/obj/machinery/mineral/ore_redemption/golem/Initialize(mapload) + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/ore_redemption/golem(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/micro_laser(null) + component_parts += new /obj/item/assembly/igniter(null) + component_parts += new /obj/item/stack/sheet/glass(null) + RefreshParts() + +/obj/machinery/mineral/ore_redemption/golem/RefreshParts() + var/P = 0.65 + var/S = 0.65 + for(var/obj/item/stock_parts/micro_laser/M in component_parts) + P += 0.35 * M.rating + for(var/obj/item/stock_parts/matter_bin/M in component_parts) + S += 0.35 * M.rating + // Manipulators do nothing + // Update our values + point_upgrade = P + sheet_per_ore = S + SStgui.update_uis(src) + +/**********************Mining Equiment Vendor (Golem)**************************/ + +/obj/machinery/mineral/equipment_vendor/golem + name = "golem ship equipment vendor" + +/obj/machinery/mineral/equipment_vendor/golem/Initialize(mapload) + . = ..() + component_parts = list() + component_parts += new /obj/item/circuitboard/mining_equipment_vendor/golem(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stock_parts/matter_bin(null) + component_parts += new /obj/item/stack/sheet/glass(null) + RefreshParts() + + desc += "\nIt seems a few selections have been added." + prize_list["Extra"] += list( + EQUIPMENT("Free Golem ID", /obj/item/card/id/golem, 250), + EQUIPMENT("Science Backpack", /obj/item/storage/backpack/science, 250), + EQUIPMENT("Full Toolbelt", /obj/item/storage/belt/utility/full/multitool, 250), + EQUIPMENT("Monkey Cube", /obj/item/food/monkeycube, 250), + EQUIPMENT("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500), + EQUIPMENT("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), + EQUIPMENT("KA Trigger Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1000), + EQUIPMENT("Shuttle Console Board", /obj/item/circuitboard/shuttle/golem_ship, 2000), + EQUIPMENT("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000), + EQUIPMENT("The Liberator's Fabricator", /obj/item/storage/box/smithboards, 1000), + ) + +/// Free golem blueprints, like permit but can claim as much as needed. +/obj/item/areaeditor/golem + name = "Golem Land Claim" + desc = "Used to define new areas in space." + fluffnotice = "Praise the Liberator!" + +/obj/item/areaeditor/golem/attack_self__legacy__attackchain(mob/user) + . = ..() + var/area/our_area = get_area(src) + if(get_area_type() == AREA_STATION) + . += "

According to [src], you are now in \"[sanitize(our_area.name)]\".

" + var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) + popup.set_content(.) + popup.open() + onclose(usr, "blueprints") + +/obj/item/disk/design_disk/golem_shell + name = "golem creation disk" + desc = "A gift from the Liberator." + icon_state = "datadisk1" + +/obj/item/disk/design_disk/golem_shell/Initialize(mapload) + . = ..() + var/datum/design/golem_shell/G = new + blueprint = G + +/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_space;freegolem_ussp" + +/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 diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index 60c147041b2..5a6853f3d91 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -33,6 +33,7 @@ name = "upgraded resonator" desc = "An upgraded version of the resonator that can produce more fields at once, as well as having no damage penalty for bursting a resonance field early. It also allows you to set 'Resonance matrixes', that detonate after someone (or something) walks over it." icon_state = "resonator_u" + item_state = "resonator_u" origin_tech = "materials=4;powerstorage=3;engineering=3;magnets=3" fieldlimit = 6 quick_burst_mod = 1 diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index e8c9168625d..4a54d3e954c 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -75,39 +75,6 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/** - * # Ore Redemption Machine (Golem) - * - * Golem variant of the ORM. - */ -/obj/machinery/mineral/ore_redemption/golem - req_access = list(ACCESS_FREE_GOLEMS) - req_access_claim = ACCESS_FREE_GOLEMS - -/obj/machinery/mineral/ore_redemption/golem/Initialize(mapload) - . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/ore_redemption/golem(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/manipulator(null) - component_parts += new /obj/item/stock_parts/micro_laser(null) - component_parts += new /obj/item/assembly/igniter(null) - component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() - -/obj/machinery/mineral/ore_redemption/golem/RefreshParts() - var/P = 0.65 - var/S = 0.65 - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - P += 0.35 * M.rating - for(var/obj/item/stock_parts/matter_bin/M in component_parts) - S += 0.35 * M.rating - // Manipulators do nothing - // Update our values - point_upgrade = P - sheet_per_ore = S - SStgui.update_uis(src) - /** * # Ore Redemption Machine (Labor Camp) * diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 4682d75258d..c457214999c 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -1,9 +1,3 @@ -// Use this define to register something as a purchasable! -// * n — The proper name of the purchasable -// * o — The object type path of the purchasable to spawn -// * p — The price of the purchasable in mining points -#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p) - /**********************Mining Equipment Vendor**************************/ /obj/machinery/mineral/equipment_vendor @@ -308,35 +302,6 @@ return ..() -/**********************Mining Equiment Vendor (Golem)**************************/ - -/obj/machinery/mineral/equipment_vendor/golem - name = "golem ship equipment vendor" - -/obj/machinery/mineral/equipment_vendor/golem/Initialize(mapload) - . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/mining_equipment_vendor/golem(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() - - desc += "\nIt seems a few selections have been added." - prize_list["Extra"] += list( - EQUIPMENT("Extra ID", /obj/item/card/id/golem, 250), - EQUIPMENT("Science Backpack", /obj/item/storage/backpack/science, 250), - EQUIPMENT("Full Toolbelt", /obj/item/storage/belt/utility/full/multitool, 250), - EQUIPMENT("Monkey Cube", /obj/item/food/monkeycube, 250), - EQUIPMENT("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500), - EQUIPMENT("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), - EQUIPMENT("KA Trigger Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1000), - EQUIPMENT("Shuttle Console Board", /obj/item/circuitboard/shuttle/golem_ship, 2000), - EQUIPMENT("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000), - EQUIPMENT("The Liberator's Fabricator", /obj/item/storage/box/smithboards, 1000), - ) - /**********************Mining Equiment Vendor (Gulag)**************************/ /obj/machinery/mineral/equipment_vendor/labor diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index f577e787379..f5f9b94d74c 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -449,16 +449,6 @@ datum/tech/robotics desc = default_desc blueprint = null -/obj/item/disk/design_disk/golem_shell - name = "golem creation disk" - desc = "A gift from the Liberator." - icon_state = "datadisk1" - -/obj/item/disk/design_disk/golem_shell/Initialize(mapload) - . = ..() - var/datum/design/golem_shell/G = new - blueprint = G - /datum/research/autolathe/syndicate/New() // Used by syndi autolathe in syndie space base ruin. Removes methods of contacting main station. . = ..() diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index f19fe80adb6..fabae27af6e 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -1122,25 +1122,6 @@ 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_space;freegolem_ussp" - -/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/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 494fd2a0a60..2c2f7b7252d 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 807ba98992c..6f3cb0bb2ad 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index e03b39ab0ae..776e07b6173 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/paradise.dme b/paradise.dme index 5eced547ac4..31d8b28e142 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1778,6 +1778,7 @@ #include "code\modules\awaymissions\mission_code\ruins\abandoned_engi_sat.dm" #include "code\modules\awaymissions\mission_code\ruins\deepstorage.dm" #include "code\modules\awaymissions\mission_code\ruins\derelict5.dm" +#include "code\modules\awaymissions\mission_code\ruins\freegolems.dm" #include "code\modules\awaymissions\mission_code\ruins\gps_ruin.dm" #include "code\modules\awaymissions\mission_code\ruins\moonoutpost19.dm" #include "code\modules\awaymissions\mission_code\ruins\nian_freighter.dm"