diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index a855d56a1b5..eb93b769d59 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -792,7 +792,7 @@ name = "Free Golem ID" desc = "A card used to claim mining points and buy gear. Use it to mark it as yours." icon_state = "research" - access = list(ACCESS_FREE_GOLEMS, ACCESS_ROBOTICS, ACCESS_CLOWN, ACCESS_MIME, ACCESS_XENOBIOLOGY) //access to robots/mechs + access = list(ACCESS_FREE_GOLEMS, ACCESS_ROBOTICS, ACCESS_CLOWN, ACCESS_MIME, ACCESS_XENOBIOLOGY, ACCESS_SMITH) //access to robots/mechs can_id_flash = FALSE //So you do not flash it the first time you use it. var/registered = FALSE diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 5df6836396c..dfe591ec1c2 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1219,6 +1219,21 @@ /obj/item/storage/box/stockparts display_contents_with_number = TRUE +/obj/item/storage/box/smithboards + name = "the Liberator's fabricator" + desc = "A box containing a gift for golems with the will to create." + icon_state = "circuit_box" + +/obj/item/storage/box/smithboards/populate_contents() + new /obj/item/circuitboard/magma_crucible(src) + new /obj/item/circuitboard/casting_basin(src) + new /obj/item/circuitboard/casting_basin(src) + new /obj/item/circuitboard/power_hammer(src) + new /obj/item/circuitboard/lava_furnace(src) + new /obj/item/circuitboard/kinetic_assembler(src) + new /obj/item/vending_refill/smith(src) + new /obj/item/circuitboard/vendor(src) + /// for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible /obj/item/storage/box/stockparts/basic name = "box of stock parts" diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 1d201c89fa9..e8c9168625d 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -95,6 +95,19 @@ 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 1998a12f84b..4682d75258d 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -334,6 +334,7 @@ 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)**************************/