diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index ae6fc7972fb..d1988611aad 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -8,6 +8,16 @@ var/datum/geosample/geologic_data var/material +/obj/item/ore/Crossed(AM as mob|obj) + ..() + if(ishuman(AM)) + var/mob/living/carbon/human/H = AM + var/obj/item/storage/bag/ore/S = locate() in H + if(S && (S == H.l_store || S == H.r_store || S == H.l_hand || S == H.r_hand)) + if(S.collection_mode) + attackby(S, H) + return + /obj/item/ore/uranium name = "pitchblende" icon_state = "ore_uranium" diff --git a/html/changelogs/alberyk-orecollection.yml b/html/changelogs/alberyk-orecollection.yml new file mode 100644 index 00000000000..216ad4cb43b --- /dev/null +++ b/html/changelogs/alberyk-orecollection.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Walking over mining ores with an ore bag in your hands or pockets will instantly collect the ore now."