Uses squeak component to do this, fixes broken stuff & Travis

This commit is contained in:
Citinited
2019-01-26 13:21:03 +00:00
parent 27b7c87585
commit eebd8d782f
10 changed files with 70 additions and 69 deletions
+2 -1
View File
@@ -121,7 +121,8 @@
span = mind.speech_span
if((COMIC in mutations) \
|| (locate(/obj/item/organ/internal/cyberimp/brain/clown_voice) in internal_organs) \
|| istype(get_item_by_slot(slot_wear_mask), /obj/item/clothing/mask/gas/voice/clown))
|| istype(get_item_by_slot(slot_wear_mask), /obj/item/clothing/mask/gas/voice/clown) \
|| GetComponent(/datum/component/jestosterone))
span = "sans"
var/list/parent = ..()
@@ -389,7 +389,7 @@
target.forcesay(GLOB.hit_appends)
else if(target.lying)
target.forcesay(GLOB.hit_appends)
target.SendSignal(COMSIG_PARENT_ATTACKBY, target)
SEND_SIGNAL(target, COMSIG_PARENT_ATTACKBY)
/datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
if(target.check_block()) //cqc
+2 -2
View File
@@ -508,7 +508,7 @@
var/turf/T = loc
. = ..()
if(.)
SendSignal(COMSIG_MOVABLE_MOVED, src)
SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED)
handle_footstep(loc)
step_count++
@@ -883,7 +883,7 @@
// If we're pulling something then drop what we're currently pulling and pull this instead.
AM.add_fingerprint(src)
if(pulling)
if(AM == pulling)// Are we trying to pull something we are already pulling? Then just stop here, no need to continue.
if(AM == pulling)// Are we trying to pull something we are already pulling? Then just stop here, no need to continue.
return
stop_pulling()
if(AM.pulledby)
@@ -333,7 +333,6 @@
return FALSE
if(INTENT_HARM)
M.do_attack_animation(src)
SendSignal(COMSIG_ATOM_ATTACK_ALIEN, src)
return TRUE
if(INTENT_DISARM)
M.do_attack_animation(src, ATTACK_EFFECT_DISARM)