cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-15 20:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes Void Opals to Magmellite

Browse Source
This commit is contained in:
Cerebulon
2022-03-17 16:16:41 +00:00
parent 38e1d0f036
commit 3a5b038668
11 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__defines/materials.dm
View File

@@ -37,7 +37,7 @@
#define MAT_COPPER "copper" #define MAT_COPPER "copper"
#define MAT_QUARTZ "quartz" #define MAT_QUARTZ "quartz"
#define MAT_TIN "tin" #define MAT_TIN "tin"
#define MAT_VOPAL "void opal" #define MAT_MAGMELLITE "magmellite"
#define MAT_ALUMINIUM "aluminium" #define MAT_ALUMINIUM "aluminium"
#define MAT_BRONZE "bronze" #define MAT_BRONZE "bronze"
#define MAT_PAINITE "painite" #define MAT_PAINITE "painite"

4
code/game/objects/random/mapping.dm
View File

@@ -646,8 +646,8 @@
/obj/item/weapon/ore/verdantium /obj/item/weapon/ore/verdantium
), ),
prob(2);list( prob(2);list(
/obj/item/weapon/ore/void_opal, /obj/item/weapon/ore/magmellite,
/obj/item/weapon/ore/void_opal /obj/item/weapon/ore/magmellite
), ),
) )

12
code/modules/materials/materials/gems.dm
View File

@@ -69,12 +69,12 @@
sheet_plural_name = "gems" sheet_plural_name = "gems"
supply_conversion_value = 4 supply_conversion_value = 4
/datum/material/void_opal /datum/material/magmellite
name = "void opal" name = "magmellite"
display_name = "void opal" display_name = "magmellite"
use_name = "void opal" use_name = "magmellite"
icon_colour = "#0f0f0f" icon_colour = "#0f0f0f"
stack_type = /obj/item/stack/material/void_opal stack_type = /obj/item/stack/material/magmellite
flags = MATERIAL_UNMELTABLE flags = MATERIAL_UNMELTABLE
cut_delay = 60 cut_delay = 60
reflectivity = 0 reflectivity = 0
@@ -82,7 +82,7 @@
shard_type = SHARD_SHARD shard_type = SHARD_SHARD
tableslam_noise = 'sound/effects/Glasshit.ogg' tableslam_noise = 'sound/effects/Glasshit.ogg'
hardness = 100 hardness = 100
stack_origin_tech = list(TECH_ARCANE = 1, TECH_MATERIAL = 6) stack_origin_tech = list(TECH_BLUESPACE = 5, TECH_MATERIAL = 7)
sheet_singular_name = "gem" sheet_singular_name = "gem"
sheet_plural_name = "gems" sheet_plural_name = "gems"
supply_conversion_value = 30 // These are hilariously rare. supply_conversion_value = 30 // These are hilariously rare.

8
code/modules/materials/sheets/gems.dm
View File

@@ -21,11 +21,11 @@
apply_colour = 1 apply_colour = 1
no_variants = FALSE no_variants = FALSE
/obj/item/stack/material/void_opal /obj/item/stack/material/magmellite
name = "void opal" name = "magmellite"
icon_state = "sheet-void_opal" icon_state = "sheet-void_opal"
singular_name = "void opal" singular_name = "magmellite"
default_type = "void opal" default_type = "magmellite"
apply_colour = 1 apply_colour = 1
no_variants = FALSE no_variants = FALSE

2
code/modules/mining/drilling/drill.dm
View File

@@ -51,7 +51,7 @@
// Found with an ultra laser. exotic_drilling >= 2 // Found with an ultra laser. exotic_drilling >= 2
var/list/ore_types_rare = list( var/list/ore_types_rare = list(
"void opal" = /obj/item/weapon/ore/void_opal, "magmellite" = /obj/item/weapon/ore/magmellite,
MAT_VERDANTIUM = /obj/item/weapon/ore/verdantium MAT_VERDANTIUM = /obj/item/weapon/ore/verdantium
) )

2
code/modules/mining/drilling/scanner.dm
View File

@@ -47,7 +47,7 @@
if("diamond", "painite") ore_type = "precious gems" if("diamond", "painite") ore_type = "precious gems"
if("uranium") ore_type = "nuclear fuel" if("uranium") ore_type = "nuclear fuel"
if("phoron", "osmium", "hydrogen") ore_type = "exotic matter" if("phoron", "osmium", "hydrogen") ore_type = "exotic matter"
if("verdantium", "void opal") ore_type = "anomalous matter" if("verdantium", "magmellite") ore_type = "anomalous matter"
if(ore_type) metals[ore_type] += T.resources[metal] if(ore_type) metals[ore_type] += T.resources[metal]

2
code/modules/mining/machinery/machine_processing.dm
View File

@@ -175,7 +175,7 @@
"carbon" = 1, "carbon" = 1,
"raw copper" = 1, "raw copper" = 1,
"raw tin" = 1, "raw tin" = 1,
"void opal" = 3, "magmellite" = 3,
"painite" = 3, "painite" = 3,
"quartz" = 3, "quartz" = 3,
"raw bauxite" = 5, "raw bauxite" = 5,

8
code/modules/mining/mine_turfs.dm
View File

