cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/reagents/reagent_containers/inhaler.dm
This commit is contained in:
skull132
2018-08-05 20:29:03 +03:00
parent f1dd7d562d 1635533d57
commit b6e8ae4d53
43 changed files with 207 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_turfs.dm
+2 -5
View File
@@ -342,9 +342,6 @@ var/list/mineral_can_smooth_with = list(
new /obj/structure/sculpting_block(src)
GetDrilled(1)
else
return attack_hand(user)
/turf/simulated/mineral/proc/clear_ore_effects()
if (my_mineral)
qdel(my_mineral)
@@ -517,8 +514,8 @@ var/list/mineral_can_smooth_with = list(
add_fingerprint(user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(ishuman(user))
var/mob/living/carbon/human/H
if(ishuman(user) && user.a_intent == I_GRAB)
var/mob/living/carbon/human/H = user
var/turf/destination = GetAbove(H)
if(destination)