cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 13:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6350 from Heroman3003/drillfix

Browse Source 
Fixes picking up ore after ripley digging
This commit is contained in:
Atermonera
2019-07-30 16:18:26 -08:00
committed by GitHub
parent da7ced30b9 ee6b2bbb78
commit 82ec12de80
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/mecha/equipment/tools/tools.dm
View File

@@ -166,14 +166,7 @@
if(ore_box) if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1)) for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir) if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box) ore.forceMove(ore_box)
log_message("Drilled through [target]")
if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box)
else if(target.loc == C) else if(target.loc == C)
log_message("Drilled through [target]") log_message("Drilled through [target]")
target.ex_act(2) target.ex_act(2)
@@ -219,7 +212,7 @@
if(ore_box) if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1)) for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir) if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box) ore.forceMove(ore_box)
else if(target.loc == C) else if(target.loc == C)
log_message("Drilled through [target]") log_message("Drilled through [target]")
target.ex_act(2) target.ex_act(2)
@@ -267,13 +260,7 @@
if(ore_box) if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1)) for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir) if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box) ore.forceMove(ore_box)
if(locate(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp) in chassis.equipment)
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
if(ore_box)
for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box)
else if(target.loc == C) else if(target.loc == C)
log_message("Drilled through [target]") log_message("Drilled through [target]")
target.ex_act(2) target.ex_act(2)