cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lore Expansion Pack: M I N E R A L S ! (#25427)

Browse Source 
* D E E P   L O R E

* Update mineral.dm

* Apply suggestions from code review

Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/mining/ores_coins.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* reformatted and added more lore

* Even more lore

* oops

* Update sheet_types.dm

* Update code/game/objects/items/stacks/sheets/mineral.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/mining/ores_coins.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* updates

* Update ores_coins.dm

* Update code/game/objects/items/stacks/sheets/glass.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/mineral.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update ores_coins.dm

* Update ores_coins.dm

* update

* refactor (again)

* Update sheet_types.dm

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Update code/modules/mining/ores_coins.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update bscrystal.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-06-12 17:56:45 +00:00
committed by GitHub
co-authored by Christasmurf Henri215 Ryan DGamerL S34N
parent 90c7d9bb93
commit 8f2b24be32
5 changed files with 333 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ores_coins.dm
+84 -56
View File
@@ -3,8 +3,9 @@
#define GIBTONITE_QUALITY_HIGH 3
#define PROBABILITY_REFINE_BY_FIRE 50
#define ORESTACK_OVERLAYS_MAX 10
/**********************Mineral ores**************************/
//////////////////////////////
// MARK: ORES
//////////////////////////////
/obj/item/stack/ore
name = "rock"
icon = 'icons/obj/stacks/ores.dmi'
@@ -71,28 +72,9 @@
new refined_type(get_turf(loc), amountrefined)
qdel(src)
/obj/item/stack/ore/uranium
name = "uranium ore"
icon_state = "uranium_ore"
item_state = "uranium_ore"
origin_tech = "materials=5"
singular_name = "uranium ore chunk"
points = 30
refined_type = /obj/item/stack/sheet/mineral/uranium
materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/iron
name = "iron ore"
icon_state = "iron_ore"
item_state = "iron_ore"
origin_tech = "materials=1"
singular_name = "iron ore chunk"
points = 1
refined_type = /obj/item/stack/sheet/metal
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/glass
name = "sand pile"
desc = "A coarse, dust mainly composed of quartz and silica-rich rock. Among its many uses, it can be refined into glass when fired at high tempratures."
icon_state = "sand"
item_state = "sand"
origin_tech = "materials=1"
@@ -102,6 +84,10 @@
merge_type = /obj/item/stack/ore/glass
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/glass/examine(mob/user)
. = ..()
. += "<span class='notice'>You can throw this into people's eyes!</span>"
GLOBAL_LIST_INIT(sand_recipes, list(\
new /datum/stack_recipe("sandstone", /obj/item/stack/sheet/mineral/sandstone, 1, 1, 50)\
))
@@ -136,19 +122,36 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/glass/basalt
name = "volcanic ash"
desc = "A coarse, abrasive basaltic dust rich in silica and various elemental oxides. Commonly refined into glass or used as fertiliser."
icon_state = "volcanic_sand"
item_state = "volcanic_sand"
singular_name = "volcanic ash pile"
desc = "Looks like you could shove some on a girder to make a false rock wall"
/obj/item/stack/ore/glass/basalt/examine(mob/user)
. = ..()
. += "<span class='notice'>You could add some to a girder to make a false rock wall.</span>"
/obj/item/stack/ore/glass/basalt/ancient
name = "ancient sand"
desc = "Basultic sand mined from an exceptionally old and compacted formation."
icon_state = "volcanic_sand"
item_state = "volcanic_sand"
singular_name = "ancient sand pile"
/obj/item/stack/ore/iron
name = "iron ore"
desc = "Exceptionally common ore that can be refined into iron and steel."
icon_state = "iron_ore"
item_state = "iron_ore"
origin_tech = "materials=1"
singular_name = "iron ore chunk"
points = 1
refined_type = /obj/item/stack/sheet/metal
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/plasma
name = "plasma ore"
desc = "The reason you're here."
icon_state = "plasma_ore"
item_state = "plasma_ore"
origin_tech = "plasmatech=2;materials=2"
@@ -159,6 +162,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/silver
name = "silver ore"
desc = "Metal ore rich in precious silver."
icon_state = "silver_ore"
item_state = "silver_ore"
origin_tech = "materials=3"
@@ -169,6 +173,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/gold
name = "gold ore"
desc = "WE'RE RICH!"
icon_state = "gold_ore"
item_state = "gold_ore"
origin_tech = "materials=4"
@@ -177,35 +182,16 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
refined_type = /obj/item/stack/sheet/mineral/gold
materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/diamond
name = "diamond ore"
icon_state = "diamond_ore"
item_state = "diamond_ore"
origin_tech = "materials=6"
singular_name = "diamond ore chunk"
points = 50
refined_type = /obj/item/stack/sheet/mineral/diamond
materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/bananium
name = "bananium ore"
icon_state = "bananium_ore"
item_state = "bananium_ore"
origin_tech = "materials=4"
singular_name = "bananium ore chunk"
points = 60
refined_type = /obj/item/stack/sheet/mineral/bananium
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/tranquillite
name = "tranquillite ore"
icon_state = "tranquillite_ore"
item_state = "tranquillite_ore"
origin_tech = "materials=4"
singular_name = "transquillite ore chunk"
points = 60
refined_type = /obj/item/stack/sheet/mineral/tranquillite
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/uranium
name = "uranium ore"
desc = "Radioactive ore containing significant amounts of natural uranium."
icon_state = "uranium_ore"
item_state = "uranium_ore"
origin_tech = "materials=5"
singular_name = "uranium ore chunk"
points = 30
refined_type = /obj/item/stack/sheet/mineral/uranium
materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/titanium
name = "titanium ore"
@@ -216,15 +202,51 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/mineral/titanium
/obj/item/stack/ore/diamond
name = "diamond ore"
desc = "Rock formation containing diamond."
icon_state = "diamond_ore"
item_state = "diamond_ore"
origin_tech = "materials=6"
singular_name = "diamond ore chunk"
points = 50
refined_type = /obj/item/stack/sheet/mineral/diamond
materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/bananium
name = "bananium ore"
desc = "HONK!"
icon_state = "bananium_ore"
item_state = "bananium_ore"
origin_tech = "materials=4"
singular_name = "bananium ore chunk"
points = 60
refined_type = /obj/item/stack/sheet/mineral/bananium
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/tranquillite
name = "tranquillite ore"
desc = "..."
icon_state = "tranquillite_ore"
item_state = "tranquillite_ore"
origin_tech = "materials=4"
singular_name = "transquillite ore chunk"
points = 60
refined_type = /obj/item/stack/sheet/mineral/tranquillite
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/ore/slag
name = "slag"
desc = "Completely useless"
desc = "Completely useless."
icon_state = "slag"
singular_name = "slag chunk"
//////////////////////////////
// MARK: GIBTONITE
//////////////////////////////
/obj/item/gibtonite
name = "gibtonite ore"
desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under space law."
desc = "Extremely explosive if struck with mining equipment, Gibtonite is often used by miners to speed up their work by using it as a mining charge. This material is illegal to possess by unauthorized personnel under Space Law."
icon = 'icons/obj/mining.dmi'
icon_state = "Gibtonite ore"
item_state = "Gibtonite ore"
@@ -237,6 +259,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
var/attacher = "UNKNOWN"
var/datum/wires/explosive/gibtonite/wires
/obj/item/gibtonite/examine(mob/user)
. = ..()
. += "<span class='notice'>You can use a mining scanner to stop an activated gibtonite crystal from detonating.</span>"
. += "<span class='notice'>In addition to simply hitting it, you can add a remote signaller to the gibtonite and trigger it to make the crystal begin to detonate!</span>"
/obj/item/gibtonite/Initialize(mapload)
. = ..()
AddComponent(/datum/component/two_handed, require_twohands = TRUE)
@@ -331,8 +358,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
qdel(src)
/*****************************Coin********************************/
//////////////////////////////
// MARK: COINS
//////////////////////////////
/obj/item/coin
icon = 'icons/obj/economy.dmi'
name = "coin"