Added hug gloves as their own item, removing the feature from regular GotNS
This commit is contained in:
@@ -73,12 +73,6 @@
|
|||||||
if(warcry)
|
if(warcry)
|
||||||
M.say("[warcry]", ignore_spam = TRUE, forced = "north star warcry")
|
M.say("[warcry]", ignore_spam = TRUE, forced = "north star warcry")
|
||||||
|
|
||||||
else if(M.a_intent == INTENT_HELP)
|
|
||||||
if(target.health >= 0 && !HAS_TRAIT(target, TRAIT_FAKEDEATH)) //Can't hug people who are dying/dead
|
|
||||||
if(target.on_fire || target.lying ) //No spamming extinguishing, helping them up, or other non-hugging/patting help interactions
|
|
||||||
return
|
|
||||||
else
|
|
||||||
M.changeNext_move(CLICK_CD_RAPID)
|
|
||||||
.= FALSE
|
.= FALSE
|
||||||
|
|
||||||
|
|
||||||
@@ -86,3 +80,22 @@
|
|||||||
var/input = stripped_input(user,"What do you want your battlecry to be? Max length of 6 characters.", ,"", 7)
|
var/input = stripped_input(user,"What do you want your battlecry to be? Max length of 6 characters.", ,"", 7)
|
||||||
if(input)
|
if(input)
|
||||||
warcry = input
|
warcry = input
|
||||||
|
|
||||||
|
/obj/item/clothing/gloves/rapid/hug
|
||||||
|
name = "Hugs of the North Star"
|
||||||
|
desc = "Just looking at these fills you with an urge to hug the shit out of people"
|
||||||
|
warcry = "owo" //Shouldn't ever come into play
|
||||||
|
|
||||||
|
/obj/item/clothing/gloves/rapid/hug/Touch(mob/living/target,proximity = TRUE)
|
||||||
|
var/mob/living/M = loc
|
||||||
|
|
||||||
|
if(M.a_intent == INTENT_HELP)
|
||||||
|
if(target.health >= 0 && !HAS_TRAIT(target, TRAIT_FAKEDEATH)) //Can't hug people who are dying/dead
|
||||||
|
if(target.on_fire || target.lying ) //No spamming extinguishing, helping them up, or other non-hugging/patting help interactions
|
||||||
|
return
|
||||||
|
else
|
||||||
|
M.changeNext_move(CLICK_CD_RAPID)
|
||||||
|
. = FALSE
|
||||||
|
|
||||||
|
/obj/item/clothing/gloves/rapid/hug/attack_self(mob/user)
|
||||||
|
return FALSE
|
||||||
Reference in New Issue
Block a user