@@ -6,7 +6,7 @@ var/list/mining_overlay_cache = list()
icon = 'icons/turf/walls.dmi' icon = 'icons/turf/walls.dmi'
icon_state = "rock-dark" icon_state = "rock-dark"
density = 1 density = 1
/turf/simulated/mineral //wall piece /turf/simulated/mineral //wall piece
name = "rock" name = "rock"
icon = 'icons/turf/walls.dmi' icon = 'icons/turf/walls.dmi'
@@ -58,7 +58,7 @@ var/list/mining_overlay_cache = list()
"copper" = /obj/item/weapon/ore/copper, "copper" = /obj/item/weapon/ore/copper,
// "tin" = /obj/item/weapon/ore/tin, // "tin" = /obj/item/weapon/ore/tin,
"bauxite" = /obj/item/weapon/ore/bauxite, "bauxite" = /obj/item/weapon/ore/bauxite,
// "void opal" = /obj/item/weapon/ore/void_opal, "magmellite" = /obj/item/weapon/ore/magmellite,
// "painite" = /obj/item/weapon/ore/painite, // "painite" = /obj/item/weapon/ore/painite,
// "quartz" = /obj/item/weapon/ore/quartz, // "quartz" = /obj/item/weapon/ore/quartz,
"rutile" = /obj/item/weapon/ore/rutile "rutile" = /obj/item/weapon/ore/rutile
@@ -679,10 +679,10 @@ var/list/mining_overlay_cache = list()
var/mineral_name var/mineral_name
if(rare_ore) if(rare_ore)
mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15,*/ "copper" = 10, /*"tin" = 5,*/ "bauxite" = 5, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5,/* "void opal" = 1,*/ "verdantium" = 2/*, "painite" = 1*/)) mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15,*/ "copper" = 10, /*"tin" = 5,*/ "bauxite" = 5, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5, "magmellite" = 1, "verdantium" = 2/*, "painite" = 1*/))
else else
mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10,*/ "copper" = 20, /*"tin" = 15,*/ "bauxite" = 15, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3,/* "void opal" = 1,*/ "verdantium" = 1/*, "painite" = 1*/)) mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10,*/ "copper" = 20, /*"tin" = 15,*/ "bauxite" = 15, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3, "magmellite" = 1, "verdantium" = 1/*, "painite" = 1*/))
if(mineral_name && (mineral_name in GLOB.ore_data)) if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name] mineral = GLOB.ore_data[mineral_name]

6
code/modules/mining/ore.dm
View File

@@ -127,10 +127,10 @@
icon_state = "ore_rutile" icon_state = "ore_rutile"
material = "rutile" material = "rutile"
/obj/item/weapon/ore/void_opal /obj/item/weapon/ore/magmellite
name = "raw void opal" name = "impure magmellite"
icon_state = "ore_void_opal" icon_state = "ore_void_opal"
material = "void opal" material = "magmellite"
/obj/item/weapon/ore/painite /obj/item/weapon/ore/painite
name = "raw painite" name = "raw painite"

10
code/modules/mining/ore_datum.dm
View File

@@ -235,11 +235,11 @@
ore = /obj/item/weapon/ore/painite ore = /obj/item/weapon/ore/painite
scan_icon = "mineral_rare" scan_icon = "mineral_rare"
/ore/void_opal /ore/magmellite
name = "void opal" name = "magmellite"
display_name = "rough void opal" display_name = "impure magmellite"
compresses_to = "void opal" compresses_to = "magmellite"
result_amount = 5 result_amount = 5
spread_chance = 1 spread_chance = 1
ore = /obj/item/weapon/ore/void_opal ore = /obj/item/weapon/ore/magmellite
scan_icon = "mineral_rare" scan_icon = "mineral_rare"

6
code/modules/random_map/noise/ore.dm
View File

@@ -68,7 +68,7 @@
T.resources["tin"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["tin"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
T.resources["bauxite"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["bauxite"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
T.resources["rutile"] = 0 T.resources["rutile"] = 0
T.resources["void opal"] = 0 T.resources["magmellite"] = 0
T.resources["quartz"] = 0 T.resources["quartz"] = 0
T.resources["painite"] = 0 T.resources["painite"] = 0
else if(current_cell < deep_val) // Rare metals. else if(current_cell < deep_val) // Rare metals.
@@ -87,7 +87,7 @@
T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
T.resources["bauxite"] = 0 T.resources["bauxite"] = 0
T.resources["rutile"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["rutile"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
T.resources["void opal"] = 0 T.resources["magmellite"] = 0
T.resources["quartz"] = 0 T.resources["quartz"] = 0
T.resources["painite"] = 0 T.resources["painite"] = 0
else // Deep metals. else // Deep metals.
@@ -106,7 +106,7 @@
T.resources["tin"] = 0 T.resources["tin"] = 0
T.resources["bauxite"] = 0 T.resources["bauxite"] = 0
T.resources["rutile"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) T.resources["rutile"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
T.resources["void opal"] = 0 T.resources["magmellite"] = 0
T.resources["quartz"] = 0 T.resources["quartz"] = 0
T.resources["painite"] = 0 T.resources["painite"] = 0
return return