Fixes conflicts, dang it people if(src != user.l_hand && src != user.r_hand) is shit code, shiiiiiiiiiiit.

This commit is contained in:
Remie Richards
2016-09-10 20:42:34 +01:00
parent c50fa5729c
commit 8dd507995a
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -172,7 +172,7 @@
prepared = TRUE
user << "<span class='notice'>You prepare [src].</span>"
var/obj/item/ash_flora/A = new prepared_type(get_turf(src))
if(src in get_both_hands(user))
if(user.is_holding(src))
user.unEquip(src, TRUE)
user.put_in_hands(A)
qdel(src)
@@ -829,7 +829,7 @@
else
user << "<span class='warning'>You need to be on solid ground to produce a rune!</span>"
return
if(src != user.l_hand && src != user.r_hand) //you need to hold the staff to teleport
if(!user.is_holding(src)) //you need to hold the staff to teleport
user << "<span class='warning'>You need to hold the staff in your hands to [rune ? "teleport with it":"create a rune"]!</span>"
return
if(get_dist(user, rune) <= 2) //rune too close abort