From 3232c48e9de2068d834751f508ee4e934c1362a5 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Sun, 27 Oct 2024 21:29:46 +0100 Subject: [PATCH] Xenoarch order (#9326) --- code/game/objects/items.dm | 4 ++-- code/modules/mining/mine_turfs.dm | 2 +- code/modules/xenoarcheaology/finds/find_spawning.dm | 3 ++- code/modules/xenoarcheaology/finds/finds.dm | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 10aeda384b..85f4550068 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -115,8 +115,8 @@ . = ..() for(var/path in actions_types) add_item_action(path) - /* if(islist(origin_tech)) // CHOMPAdded section, removed because it has a major flaw. If an item has a different origin list than the other items of the same type, they coulf all get that modified list - origin_tech = typelist(NAMEOF(src, origin_tech), origin_tech) */ + if(islist(origin_tech)) + origin_tech = typelist(NAMEOF(src, origin_tech), origin_tech) if(embed_chance < 0) if(sharp) embed_chance = max(5, round(force/w_class)) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index cad10bbcae..67dca2c116 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -679,7 +679,7 @@ var/list/mining_overlay_cache = list() geologic_data = new /datum/geosample(src) //CHOMPEdit var/obj/item/X if(is_clean) - X = new /obj/item/archaeological_find(src, new_item_type = F.find_type) + X = new /obj/item/archaeological_find(src, F.find_type) // CHOMPEdit else X = new /obj/item/strangerock(src, inside_item_type = F.find_type) geologic_data.UpdateNearbyArtifactInfo(src) diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index c48b4c0516..0288729505 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -4,7 +4,8 @@ icon_state = "ano01" var/find_type = 0 -/obj/item/archaeological_find/New(loc, var/new_item_type) +/obj/item/archaeological_find/Initialize(mapload, var/new_item_type) // CHOMPEdit NEW -> Initialize + . = ..() if(new_item_type) find_type = new_item_type else diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index 2dd956bc27..c7bc1279f3 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -28,7 +28,7 @@ pixel_y = rand(0,8)-8 if(inside_item_type) - new /obj/item/archaeological_find(src, new_item_type = inside_item_type) + new /obj/item/archaeological_find(src, inside_item_type) // CHOMPEdit /obj/item/strangerock/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/pickaxe/brush))