cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Why is this a thing, really (#16169)

Browse Source
This commit is contained in:
SabreML
2021-06-17 10:23:14 +01:00
committed by GitHub
parent 5de0ebddaf
commit 75375efce9
5 changed files with 4 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+4 -11
View File
@@ -138,7 +138,7 @@
on_CD = handle_emote_CD()
if("clap", "claps")
on_CD = handle_emote_CD()
if("kiss", "kisses", "slap", "slaps")
if("slap", "slaps")
on_CD = handle_emote_CD(3 SECONDS)
//Everything else, including typos of the above emotes
else
@@ -516,17 +516,10 @@
m_type = 1
if("kiss", "kisses")
var/kiss_type = /obj/item/kisser
var/M = handle_emote_param(param)
if(HAS_TRAIT(src, TRAIT_KISS_OF_DEATH))
kiss_type = /obj/item/kisser/death
var/obj/item/kiss_blower = new kiss_type(src)
if(put_in_hands(kiss_blower))
to_chat(src, "<span class='notice'>You ready your kiss-blowing hand.</span>")
else
qdel(kiss_blower)
to_chat(src, "<span class='warning'>You're incapable of blowing a kiss in your current state.</span>")
message = "<B>[src]</B> blows a kiss[M ? " at [M]" : ""]."
m_type = 1
if("blush", "blushes")
message = "<B>[src]</B> blushes."