diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm index 67d686bd4faa..276e17b07401 100644 --- a/_maps/shuttles/independent/independent_beluga.dmm +++ b/_maps/shuttles/independent/independent_beluga.dmm @@ -257,11 +257,6 @@ pixel_y = -23; dir = 1 }, -/obj/machinery/mineral/ore_redemption{ - dir = 8; - input_dir = 8; - output_dir = 8 - }, /turf/open/floor/plasteel/tech, /area/ship/cargo) "cW" = ( diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm index d80bb829bfbb..e71972188832 100644 --- a/_maps/shuttles/independent/independent_box.dmm +++ b/_maps/shuttles/independent/independent_box.dmm @@ -1273,7 +1273,6 @@ /obj/structure/rack, /obj/effect/turf_decal/industrial/outline/yellow, /obj/item/storage/box/lights/bulbs, -/obj/item/circuitboard/machine/ore_redemption, /obj/item/pickaxe/emergency, /obj/item/storage/box/lights/mixed, /obj/item/stack/sheet/mineral/plasma/twenty, diff --git a/_maps/shuttles/independent/independent_boyardee.dmm b/_maps/shuttles/independent/independent_boyardee.dmm index aa0360e74c32..632cd0f9ee2f 100644 --- a/_maps/shuttles/independent/independent_boyardee.dmm +++ b/_maps/shuttles/independent/independent_boyardee.dmm @@ -841,7 +841,6 @@ /turf/open/floor/plating, /area/ship/maintenance) "qq" = ( -/obj/machinery/mineral/ore_redemption, /obj/effect/turf_decal/box, /turf/open/floor/plasteel/dark, /area/ship/cargo) diff --git a/_maps/shuttles/independent/independent_caravan.dmm b/_maps/shuttles/independent/independent_caravan.dmm index 4f4554641a9a..6eae242eef8c 100644 --- a/_maps/shuttles/independent/independent_caravan.dmm +++ b/_maps/shuttles/independent/independent_caravan.dmm @@ -1111,11 +1111,6 @@ /turf/open/floor/plating, /area/ship/engineering/atmospherics) "uw" = ( -/obj/machinery/mineral/ore_redemption{ - dir = 4; - input_dir = 8; - output_dir = 4 - }, /obj/structure/cable{ icon_state = "2-8" }, diff --git a/_maps/shuttles/independent/independent_meta.dmm b/_maps/shuttles/independent/independent_meta.dmm index 8adc2aeb86a5..686b9b1532a5 100644 --- a/_maps/shuttles/independent/independent_meta.dmm +++ b/_maps/shuttles/independent/independent_meta.dmm @@ -2076,11 +2076,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/dark, /area/ship/cargo) -"tZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/mineral/ore_redemption, -/turf/open/floor/plasteel/dark, -/area/ship/cargo) "uk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/washing_machine, @@ -3176,7 +3171,7 @@ Ov AT HH FV -tZ +ap ap ei bf diff --git a/_maps/shuttles/independent/independent_nemo.dmm b/_maps/shuttles/independent/independent_nemo.dmm index f693cbcbdc27..d63546981342 100644 --- a/_maps/shuttles/independent/independent_nemo.dmm +++ b/_maps/shuttles/independent/independent_nemo.dmm @@ -1534,11 +1534,6 @@ /turf/open/floor/plasteel/dark, /area/ship/hallway/central) "vH" = ( -/obj/machinery/mineral/ore_redemption{ - dir = 8; - input_dir = 4; - output_dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 8 }, diff --git a/_maps/shuttles/independent/independent_pillbottle.dmm b/_maps/shuttles/independent/independent_pillbottle.dmm index 92529ea329c6..632f426b8e1d 100644 --- a/_maps/shuttles/independent/independent_pillbottle.dmm +++ b/_maps/shuttles/independent/independent_pillbottle.dmm @@ -398,11 +398,6 @@ icon_state = "4-9" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/mineral/ore_redemption{ - dir = 4; - input_dir = 4; - output_dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/window/reinforced{ dir = 8 diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm index 78836ac3bde9..ec202c52491c 100644 --- a/_maps/shuttles/independent/independent_schmiedeberg.dmm +++ b/_maps/shuttles/independent/independent_schmiedeberg.dmm @@ -280,7 +280,6 @@ }, /area/ship/engineering) "de" = ( -/obj/machinery/mineral/ore_redemption, /turf/open/floor/plating, /area/ship/security) "dr" = ( diff --git a/_maps/shuttles/independent/independent_shepherd.dmm b/_maps/shuttles/independent/independent_shepherd.dmm index f9c1fd853ecd..77aef62360f6 100644 --- a/_maps/shuttles/independent/independent_shepherd.dmm +++ b/_maps/shuttles/independent/independent_shepherd.dmm @@ -3124,10 +3124,6 @@ }, /turf/open/floor/ship/dirt/dark, /area/ship/crew/hydroponics) -"Cx" = ( -/obj/machinery/mineral/ore_redemption, -/turf/open/floor/ship/dirt/dark, -/area/ship/crew/canteen) "CL" = ( /obj/effect/turf_decal/corner/opaque/bottlegreen/diagonal, /obj/machinery/power/apc/auto_name/directional/west, @@ -7172,7 +7168,7 @@ xj xj ZG Te -Cx +Tf Tf fP Tf diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm index 062e8a8f61f3..8118d512c366 100644 --- a/_maps/shuttles/independent/independent_shetland.dmm +++ b/_maps/shuttles/independent/independent_shetland.dmm @@ -4910,7 +4910,6 @@ /turf/open/floor/plasteel/stairs, /area/ship/hallway/fore) "VW" = ( -/obj/machinery/mineral/ore_redemption, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "VX" = ( diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index bf86ed599f7f..522da7a34826 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -3535,10 +3535,6 @@ /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "NX" = ( -/obj/machinery/mineral/ore_redemption{ - dir = 1; - output_dir = 1 - }, /obj/effect/turf_decal/borderfloorblack, /turf/open/floor/plasteel/patterned, /area/ship/cargo) diff --git a/_maps/shuttles/inteq/inteq_hound.dmm b/_maps/shuttles/inteq/inteq_hound.dmm index 2fc73b689d88..c8e2d872fe60 100644 --- a/_maps/shuttles/inteq/inteq_hound.dmm +++ b/_maps/shuttles/inteq/inteq_hound.dmm @@ -1572,11 +1572,6 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/mineral/ore_redemption{ - dir = 4; - input_dir = 4; - output_dir = null - }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Iw" = ( diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm index 877e24727dfd..517a80cbee7f 100644 --- a/_maps/shuttles/minutemen/minutemen_asclepius.dmm +++ b/_maps/shuttles/minutemen/minutemen_asclepius.dmm @@ -1385,9 +1385,6 @@ /obj/effect/turf_decal/industrial/warning{ dir = 8 }, -/obj/machinery/mineral/ore_redemption{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/west, /turf/open/floor/plasteel/dark{ diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm index d14a368faf55..57fc023b541d 100644 --- a/_maps/shuttles/minutemen/minutemen_cepheus.dmm +++ b/_maps/shuttles/minutemen/minutemen_cepheus.dmm @@ -4150,7 +4150,6 @@ /obj/item/clothing/glasses/meson, /obj/item/pickaxe, /obj/item/pickaxe, -/obj/item/circuitboard/machine/ore_redemption, /obj/item/gps/mining, /turf/open/floor/plasteel/dark, /area/ship/cargo) diff --git a/_maps/shuttles/minutemen/minutemen_corvus.dmm b/_maps/shuttles/minutemen/minutemen_corvus.dmm index 36e4581f8dcd..e7d053668086 100644 --- a/_maps/shuttles/minutemen/minutemen_corvus.dmm +++ b/_maps/shuttles/minutemen/minutemen_corvus.dmm @@ -227,10 +227,6 @@ /area/ship/crew) "eZ" = ( /obj/effect/turf_decal/siding/thinplating/dark, -/obj/machinery/mineral/ore_redemption{ - dir = 1; - output_dir = 1 - }, /obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/patterned, /area/ship/cargo) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm index 58d4fdb918a3..5178994ae0ea 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -962,9 +962,6 @@ /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) "iX" = ( -/obj/machinery/mineral/ore_redemption{ - dir = 8 - }, /obj/effect/turf_decal/siding/yellow{ dir = 10 }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm index e763b1fd0765..59e85336361c 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm @@ -2129,7 +2129,6 @@ /area/ship/hallway/central) "qy" = ( /obj/machinery/light/directional/west, -/obj/machinery/mineral/ore_redemption, /turf/open/floor/plasteel, /area/ship/cargo) "qF" = ( diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index dd29db498f95..f2cff183d98b 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -3454,7 +3454,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/ship/hallway/central) "GL" = ( -/obj/machinery/mineral/ore_redemption, /obj/effect/turf_decal/corner_techfloor_grid/diagonal, /turf/open/floor/plasteel/tech, /area/ship/cargo) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 3a20cb1f5c26..124e29bf7eee 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -1599,11 +1599,6 @@ /turf/open/floor/plasteel/tech/techmaint, /area/ship/cargo) "Pk" = ( -/obj/machinery/mineral/ore_redemption{ - dir = 8; - input_dir = 8; - output_dir = null - }, /obj/effect/turf_decal/box, /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel/tech/techmaint, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 2e797a41fb9d..f3355aec3c5c 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -763,10 +763,6 @@ /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 10 }, -/obj/machinery/mineral/ore_redemption{ - dir = 1; - output_dir = 1 - }, /turf/open/floor/pod, /area/ship/cargo) "gJ" = ( diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index dc3d2deff0ba..cd509d0d1cb0 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -111,7 +111,7 @@ STR.allow_quick_empty = TRUE STR.set_holdable(list(/obj/item/stack/ore)) STR.max_w_class = WEIGHT_CLASS_HUGE - STR.max_combined_stack_amount = 50 + STR.max_combined_stack_amount = 100 /obj/item/storage/bag/ore/equipped(mob/user) . = ..() diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm index 3d90a25a1013..0d407f9a662d 100644 --- a/code/game/objects/structures/salvaging.dm +++ b/code/game/objects/structures/salvaging.dm @@ -368,6 +368,7 @@ /obj/item/stack/ore/salvage name = "salvage" icon = 'icons/obj/salvage_structure.dmi' + item_flags = NONE /obj/item/stack/ore/salvage/examine(mob/user) . = ..() diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index ec971ed84bed..7ad6e717a931 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -14,6 +14,7 @@ item_state = "ore" full_w_class = WEIGHT_CLASS_BULKY singular_name = "ore chunk" + item_flags = NO_MAT_REDEMPTION var/points = 0 //How many points this ore gets you from the ore redemption machine var/refined_type = null //What this ore defaults to being refined into var/mine_experience = 5 //How much experience do you get for mining this ore? @@ -27,12 +28,12 @@ var/difference = min(ORESTACK_OVERLAYS_MAX, amount) - (LAZYLEN(stack_overlays)+1) if(difference == 0) return - else if(difference < 0 && LAZYLEN(stack_overlays)) //amount < stack_overlays, remove excess. + else if(difference < 0 && LAZYLEN(stack_overlays)) //amount < stack_overlays, remove excess. if (LAZYLEN(stack_overlays)-difference <= 0) stack_overlays = null else stack_overlays.len += difference - else if(difference > 0) //amount > stack_overlays, add some. + else if(difference > 0) //amount > stack_overlays, add some. for(var/i in 1 to difference) var/mutable_appearance/newore = mutable_appearance(icon, icon_state) newore.pixel_x = rand(-8,8) diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 0ed2e97f39b9..cc3ee16d9f53 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -183,7 +183,6 @@ build_path = /obj/item/circuitboard/machine/reagentgrinder category = list ("Medical Machinery") - /datum/design/board/dnascanner name = "Machine Design (DNA Scanner)" desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." @@ -264,7 +263,6 @@ build_path = /obj/item/circuitboard/machine/rdserver category = list("Research Machinery", "initial", "Equipment") - /datum/design/board/mechfab name = "Machine Design (Exosuit Fabricator Board)" desc = "The circuit board for an Exosuit Fabricator." @@ -335,7 +333,6 @@ build_path = /obj/item/circuitboard/machine/microwave category = list ("Misc. Machinery") - /datum/design/board/gibber name = "Machine Design (Gibber Board)" desc = "The circuit board for a gibber." @@ -351,7 +348,6 @@ build_path = /obj/item/circuitboard/machine/smartfridge category = list ("Misc. Machinery") - /datum/design/board/monkey_recycler name = "Machine Design (Monkey Recycler Board)" desc = "The circuit board for a monkey recycler." @@ -399,7 +395,6 @@ build_path = /obj/item/circuitboard/machine/recycler category = list ("Misc. Machinery") - /datum/design/board/scanner_gate name = "Machine Design (Scanner Gate)" desc = "The circuit board for a scanner gate." @@ -407,7 +402,6 @@ build_path = /obj/item/circuitboard/machine/scanner_gate category = list ("Misc. Machinery") - /datum/design/board/holopad name = "Machine Design (AI Holopad Board)" desc = "The circuit board for a holopad." @@ -415,7 +409,6 @@ build_path = /obj/item/circuitboard/machine/holopad category = list ("Misc. Machinery") - /datum/design/board/autolathe name = "Machine Design (Autolathe Board)" desc = "The circuit board for an autolathe." @@ -423,7 +416,6 @@ build_path = /obj/item/circuitboard/machine/autolathe category = list ("Misc. Machinery") - /datum/design/board/recharger name = "Machine Design (Weapon Recharger Board)" desc = "The circuit board for a Weapon Recharger." @@ -432,7 +424,6 @@ build_path = /obj/item/circuitboard/machine/recharger category = list("Misc. Machinery") - /datum/design/board/vendor name = "Machine Design (Vendor Board)" desc = "The circuit board for a Vendor." @@ -440,14 +431,6 @@ build_path = /obj/item/circuitboard/machine/vendor category = list ("Misc. Machinery") - -/datum/design/board/ore_redemption - name = "Machine Design (Ore Redemption Board)" - desc = "The circuit board for an Ore Redemption machine." - id = "ore_redemption" - build_path = /obj/item/circuitboard/machine/ore_redemption - category = list ("Misc. Machinery") - /datum/design/board/bluespace_miner name = "Machine Design (Bluespace Miner)" desc = "The circuit board for a Bluespace Miner." @@ -527,7 +510,6 @@ build_path = /obj/item/circuitboard/machine/vending/donksofttoyvendor category = list ("Misc. Machinery") - /datum/design/board/cell_charger name = "Machine Design (Cell Charger Board)" desc = "The circuit board for a cell charger." @@ -535,7 +517,6 @@ build_path = /obj/item/circuitboard/machine/cell_charger category = list ("Misc. Machinery") - /datum/design/board/dish_drive name = "Machine Design (Dish Drive)" desc = "The circuit board for a dish drive." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 79009ed1fdf6..1c6e4154ad15 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -559,7 +559,7 @@ display_name = "Mining Technology" description = "Better than Efficiency V." prereq_ids = list("engineering", "basic_plasma") - design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "ore_redemption", "mining_equipment_vendor", "cargoexpress", "plasmacutter", "mecha_kineticgun", "weatherradio")//e a r l y g a m e) + design_ids = list("drill", "superresonator", "triggermod", "damagemod", "cooldownmod", "rangemod", "mining_equipment_vendor", "cargoexpress", "plasmacutter", "mecha_kineticgun", "weatherradio")//e a r l y g a m e) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000