cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6200 from Heroman3003/xenoarch-fixes

Browse Source 
Fixes some xenoarch bugs
This commit is contained in:
Neerti
2019-06-09 11:46:06 -04:00
committed by VirgoBot
parent f28098c0f2
commit 4512cd7b18
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_turfs.dm
+2 -1
View File
@@ -561,7 +561,8 @@ var/list/mining_overlay_cache = list()
else
X = new /obj/item/weapon/ore/strangerock(src, inside_item_type = F.find_type)
geologic_data.UpdateNearbyArtifactInfo(src)
X:geologic_data = geologic_data
var/obj/item/weapon/ore/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
//yuck
code/modules/xenoarcheaology/finds/find_spawning.dm
+6 -2
View File
@@ -355,8 +355,8 @@
//new_item = new /obj/item/weapon/fossil/base(src.loc)
//the replacement item propogation isn't working, and it's messy code anyway so just do it here
var/list/candidates = list("/obj/item/weapon/fossil/bone"=9,"/obj/item/weapon/fossil/skull"=3,
"/obj/item/weapon/fossil/skull/horned"=2)
var/list/candidates = list(/obj/item/weapon/fossil/bone = 9,/obj/item/weapon/fossil/skull = 3,
/obj/item/weapon/fossil/skull/horned = 2)
var/spawn_type = pickweight(candidates)
new_item = new spawn_type(src.loc)
@@ -605,6 +605,10 @@
new_item.origin_tech[TECH_ARCANE] = 1
new_item.origin_tech[TECH_PRECURSOR] = 1
var/turf/simulated/mineral/T = get_turf(new_item)
if(istype(T))
T.last_find = new_item
qdel(src)
else if(talkative)
code/modules/xenoarcheaology/finds/fossils.dm
+3 -6
View File
@@ -10,13 +10,10 @@
var/animal = 1
/obj/item/weapon/fossil/base/New()
var/list/l = list("/obj/item/weapon/fossil/bone"=9,"/obj/item/weapon/fossil/skull"=3,
"/obj/item/weapon/fossil/skull/horned"=2)
var/list/l = list(/obj/item/weapon/fossil/bone = 9,/obj/item/weapon/fossil/skull = 3,
/obj/item/weapon/fossil/skull/horned = 2)
var/t = pickweight(l)
var/obj/item/weapon/W = new t(src.loc)
var/turf/T = get_turf(src)
if(istype(T, /turf/simulated/mineral))
T:last_find = W
new t(src.loc)
qdel(src)
/obj/item/weapon/fossil/bone