Revert "Golem ship remap and equipment tweaking. (#29294)"

This reverts commit 1ace49e.

Author: Burzah

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm

@@ -152,8 +152,8 @@ a
 a
 a
 a
-H
-x
+a
+a
 a
 "}
 (5,1,1) = {"
@@ -185,9 +185,9 @@ a
 a
 a
 a
-H
-x
-x
+a
+a
+a
 a
 "}
 (6,1,1) = {"
@@ -220,8 +220,8 @@ a
 a
 a
 a
-x
-H
+a
+a
 a
 "}
 (7,1,1) = {"
@@ -253,9 +253,9 @@ a
 a
 a
 a
-x
-x
-x
+a
+a
+a
 a
 "}
 (8,1,1) = {"
@@ -287,9 +287,9 @@ a
 a
 a
 a
-x
-x
-x
+a
+a
+a
 a
 "}
 (9,1,1) = {"
@@ -321,8 +321,8 @@ a
 a
 a
 a
-x
-x
+a
+a
 a
 a
 "}
@@ -920,11 +920,11 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
+H
+x
+x
+x
+x
 a
 a
 a
@@ -953,12 +953,12 @@ a
 a
 a
 a
-a
-a
-a
-a
-a
-a
+H
+x
+x
+x
+x
+x
 a
 a
 a
@@ -988,10 +988,10 @@ a
 a
 a
 a
-a
-a
-a
-a
+x
+H
+x
+x
 a
 a
 a

_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm

@@ -747,12 +747,6 @@ 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

code/__DEFINES/misc_defines.dm

@@ -69,6 +69,23 @@
 	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)
+		. += "<p>According to [src], you are now in <b>\"[sanitize(our_area.name)]\"</b>.</p>"
+	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"

code/game/objects/items/blueprints.dm

@@ -618,6 +618,17 @@
 	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

code/game/objects/structures/crates_lockers/crates.dm

@@ -33,7 +33,6 @@
 	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

code/modules/awaymissions/mission_code/ruins/freegolems.dm

@@ -75,6 +75,39 @@
 	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)
   *