Further improvement of ling code

Yadda yadda
This commit is contained in:
Razharas
2013-11-17 02:09:43 +04:00
parent 453da53560
commit 6d0bbc8b24
5 changed files with 19 additions and 4 deletions
+1 -1
View File
@@ -78,7 +78,7 @@
var/obj/item/W = get_active_hand()
if(W == null || !W.no_redirection)
if(W == null || !W.abstract)
face_atom(A)
if(W == A)
+13 -1
View File
@@ -17,8 +17,17 @@
/atom/proc/attack_hand(mob/user as mob)
return
/mob/living/carbon/human/RestrainedClickOn(var/atom/A)
/*
/mob/living/carbon/human/RestrainedClickOn(var/atom/A) ---carbons will handle this
return
*/
/mob/living/carbon/RestrainedClickOn(var/atom/A)
var/obj/item/I = get_active_hand()
if(I.abstract)
I.afterattack(A)
return 1
return 0
/mob/living/carbon/human/RangedAttack(var/atom/A)
if(!gloves && !mutations.len) return
@@ -51,6 +60,7 @@
/mob/living/RestrainedClickOn(var/atom/A)
return
/*
Monkeys
*/
@@ -67,6 +77,8 @@
things considerably
*/
/mob/living/carbon/monkey/RestrainedClickOn(var/atom/A)
if(..())
return
if(a_intent != "harm" || !ismob(A)) return
if(istype(wear_mask, /obj/item/clothing/mask/muzzle))
return
@@ -656,7 +656,6 @@ var/list/datum/dna/hivemind_bank = list()
layer = 20
abstract = 1
item_state = "nothing"
no_redirection = 1
var/sting_type
var/sting_range
var/sting_cost
-1
View File
@@ -38,7 +38,6 @@
var/list/allowed = null //suit storage stuff.
var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
var/reflect_chance = 0 //This var dictates what % of a time an object will reflect an energy based weapon's shot
var/no_redirection = 0 //0 means you will change direction, it is the default setting for all items, 1 means you dont change direction when click something with this,
/obj/item/device
icon = 'icons/obj/device.dmi'
+5
View File
@@ -635,6 +635,11 @@ note dizziness decrements automatically in the mob's Life() proc.
pixel_x = old_x
pixel_y = old_y
/mob/proc/RestrainedClick(target)
var/obj/item/A = get_active_hand()
if(A.abstract)
A.afterattack(target)
/mob/Stat()
..()