cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 23:29:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-09-01 19:02:01 +01:00
parent 31a8a82ae3 1635c36009
commit 6d4ec50e08
77 changed files with 2331 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_turfs.dm
+2 -2
View File
@@ -599,9 +599,9 @@ turf/simulated/mineral/floor/light_corner
if(is_clean)
X = new /obj/item/weapon/archaeological_find(src, new_item_type = F.find_type)
else
X = new /obj/item/weapon/ore/strangerock(src, inside_item_type = F.find_type)
X = new /obj/item/weapon/strangerock(src, inside_item_type = F.find_type)
geologic_data.UpdateNearbyArtifactInfo(src)
var/obj/item/weapon/ore/strangerock/SR = X
var/obj/item/weapon/strangerock/SR = X
SR.geologic_data = geologic_data
//some find types delete the /obj/item/weapon/archaeological_find and replace it with something else, this handles when that happens