mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 06:40:08 +01:00
[MIRROR] Staticpath [MDB ignore] (#12445)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
cc106f8032
commit
ba5224fbcb
@@ -1,7 +1,7 @@
|
||||
/obj/structure/closet/crate/secure/loot
|
||||
name = "abandoned crate"
|
||||
desc = "What could be inside?"
|
||||
closet_appearance = /decl/closet_appearance/crate/secure
|
||||
closet_appearance = /datum/decl/closet_appearance/crate/secure
|
||||
var/list/code = list()
|
||||
var/list/lastattempt = list()
|
||||
var/attempts = 10
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
for(var/ore in machine.ores_processing)
|
||||
if(!machine.ores_stored[ore] && !show_all_ores)
|
||||
continue
|
||||
var/ore/O = GLOB.ore_data[ore]
|
||||
var/datum/ore/O = GLOB.ore_data[ore]
|
||||
if(!O)
|
||||
continue
|
||||
ores.Add(list(list(
|
||||
@@ -189,8 +189,8 @@
|
||||
|
||||
/obj/machinery/mineral/processing_unit/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/ore in GLOB.ore_data)
|
||||
var/ore/OD = GLOB.ore_data[ore]
|
||||
for(var/ore, value in GLOB.ore_data)
|
||||
var/datum/ore/OD = value
|
||||
ores_processing[OD.name] = 0
|
||||
ores_stored[OD.name] = 0
|
||||
|
||||
@@ -270,7 +270,7 @@
|
||||
|
||||
if(ores_stored[metal] > 0 && ores_processing[metal] != 0)
|
||||
|
||||
var/ore/O = GLOB.ore_data[metal]
|
||||
var/datum/ore/O = GLOB.ore_data[metal]
|
||||
|
||||
if(!O) continue
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ var/list/mining_overlay_cache = list()
|
||||
var/rock_icon_path = 'icons/turf/walls.dmi' // Override this on a subtype turf if you want a custom icon
|
||||
var/random_icon = 0
|
||||
|
||||
var/ore/mineral
|
||||
var/datum/ore/mineral
|
||||
var/sand_dug
|
||||
var/mined_ore = 0
|
||||
var/last_act = 0
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
var/turf/simulated/mineral/min_turf = loc
|
||||
if(!istype(min_turf))
|
||||
return INITIALIZE_HINT_QDEL
|
||||
var/ore/M = min_turf.mineral
|
||||
var/datum/ore/M = min_turf.mineral
|
||||
name = "[M.display_name] deposit"
|
||||
ore_key = M.name
|
||||
if(M.reagent)
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
/obj/effect/mineral/proc/get_scan_overlay()
|
||||
if(!scanner_image)
|
||||
var/ore/O = GLOB.ore_data[ore_key]
|
||||
var/datum/ore/O = GLOB.ore_data[ore_key]
|
||||
if(O)
|
||||
scanner_image = image(icon, loc = get_turf(src), icon_state = (O.scan_icon ? O.scan_icon : icon_state))
|
||||
else
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/ore
|
||||
/datum/ore
|
||||
var/name
|
||||
var/display_name
|
||||
var/alloy
|
||||
@@ -7,7 +7,7 @@
|
||||
var/result_amount // How much ore?
|
||||
var/spread = 1 // Does this type of deposit spread?
|
||||
var/spread_chance // Chance of spreading in any direction
|
||||
var/ore // Path to the ore produced when tile is mined.
|
||||
var/datum/ore // Path to the ore produced when tile is mined.
|
||||
var/scan_icon // Overlay for ore scanners.
|
||||
// Xenoarch stuff. No idea what it's for, just refactored it to be less awful.
|
||||
var/list/xarch_ages = list(
|
||||
@@ -18,12 +18,12 @@
|
||||
var/reagent = REAGENT_ID_SILICATE
|
||||
var/wiki_flag = 0
|
||||
|
||||
/ore/New()
|
||||
/datum/ore/New()
|
||||
. = ..()
|
||||
if(!display_name)
|
||||
display_name = name
|
||||
|
||||
/ore/uranium
|
||||
/datum/ore/uranium
|
||||
name = ORE_URANIUM
|
||||
display_name = "pitchblende"
|
||||
smelts_to = MAT_URANIUM
|
||||
@@ -38,7 +38,7 @@
|
||||
xarch_source_mineral = REAGENT_ID_POTASSIUM
|
||||
reagent = REAGENT_ID_RADIUM // Otherwise it emp pulses constantly with iron
|
||||
|
||||
/ore/hematite
|
||||
/datum/ore/hematite
|
||||
name = ORE_HEMATITE
|
||||
display_name = ORE_HEMATITE
|
||||
smelts_to = MAT_IRON
|
||||
@@ -49,7 +49,7 @@
|
||||
scan_icon = "mineral_common"
|
||||
reagent = REAGENT_ID_IRON
|
||||
|
||||
/ore/coal
|
||||
/datum/ore/coal
|
||||
name = ORE_CARBON
|
||||
display_name = "raw carbon"
|
||||
smelts_to = MAT_PLASTIC
|
||||
@@ -61,7 +61,7 @@
|
||||
scan_icon = "mineral_common"
|
||||
reagent = REAGENT_ID_CARBON
|
||||
|
||||
/ore/glass
|
||||
/datum/ore/glass
|
||||
name = ORE_SAND
|
||||
display_name = ORE_SAND
|
||||
smelts_to = MAT_GLASS
|
||||
@@ -69,7 +69,7 @@
|
||||
ore = /obj/item/ore/glass
|
||||
compresses_to = MAT_SANDSTONE
|
||||
|
||||
/ore/phoron
|
||||
/datum/ore/phoron
|
||||
name = ORE_PHORON
|
||||
display_name = "phoron crystals"
|
||||
compresses_to = MAT_PHORON
|
||||
@@ -87,7 +87,7 @@
|
||||
xarch_source_mineral = REAGENT_ID_PHORON
|
||||
reagent = REAGENT_ID_PHORON
|
||||
|
||||
/ore/silver
|
||||
/datum/ore/silver
|
||||
name = ORE_SILVER
|
||||
display_name = "native silver"
|
||||
smelts_to = MAT_SILVER
|
||||
@@ -97,7 +97,7 @@
|
||||
scan_icon = "mineral_uncommon"
|
||||
reagent = REAGENT_ID_SILVER
|
||||
|
||||
/ore/gold
|
||||
/datum/ore/gold
|
||||
name = ORE_GOLD
|
||||
smelts_to = MAT_GOLD
|
||||
display_name = "native gold"
|
||||
@@ -113,7 +113,7 @@
|
||||
)
|
||||
reagent = REAGENT_ID_GOLD
|
||||
|
||||
/ore/diamond
|
||||
/datum/ore/diamond
|
||||
name = ORE_DIAMOND
|
||||
display_name = ORE_DIAMOND
|
||||
alloy = 1
|
||||
@@ -125,7 +125,7 @@
|
||||
xarch_source_mineral = REAGENT_ID_NITROGEN
|
||||
reagent = REAGENT_ID_CARBON
|
||||
|
||||
/ore/platinum
|
||||
/datum/ore/platinum
|
||||
name = ORE_PLATINUM
|
||||
display_name = "raw platinum"
|
||||
smelts_to = MAT_PLATINUM
|
||||
@@ -137,7 +137,7 @@
|
||||
scan_icon = "mineral_rare"
|
||||
reagent = REAGENT_ID_PLATINUM
|
||||
|
||||
/ore/hydrogen
|
||||
/datum/ore/hydrogen
|
||||
name = ORE_MHYDROGEN
|
||||
display_name = "metallic hydrogen"
|
||||
smelts_to = MAT_TRITIUM
|
||||
@@ -146,7 +146,7 @@
|
||||
scan_icon = "mineral_rare"
|
||||
reagent = REAGENT_ID_HYDROGEN
|
||||
|
||||
/ore/verdantium
|
||||
/datum/ore/verdantium
|
||||
name = ORE_VERDANTIUM
|
||||
display_name = "crystalline verdantite"
|
||||
compresses_to = MAT_VERDANTIUM
|
||||
@@ -160,7 +160,7 @@
|
||||
)
|
||||
reagent = REAGENT_ID_PHOSPHORUS
|
||||
|
||||
/ore/marble
|
||||
/datum/ore/marble
|
||||
name = ORE_MARBLE
|
||||
display_name = "recrystallized carbonate"
|
||||
compresses_to = MAT_MARBLE
|
||||
@@ -170,7 +170,7 @@
|
||||
scan_icon = "mineral_common"
|
||||
reagent = REAGENT_ID_CALCIUMCARBONATE
|
||||
|
||||
/ore/lead
|
||||
/datum/ore/lead
|
||||
name = ORE_LEAD
|
||||
display_name = "lead glance"
|
||||
smelts_to = MAT_LEAD
|
||||
@@ -180,7 +180,7 @@
|
||||
scan_icon = "mineral_rare"
|
||||
reagent = REAGENT_ID_LEAD
|
||||
|
||||
/ore/copper
|
||||
/datum/ore/copper
|
||||
name = ORE_COPPER
|
||||
display_name = ORE_COPPER
|
||||
smelts_to = MAT_COPPER
|
||||
@@ -191,7 +191,7 @@
|
||||
scan_icon = "mineral_common"
|
||||
reagent = REAGENT_ID_COPPER
|
||||
|
||||
/ore/tin
|
||||
/datum/ore/tin
|
||||
name = ORE_TIN
|
||||
display_name = ORE_TIN
|
||||
smelts_to = MAT_TIN
|
||||
@@ -202,7 +202,7 @@
|
||||
scan_icon = "mineral_common"
|
||||
reagent = REAGENT_ID_TIN
|
||||
|
||||
/ore/quartz
|
||||
/datum/ore/quartz
|
||||
name = ORE_QUARTZ
|
||||
display_name = "unrefined quartz"
|
||||
compresses_to = MAT_QUARTZ
|
||||
@@ -212,7 +212,7 @@
|
||||
scan_icon = "mineral_common"
|
||||
reagent = REAGENT_ID_SILICON
|
||||
|
||||
/ore/bauxite
|
||||
/datum/ore/bauxite
|
||||
name = ORE_BAUXITE
|
||||
display_name = ORE_BAUXITE
|
||||
smelts_to = MAT_ALUMINIUM
|
||||
@@ -222,7 +222,7 @@
|
||||
scan_icon = "mineral_common"
|
||||
reagent = REAGENT_ID_ALUMINIUM
|
||||
|
||||
/ore/rutile
|
||||
/datum/ore/rutile
|
||||
name = ORE_RUTILE
|
||||
display_name = ORE_RUTILE
|
||||
smelts_to = MAT_TITANIUM
|
||||
@@ -233,7 +233,7 @@
|
||||
scan_icon = "mineral_uncommon"
|
||||
reagent = REAGENT_ID_TITANIUMDIOX
|
||||
|
||||
/ore/painite
|
||||
/datum/ore/painite
|
||||
name = ORE_PAINITE
|
||||
display_name = "rough painite"
|
||||
compresses_to = MAT_PAINITE
|
||||
@@ -243,7 +243,7 @@
|
||||
scan_icon = "mineral_rare"
|
||||
reagent = REAGENT_ID_CALCIUM
|
||||
|
||||
/ore/void_opal
|
||||
/datum/ore/void_opal
|
||||
name = ORE_VOPAL
|
||||
display_name = "rough void opal"
|
||||
compresses_to = MAT_VOPAL
|
||||
|
||||
Reference in New Issue
Block a user