mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Fixes some things that should make mining more interesting
This commit is contained in:
@@ -252,6 +252,7 @@
|
|||||||
for(var/iy = 0,iy < 5, iy++)
|
for(var/iy = 0,iy < 5, iy++)
|
||||||
for(var/ix = 0, ix < 5, ix++)
|
for(var/ix = 0, ix < 5, ix++)
|
||||||
mine_turf = locate(tx + ix, ty + iy, T.z)
|
mine_turf = locate(tx + ix, ty + iy, T.z)
|
||||||
|
if(!istype(mine_turf, /turf/space/))
|
||||||
if(mine_turf && mine_turf.has_resources)
|
if(mine_turf && mine_turf.has_resources)
|
||||||
resource_field += mine_turf
|
resource_field += mine_turf
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ var/list/mining_overlay_cache = list()
|
|||||||
var/ignore_mapgen
|
var/ignore_mapgen
|
||||||
|
|
||||||
var/ore_types = list(
|
var/ore_types = list(
|
||||||
"iron" = /obj/item/weapon/ore/iron,
|
"hematite" = /obj/item/weapon/ore/iron,
|
||||||
"uranium" = /obj/item/weapon/ore/uranium,
|
"uranium" = /obj/item/weapon/ore/uranium,
|
||||||
"gold" = /obj/item/weapon/ore/gold,
|
"gold" = /obj/item/weapon/ore/gold,
|
||||||
"silver" = /obj/item/weapon/ore/silver,
|
"silver" = /obj/item/weapon/ore/silver,
|
||||||
@@ -44,7 +44,7 @@ var/list/mining_overlay_cache = list()
|
|||||||
"osmium" = /obj/item/weapon/ore/osmium,
|
"osmium" = /obj/item/weapon/ore/osmium,
|
||||||
"hydrogen" = /obj/item/weapon/ore/hydrogen,
|
"hydrogen" = /obj/item/weapon/ore/hydrogen,
|
||||||
"silicates" = /obj/item/weapon/ore/glass,
|
"silicates" = /obj/item/weapon/ore/glass,
|
||||||
"carbonaceous rock" = /obj/item/weapon/ore/coal
|
"carbon" = /obj/item/weapon/ore/coal
|
||||||
)
|
)
|
||||||
|
|
||||||
has_resources = 1
|
has_resources = 1
|
||||||
@@ -483,6 +483,11 @@ var/list/mining_overlay_cache = list()
|
|||||||
if(prob(50))
|
if(prob(50))
|
||||||
M.Stun(5)
|
M.Stun(5)
|
||||||
M.apply_effect(25, IRRADIATE)
|
M.apply_effect(25, IRRADIATE)
|
||||||
|
if(prob(25))
|
||||||
|
excavate_find(prob(5), finds[1])
|
||||||
|
else if(rand(1,500) == 1)
|
||||||
|
visible_message("<span class='notice'>An old dusty crate was buried within!</span>")
|
||||||
|
new /obj/structure/closet/crate/secure/loot(src)
|
||||||
|
|
||||||
make_floor()
|
make_floor()
|
||||||
update_icon(1)
|
update_icon(1)
|
||||||
@@ -546,10 +551,10 @@ var/list/mining_overlay_cache = list()
|
|||||||
|
|
||||||
var/mineral_name
|
var/mineral_name
|
||||||
if(rare_ore)
|
if(rare_ore)
|
||||||
mineral_name = pickweight(list("uranium" = 10, "platinum" = 10, "iron" = 20, "coal" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20))
|
mineral_name = pickweight(list("uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20))
|
||||||
|
|
||||||
else
|
else
|
||||||
mineral_name = pickweight(list("uranium" = 5, "platinum" = 5, "iron" = 35, "coal" = 35, "diamond" = 1, "gold" = 5, "silver" = 5, "phoron" = 10))
|
mineral_name = pickweight(list("uranium" = 5, "platinum" = 5, "hematite" = 35, "carbon" = 35, "diamond" = 1, "gold" = 5, "silver" = 5, "phoron" = 10))
|
||||||
|
|
||||||
if(mineral_name && (mineral_name in ore_data))
|
if(mineral_name && (mineral_name in ore_data))
|
||||||
mineral = ore_data[mineral_name]
|
mineral = ore_data[mineral_name]
|
||||||
|
|||||||
39
html/changelogs/Anewbe - MiningFixes.yml
Normal file
39
html/changelogs/Anewbe - MiningFixes.yml
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Anewbe
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- bugfix: "Carbon and Hematite should show up in asteroid walls."
|
||||||
|
- rscadd: "Readded the random crates from mining."
|
||||||
|
- rscadd: "Digging through an artifact sometimes doesn't destroy the artifact."
|
||||||
|
- bugfix: "Space and cracked sand should no longer stop mining drills."
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
Reference in New Issue
Block a user