cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Minerals have been refactored so costs and minerals in items are now in terms of mineral defines. [MDB IGNORE] (#20916)

Browse Source 
* Minerals have been refactored so costs and minerals in items are now in terms of mineral defines.

* AI GEN RUN ONE

---------

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-05-03 22:48:10 +01:00
committed by GitHub
parent 05598c7c69
commit c4d4e1da63
240 changed files with 1267 additions and 1253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/kinetic_crusher.dm
+1 -1
View File
@@ -14,7 +14,7 @@
throwforce = 5
throw_speed = 4
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT*1.15, /datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT*2.075)
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb_continuous = list("smashes", "crushes", "cleaves", "chops", "pulps")
attack_verb_simple = list("smash", "crush", "cleave", "chop", "pulp")
code/modules/mining/equipment/mining_tools.dm
+4 -4
View File
@@ -12,7 +12,7 @@
lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
custom_materials = list(/datum/material/iron=2000) //one sheet, but where can you make them?
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT)
tool_behaviour = TOOL_MINING
toolspeed = 1
usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
@@ -43,7 +43,7 @@
throwforce = 7
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=1000)
custom_materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT)
/obj/item/pickaxe/silver
name = "silver-plated pickaxe"
@@ -113,7 +113,7 @@
toolspeed = 3 //3 times slower than a normal pickaxe
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=12050) //metal needed for a crowbar and for a knife, why the FUCK does a knife cost 6 metal sheets while a crowbar costs 0.025 sheets? shit makes no sense fuck this
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6) //This number used to be insane and I'm just going to save your sanity and not tell you what it was.
/obj/item/shovel
name = "shovel"
@@ -131,7 +131,7 @@
toolspeed = 1
usesound = 'sound/effects/shovel_dig.ogg'
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=50)
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.5)
attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks")
attack_verb_simple = list("bash", "bludgeon", "thrash", "whack")
sharpness = SHARP_EDGED
code/modules/mining/lavaland/tendril_loot.dm
+4 -4
View File
@@ -38,28 +38,28 @@
name = "Kinetic Accelerator Offensive Mining Explosion Mod"
desc = "A device which causes kinetic accelerators to fire AoE blasts that destroy rock and damage creatures."
id = "hyperaoemod"
materials = list(/datum/material/iron = 7000, /datum/material/glass = 3000, /datum/material/silver = 3000, /datum/material/gold = 3000, /datum/material/diamond = 4000)
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.5, /datum/material/gold =SHEET_MATERIAL_AMOUNT*1.5, /datum/material/diamond = SHEET_MATERIAL_AMOUNT*2)
build_path = /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs
/datum/design/unique_modkit/rapid_repeater
name = "Kinetic Accelerator Rapid Repeater Mod"
desc = "A device which greatly reduces a kinetic accelerator's cooldown on striking a living target or rock, but greatly increases its base cooldown."
id = "repeatermod"
materials = list(/datum/material/iron = 5000, /datum/material/glass = 5000, /datum/material/uranium = 8000, /datum/material/bluespace = 2000)
materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/uranium = SHEET_MATERIAL_AMOUNT*4, /datum/material/bluespace =SHEET_MATERIAL_AMOUNT)
build_path = /obj/item/borg/upgrade/modkit/cooldown/repeater
/datum/design/unique_modkit/resonator_blast
name = "Kinetic Accelerator Resonator Blast Mod"
desc = "A device which causes kinetic accelerators to fire shots that leave and detonate resonator blasts."
id = "resonatormod"
materials = list(/datum/material/iron = 5000, /datum/material/glass = 5000, /datum/material/silver = 5000, /datum/material/uranium = 5000)
materials = list(/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT*5, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT*5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT*5, /datum/material/uranium =SHEET_MATERIAL_AMOUNT * 2.5)
build_path = /obj/item/borg/upgrade/modkit/resonator_blasts
/datum/design/unique_modkit/bounty
name = "Kinetic Accelerator Death Syphon Mod"
desc = "A device which causes kinetic accelerators to permanently gain damage against creature types killed with it."
id = "bountymod"
materials = list(/datum/material/iron = 4000, /datum/material/silver = 4000, /datum/material/gold = 4000, /datum/material/bluespace = 4000)
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*2, /datum/material/gold = SHEET_MATERIAL_AMOUNT*2, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT*2)
reagents_list = list(/datum/reagent/blood = 40)
build_path = /obj/item/borg/upgrade/modkit/bounty
code/modules/mining/machine_processing.dm
+1 -1
View File
@@ -236,7 +236,7 @@
var/datum/material/mat = selected_material
if(!mat)
return
var/sheets_to_remove = (materials.materials[mat] >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT * seconds_per_tick) ) ? SMELT_AMOUNT * seconds_per_tick : round(materials.materials[mat] / MINERAL_MATERIAL_AMOUNT)
var/sheets_to_remove = (materials.materials[mat] >= (SHEET_MATERIAL_AMOUNT * SMELT_AMOUNT * seconds_per_tick) ) ? SMELT_AMOUNT * seconds_per_tick : round(materials.materials[mat] / SHEET_MATERIAL_AMOUNT)
if(!sheets_to_remove)
on = FALSE
else
code/modules/mining/machine_redemption.dm
+4 -4
View File
@@ -126,7 +126,7 @@
for(var/mat in mat_container.materials)
var/datum/material/M = mat
var/mineral_amount = mat_container.materials[mat] / MINERAL_MATERIAL_AMOUNT
var/mineral_amount = mat_container.materials[mat] / SHEET_MATERIAL_AMOUNT
if(mineral_amount)
has_minerals = TRUE
msg += "[capitalize(M.name)]: [mineral_amount] sheets<br>"
@@ -220,7 +220,7 @@
if (mat_container)
for(var/datum/material/material as anything in mat_container.materials)
var/amount = mat_container.materials[material]
var/sheet_amount = amount / MINERAL_MATERIAL_AMOUNT
var/sheet_amount = amount / SHEET_MATERIAL_AMOUNT
data["materials"] += list(list(
"name" = material.name,
"id" = REF(material),
@@ -325,7 +325,7 @@
if(!amount)
return
var/stored_amount = CEILING(amount / MINERAL_MATERIAL_AMOUNT, 0.1)
var/stored_amount = CEILING(amount / SHEET_MATERIAL_AMOUNT, 0.1)
if(!stored_amount)
return
@@ -334,7 +334,7 @@
var/count = mat_container.retrieve_sheets(sheets_to_remove, mat, get_step(src, output_dir))
var/list/mats = list()
mats[mat] = MINERAL_MATERIAL_AMOUNT
mats[mat] = SHEET_MATERIAL_AMOUNT
materials.silo_log(src, "released", -count, "sheets", mats)
//Logging deleted for quick coding
return TRUE
code/modules/mining/machine_silo.dm
+2 -2
View File
@@ -98,7 +98,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
for(var/M in materials.materials)
var/datum/material/mat = M
var/amount = materials.materials[M]
var/sheets = round(amount) / MINERAL_MATERIAL_AMOUNT
var/sheets = round(amount) / SHEET_MATERIAL_AMOUNT
var/ref = REF(M)
if (sheets)
if (sheets >= 1)
@@ -169,7 +169,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
var/count = materials.retrieve_sheets(text2num(href_list["eject_amt"]), eject_sheet, drop_location())
var/list/matlist = list()
matlist[eject_sheet] = MINERAL_MATERIAL_AMOUNT * count
matlist[eject_sheet] = SHEET_MATERIAL_AMOUNT * count
silo_log(src, "ejected", -count, "sheets", matlist)
return TRUE
else if(href_list["page"])
code/modules/mining/ores_coins.dm
+24 -24
View File
@@ -76,7 +76,7 @@
singular_name = "uranium ore chunk"
points = 30
material_flags = NONE
mats_per_unit = list(/datum/material/uranium=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/uranium
mine_experience = 6
scan_state = "rock_Uranium"
@@ -88,7 +88,7 @@
icon_state = "Iron ore"
singular_name = "iron ore chunk"
points = 1
mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/iron
mine_experience = 1
scan_state = "rock_Iron"
@@ -100,7 +100,7 @@
icon_state = "Glass ore"
singular_name = "sand pile"
points = 1
mats_per_unit = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/glass
w_class = WEIGHT_CLASS_TINY
mine_experience = 0 //its sand
@@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "Plasma ore"
singular_name = "plasma ore chunk"
points = 15
mats_per_unit = list(/datum/material/plasma=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/plasma
mine_experience = 5
scan_state = "rock_Plasma"
@@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
singular_name = "silver ore chunk"
points = 16
mine_experience = 3
mats_per_unit = list(/datum/material/silver=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/silver
scan_state = "rock_Silver"
spreadChance = 5
@@ -174,7 +174,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
singular_name = "gold ore chunk"
points = 18
mine_experience = 5
mats_per_unit = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/gold
scan_state = "rock_Gold"
spreadChance = 5
@@ -185,7 +185,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "Diamond ore"
singular_name = "diamond ore chunk"
points = 50
mats_per_unit = list(/datum/material/diamond=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/diamond
mine_experience = 10
scan_state = "rock_Diamond"
@@ -196,7 +196,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "Bananium ore"
singular_name = "bananium ore chunk"
points = 60
mats_per_unit = list(/datum/material/bananium=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/bananium
mine_experience = 15
scan_state = "rock_Bananium"
@@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "Titanium ore"
singular_name = "titanium ore chunk"
points = 50
mats_per_unit = list(/datum/material/titanium=MINERAL_MATERIAL_AMOUNT)
mats_per_unit = list(/datum/material/titanium=SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/titanium
mine_experience = 3
scan_state = "rock_Titanium"
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
force = 1
throwforce = 2
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/iron = 400)
custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT*0.4)
material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
var/string_attached
var/list/sideslist = list("heads","tails")
@@ -457,37 +457,37 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
return
/obj/item/coin/gold
custom_materials = list(/datum/material/gold = 400)
custom_materials = list(/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/silver
custom_materials = list(/datum/material/silver = 400)
custom_materials = list(/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/diamond
custom_materials = list(/datum/material/diamond = 400)
custom_materials = list(/datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/plasma
custom_materials = list(/datum/material/plasma = 400)
custom_materials = list(/datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/uranium
custom_materials = list(/datum/material/uranium = 400)
custom_materials = list(/datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/titanium
custom_materials = list(/datum/material/titanium = 400)
custom_materials = list(/datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/bananium
custom_materials = list(/datum/material/bananium = 400)
custom_materials = list(/datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/adamantine
custom_materials = list(/datum/material/adamantine = 400)
custom_materials = list(/datum/material/adamantine = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/mythril
custom_materials = list(/datum/material/mythril = 400)
custom_materials = list(/datum/material/mythril = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/plastic
custom_materials = list(/datum/material/plastic = 400)
custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/runite
custom_materials = list(/datum/material/runite = 400)
custom_materials = list(/datum/material/runite = HALF_SHEET_MATERIAL_AMOUNT*0.4)
/obj/item/coin/twoheaded
desc = "Hey, this coin's the same on both sides!"
@@ -497,7 +497,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
name = "antag token"
desc = "A novelty coin that helps the heart know what hard evidence cannot prove."
icon_state = "coin_valid"
custom_materials = list(/datum/material/plastic = 400)
custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*0.4)
sideslist = list("valid", "salad")
heads_name = "valid"
material_flags = NONE
@@ -506,7 +506,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/coin/iron
/obj/item/coin/gold/debug
custom_materials = list(/datum/material/gold = 400)
custom_materials = list(/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT*0.4)
desc = "If you got this somehow, be aware that it will dust you. Almost certainly."
/obj/item/coin/gold/debug/attack_self(mob/user)
@@ -544,7 +544,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
name = "eldritch coin"
desc = "Everytime it lands it bolts or opens doors, except for you."
icon_state = "coin_heretic"
custom_materials = list(/datum/material/diamond = 1000, /datum/material/plasma = 1000)
custom_materials = list(/datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT)
sideslist = list("heretic", "blade")
heads_name = "heretic"
has_action = TRUE