cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 15:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-08-13 23:30:37 +03:00
parent fb73735ceb 97daad4782
commit 1aa305f1f9
7 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/mining/mine_items.dm
View File

@@ -1082,7 +1082,6 @@ var/list/total_extraction_beacons = list()
force = 10
throwforce = 5
origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 3)
var/currently_pulling = FALSE
/obj/item/weapon/oremagnet/attack_self(mob/user)
if (use_check(user))
@@ -1092,22 +1091,13 @@ var/list/total_extraction_beacons = list()
toggle_on(user)
/obj/item/weapon/oremagnet/process()
set waitfor = FALSE
if (currently_pulling)
return
currently_pulling = TRUE
for(var/obj/item/weapon/ore/O in oview(7,src.loc))
for(var/obj/item/weapon/ore/O in oview(7, loc))
if(prob(80))
step_to(O, src.loc, 0)
if (TICK_CHECK && QDELING(src))
if (TICK_CHECK)
return
currently_pulling = FALSE
/obj/item/weapon/oremagnet/proc/toggle_on(mob/user)
if (!isprocessing)
START_PROCESSING(SSprocessing, src)
@@ -1141,6 +1131,9 @@ var/list/total_extraction_beacons = list()
single_spark(O.loc)
do_teleport(O, user, 0)
if (TICK_CHECK)
return
/******************************Sculpting*******************************/
/obj/item/weapon/autochisel
name = "auto-chisel"