Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further mining changes #2488

Closed
wants to merge 12 commits into from
Closed

Further mining changes #2488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a2e1a31
Edits machine_designs.dm
thgvr Nov 15, 2023
05af36c
Edits all_nodes.dm
thgvr Nov 15, 2023
658f630
Edits several files
thgvr Nov 15, 2023
8a23a8b
Edits autolathe.dm
thgvr Nov 15, 2023
b94bcfb
whatever
thgvr Nov 15, 2023
1669ab8
Removes ORM from a bunch of maps.
thgvr Nov 15, 2023
5547210
TEMP: FIX LATER
thgvr Nov 15, 2023
8606ab2
Merge branch 'master'
thgvr Nov 22, 2023
8313bb4
Change is in another PR
thgvr Nov 22, 2023
56fac69
Uncomments asteroid outpost
thgvr Nov 25, 2023
bc4ac53
Buff mining bag a bit
thgvr Nov 25, 2023
0971e68
Merge branch 'master'
thgvr Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions _maps/shuttles/independent/independent_beluga.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_box.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_boyardee.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions _maps/shuttles/independent/independent_caravan.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
7 changes: 1 addition & 6 deletions _maps/shuttles/independent/independent_meta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -3176,7 +3171,7 @@ Ov
AT
HH
FV
tZ
ap
ap
ei
bf
Expand Down
5 changes: 0 additions & 5 deletions _maps/shuttles/independent/independent_nemo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
5 changes: 0 additions & 5 deletions _maps/shuttles/independent/independent_pillbottle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_schmiedeberg.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@
},
/area/ship/engineering)
"de" = (
/obj/machinery/mineral/ore_redemption,
/turf/open/floor/plating,
/area/ship/security)
"dr" = (
Expand Down
6 changes: 1 addition & 5 deletions _maps/shuttles/independent/independent_shepherd.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -7172,7 +7168,7 @@ xj
xj
ZG
Te
Cx
Tf
Tf
fP
Tf
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/independent/independent_shetland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/inteq/inteq_colossus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions _maps/shuttles/inteq/inteq_hound.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
3 changes: 0 additions & 3 deletions _maps/shuttles/minutemen/minutemen_asclepius.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/minutemen/minutemen_cepheus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/minutemen/minutemen_corvus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/shuttles/syndicate/syndicate_aegis.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/bags.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/structures/salvaging.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
5 changes: 3 additions & 2 deletions code/modules/mining/ores_coins.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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)
Expand Down
19 changes: 0 additions & 19 deletions code/modules/research/designs/machine_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand All @@ -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."
Expand Down Expand Up @@ -399,31 +395,27 @@
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."
id = "scanner_gate"
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."
id = "holopad"
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."
id = "autolathe"
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."
Expand All @@ -432,22 +424,13 @@
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."
id = "vendor"
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."
Expand Down Expand Up @@ -527,15 +510,13 @@
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."
id = "cell_charger"
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."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/techweb/all_nodes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down