cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exoplanet Ore Patches (#16271)

Browse Source 
* the end of the beginning

* SPEED

* SPEED

* we real speed

* fix ore gen

* re-organize exoplanet stuff

* reorg and rename defines, fix ores

* Everything Else

* 1.2.0+a3 rust_g

* fix merge

* get rid of noise maps

* fix adhomai, delete random maps

* make adhomai poggers or something idk

* debug

* crystal planet, misc bugfixes

* fixes

* log

* change mineral gen to make adhomai work

* try this

* huh

* huhw

* rust_g 1.2.0+a4

* Ore Patches

* finishing touches hopefully

---------

Co-authored-by: John Wildkins <john.wildkins@gmail.com>
This commit is contained in:
Geeves
2023-06-22 22:29:48 +02:00
committed by GitHub
parent 2395a9c2ba
commit 2b70d859f0
7 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,10 @@
attached_satchel.insert_into_storage(ore)
else if(istype(get_turf(src), /turf/simulated/floor))
var/turf/simulated/floor/T = get_turf(src)
var/turf/below_turf = GetBelow(T)
if(below_turf && !istype(below_turf.loc, /area/mine) && !istype(below_turf.loc, /area/exoplanet) && !istype(below_turf.loc, /area/template_noop))
system_error("Potential station breach below.")
return
T.ex_act(2.0)
//Dig out the tasty ores.
@@ -116,6 +120,8 @@
while(length(resource_field) && !harvesting.resources)
harvesting.has_resources = FALSE
harvesting.resources = null
harvesting.cut_overlay(harvesting.resource_indicator)
QDEL_NULL(harvesting.resource_indicator)
resource_field -= harvesting
if(length(resource_field))
harvesting = pick(resource_field)
@@ -161,6 +167,8 @@
if(!found_resource)
harvesting.has_resources = FALSE
harvesting.resources = null
harvesting.cut_overlay(harvesting.resource_indicator)
QDEL_NULL(harvesting.resource_indicator)
resource_field -= harvesting
else
active = FALSE

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

@@ -407,6 +407,21 @@ var/list/mineral_can_smooth_with = list(
visible_message(SPAN_NOTICE("An old dusty crate was buried within!"))
new /obj/structure/closet/crate/secure/loot(src)
/turf/simulated/mineral/ChangeTurf(N, tell_universe, force_lighting_update, ignore_override, mapload)
var/old_has_resources = has_resources
var/list/old_resources = resources
var/image/old_resource_indicator = resource_indicator
var/turf/new_turf = ..()
new_turf.has_resources = old_has_resources
new_turf.resources = old_resources
new_turf.resource_indicator = old_resource_indicator
if(new_turf.resource_indicator)
new_turf.add_overlay(new_turf.resource_indicator)
return new_turf
/turf/simulated/mineral/proc/excavate_find(var/prob_clean = 0, var/datum/find/F)
//with skill and luck, players can cleanly extract finds
//otherwise, they come out inside a chunk of rock