cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xenoarch order (#9326)

Browse Source
This commit is contained in:
Kashargul
2024-10-27 21:29:46 +01:00
committed by GitHub
parent b247a5cb91
commit 3232c48e9d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items.dm
View File

@@ -115,8 +115,8 @@
. = ..() . = ..()
for(var/path in actions_types) for(var/path in actions_types)
add_item_action(path) 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 if(islist(origin_tech))
origin_tech = typelist(NAMEOF(src, origin_tech), origin_tech) */ origin_tech = typelist(NAMEOF(src, origin_tech), origin_tech)
if(embed_chance < 0) if(embed_chance < 0)
if(sharp) if(sharp)
embed_chance = max(5, round(force/w_class)) embed_chance = max(5, round(force/w_class))

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

@@ -679,7 +679,7 @@ var/list/mining_overlay_cache = list()
geologic_data = new /datum/geosample(src) //CHOMPEdit geologic_data = new /datum/geosample(src) //CHOMPEdit
var/obj/item/X var/obj/item/X
if(is_clean) 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 else
X = new /obj/item/strangerock(src, inside_item_type = F.find_type) X = new /obj/item/strangerock(src, inside_item_type = F.find_type)
geologic_data.UpdateNearbyArtifactInfo(src) geologic_data.UpdateNearbyArtifactInfo(src)

3
code/modules/xenoarcheaology/finds/find_spawning.dm
View File

@@ -4,7 +4,8 @@
icon_state = "ano01" icon_state = "ano01"
var/find_type = 0 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) if(new_item_type)
find_type = new_item_type find_type = new_item_type
else else

2
code/modules/xenoarcheaology/finds/finds.dm
View File

@@ -28,7 +28,7 @@
pixel_y = rand(0,8)-8 pixel_y = rand(0,8)-8
if(inside_item_type) 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) /obj/item/strangerock/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/pickaxe/brush)) if(istype(I, /obj/item/pickaxe/brush))