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

Jump to bottom

Mining PoIs WIP #8990

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Mining PoIs WIP #8990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 86 additions & 1 deletion code/modules/mining/mine_outcrops.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,24 @@

/obj/structure/outcrop/Initialize()
. = ..()

var/flip = 1
if(prob(50))
flip = -1

adjust_scale(round(rand(8,12) / 10, 0.1) * flip, round(rand(8,12) / 10, 0.1))

if(prob(1))
add_overlay("[initial(icon_state)]-egg")

/obj/structure/outcrop/marble
name = "rugged outcrop"
desc = "A rugged rocky outcrop."
icon_state = "outcrop-marble"
mindrop = 5
upperdrop = 15
outcropdrop = /obj/item/ore/marble

/obj/structure/outcrop/diamond
name = "shiny outcrop"
desc = "A shiny rocky outcrop."
Expand All @@ -32,6 +47,22 @@
upperdrop = 8
outcropdrop = /obj/item/ore/phoron

/obj/structure/outcrop/hydrogen
name = "smooth outcrop"
desc = "A smooth rocky outcrop."
icon_state = "outcrop-hydrogen"
mindrop = 1
upperdrop = 3
outcropdrop = /obj/item/ore/hydrogen

/obj/structure/outcrop/magmellite
name = "smooth outcrop"
desc = "A smooth rocky outcrop."
icon_state = "outcrop-magmellite"
mindrop = 1
upperdrop = 3
outcropdrop = /obj/item/ore/magmellite

/obj/structure/outcrop/iron
name = "rugged outcrop"
desc = "A rugged rocky outcrop."
Expand All @@ -40,6 +71,30 @@
upperdrop = 20
outcropdrop = /obj/item/ore/iron

/obj/structure/outcrop/bauxite
name = "rugged outcrop"
desc = "A rugged rocky outcrop."
icon_state = "outcrop-bauxite"
mindrop = 5
upperdrop = 10
outcropdrop = /obj/item/ore/bauxite

/obj/structure/outcrop/copper
name = "rugged outcrop"
desc = "A rugged rocky outcrop."
icon_state = "outcrop-copper"
mindrop = 6
upperdrop = 12
outcropdrop = /obj/item/ore/copper

/obj/structure/outcrop/tin
name = "rugged outcrop"
desc = "A rugged rocky outcrop."
icon_state = "outcrop-tin"
mindrop = 3
upperdrop = 8
outcropdrop = /obj/item/ore/tin

/obj/structure/outcrop/coal
name = "rugged outcrop"
desc = "A rugged rocky outcrop."
Expand Down Expand Up @@ -88,6 +143,30 @@
upperdrop = 8
outcropdrop = /obj/item/ore/uranium

/obj/structure/outcrop/quartz
name = "spiky outcrop"
desc = "A spiky rocky outcrop."
icon_state = "outcrop-quartz"
mindrop = 6
upperdrop = 12
outcropdrop = /obj/item/ore/quartz

/obj/structure/outcrop/rutile
name = "hollow outcrop"
desc = "A hollow rocky outcrop."
icon_state = "outcrop-rutile"
mindrop = 2
upperdrop = 5
outcropdrop = /obj/item/ore/rutile

/obj/structure/outcrop/verdantium
name = "hollow outcrop"
desc = "A hollow rocky outcrop."
icon_state = "outcrop-verdantium"
mindrop = 3
upperdrop = 6
outcropdrop = /obj/item/ore/verdantium

/obj/structure/outcrop/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/pickaxe))
to_chat(user, "<span class='notice'>[user] begins to hack away at \the [src].</span>")
Expand All @@ -112,6 +191,12 @@
prob(50);/obj/structure/outcrop/gold,
prob(30);/obj/structure/outcrop/uranium,
prob(30);/obj/structure/outcrop/phoron,
prob(20);/obj/structure/outcrop/bauxite,
prob(20);/obj/structure/outcrop/copper,
prob(7);/obj/structure/outcrop/diamond,
prob(3);/obj/structure/outcrop/hydrogen,
prob(1);/obj/structure/outcrop/magmellite,
prob(15);/obj/structure/outcrop/platinum,
prob(15);/obj/structure/outcrop/lead)
prob(15);/obj/structure/outcrop/rutile,
prob(15);/obj/structure/outcrop/lead,
prob(10);/obj/structure/outcrop/verdantium)
42 changes: 42 additions & 0 deletions code/modules/projectiles/projectile/arc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,45 @@
acid = new(T)
acid.reagents.add_reagent("stomacid", 5)
acid.update_icon()

/obj/item/projectile/arc/moltenchunk
name = "molten chunk"
icon_state = "fireball2"
damage = 20
damage_type = SEARING
armor_penetration = 5
fire_sound = 'sound/weapons/towelwhip.ogg'

var/obj/Ore = /obj/item/ore

var/min_count = 2
var/max_count = 5

/obj/item/projectile/arc/moltenchunk/on_impact(turf/T)
for(var/mob/living/L in T)
attack_mob(L)

if(Ore)
var/spawncount = rand(min_count,max_count)
if(spawncount > 1)
visible_message(SPAN_WARNING("\The [src] shatters on impact, sending [initial(Ore.name)] fragments everywhere!"))
for(var/I = 1; I < spawncount; I++)
var/obj/OreChunk = new Ore(T)
OreChunk = new Ore(T)
OreChunk.throw_at_random(TRUE, 3, 1)

else
visible_message(SPAN_WARNING("\The [src] crumples on impact, leaving \a [initial(Ore.name)] behind!"))
new Ore(T)

/obj/item/projectile/arc/moltenchunk/Initialize(var/atom/newloc, var/orepath)
. = ..(newloc)

if(orepath)
Ore = orepath

/obj/item/projectile/arc/moltenchunk/outcrop
Ore = /obj/structure/outcrop

/obj/item/projectile/arc/moltenchunk/outcrop/gold
Ore = /obj/structure/outcrop/gold
Binary file modified icons/obj/outcrop.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion polaris.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3332,7 +3332,7 @@
#include "code\ZAS\Zone.dm"
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\cynosure\cynosure.dm"
#include "maps\example\example.dm"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👁️

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not there forever trust me ™️

#include "maps\submaps\_helpers.dm"
#include "maps\submaps\poi_landmark.dm"
#include "maps\submaps\engine_submaps\engine_areas.dm"
Expand Down
Loading