cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes an oversight with tail pulling and the Bad Touch trait [MDB IGNORE] (#9542)

Browse Source 
* Fixes an oversight with tail pulling and the Bad Touch trait

* Fex

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-11-18 13:01:22 +00:00
committed by GitHub
co-authored by necromanceranne GoldenAlpharex
parent cbbb3fdc7d
commit 0d6fdb3943
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defense.dm
+4 -1
View File
@@ -491,7 +491,10 @@
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)
if(HAS_TRAIT(src, TRAIT_BADTOUCH)) //How dare they!
to_chat(M, span_warning("[src] makes a grumbling noise as you pull on [p_their()] tail."))
else
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "tailpulled", /datum/mood_event/tailpulled)
*/ // SKYRAT EDIT END
else
SEND_SIGNAL(src, COMSIG_CARBON_HUGGED, M)