cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] You can now pull tails, it makes the person happy! [MDB IGNORE] (#9409)

Browse Source 
* 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

* You can now pull tails, it makes the person happy!

* no

Co-authored-by: Cimika/Lessie/KathyRyals <65850818+KathyRyals@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-11-12 12:25:19 +00:00
committed by GitHub
parent 609dda4161
commit 2e3bb5ce31
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/dcs/signals.dm
+2
View File
@@ -684,6 +684,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
code/datums/mood_events/generic_positive_events.dm
+4
View File
@@ -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
code/modules/mob/living/carbon/carbon_defense.dm
+9
View File
@@ -484,6 +484,15 @@
if(HAS_TRAIT(src, TRAIT_BADTOUCH))
to_chat(M, span_warning("[src] looks visibly upset as you pat [p_them()] on the head."))
/* SKYRAT EDIT START - Not even going to start with this one
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)
*/ // SKYRAT EDIT END
else
SEND_SIGNAL(src, COMSIG_CARBON_HUGGED, M)
SEND_SIGNAL(M, COMSIG_CARBON_HUG, M, src)