mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 23:27:34 +01:00
You can now pull tails, it makes the person happy! (#62763)
About The Pull Request You can now pull on tails and it makes the person happy! It was supposed to just be felinid but it changed when mothblocks requested I check for tails! Why It's Good For The Game Cute interaction with our cat friends. And Lizards. And anything with a tail. Changelog cl add: You can now pull on a felinid's tail to make them happy! /cl
This commit is contained in:
@@ -687,6 +687,8 @@
|
||||
#define COMSIG_CARBON_HUGGED "carbon_hugged"
|
||||
///When a carbon mob is headpatted, this is called on the carbon that is headpatted. (mob/living/headpatter)
|
||||
#define COMSIG_CARBON_HEADPAT "carbon_headpatted"
|
||||
///When a carbon mob has their tail pulled, this is called on the carbon that is the target. (mob/living/tailpuller)
|
||||
#define COMSIG_CARBON_TAILPULL "carbon_tailpulled"
|
||||
///Before a carbon mob is shoved, sent to the turf we're trying to shove onto (mob/living/carbon/shover, mob/living/carbon/target)
|
||||
#define COMSIG_CARBON_DISARM_PRESHOVE "carbon_disarm_preshove"
|
||||
#define COMSIG_CARBON_ACT_SOLID (1<<0) //Tells disarm code to act as if the mob was shoved into something solid, even we we're not
|
||||
|
||||
@@ -24,6 +24,10 @@
|
||||
mood_change = 1
|
||||
timeout = 2 MINUTES
|
||||
|
||||
/datum/mood_event/tailpulled
|
||||
description = "<span class='nicegreen'>I love getting my tail pulled!</span>\n"
|
||||
mood_change = 5
|
||||
timeout = 2 MINUTES
|
||||
/datum/mood_event/arcade
|
||||
description = "<span class='nicegreen'>I beat the arcade game!</span>\n"
|
||||
mood_change = 3
|
||||
|
||||
@@ -417,6 +417,13 @@
|
||||
if(HAS_TRAIT(src, TRAIT_BADTOUCH))
|
||||
to_chat(M, span_warning("[src] looks visibly upset as you pat [p_them()] on the head."))
|
||||
|
||||
else if ((M.zone_selected == BODY_ZONE_PRECISE_GROIN) && !isnull(src.getorgan(/obj/item/organ/tail)))
|
||||
SEND_SIGNAL(src, COMSIG_CARBON_TAILPULL, M)
|
||||
M.visible_message(span_notice("[M] pulls on [src]'s tail!"), \
|
||||
null, span_hear("You hear a soft patter."), DEFAULT_MESSAGE_RANGE, list(M, src))
|
||||
to_chat(M, span_notice("You pull on [src]'s tail!"))
|
||||
to_chat(src, span_notice("[M] pulls on your tail!"))
|
||||
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "tailpulled", /datum/mood_event/tailpulled)
|
||||
else
|
||||
SEND_SIGNAL(src, COMSIG_CARBON_HUGGED, M)
|
||||
SEND_SIGNAL(M, COMSIG_CARBON_HUG, M, src)
|
||||
|
||||
Reference in New Issue
Block a user