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

[MIRROR] Improves Kissing (#3167)

Browse Source 
* Improves Kissing (#56698)

Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Improves Kissing

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-07 09:41:24 +00:00
committed by GitHub
co-authored by Mothblocks Ryll Ryll
parent 1e872324d7
commit 731a995bcf
16 changed files with 429 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+18 -4
View File
@@ -738,14 +738,28 @@
return TRUE
/**
* Cleans the lips of any lipstick. Returns TRUE if the lips had any lipstick and was thus cleaned
* Used to update the makeup on a human and apply/remove lipstick traits, then store/unstore them on the head object in case it gets severed
*/
/mob/living/carbon/human/proc/update_lips(new_style, new_colour, apply_trait)
lip_style = new_style
lip_color = new_colour
update_body()
var/obj/item/bodypart/head/hopefully_a_head = get_bodypart(BODY_ZONE_HEAD)
REMOVE_TRAITS_IN(src, LIPSTICK_TRAIT)
hopefully_a_head?.stored_lipstick_trait = null
if(new_style && apply_trait)
ADD_TRAIT(src, apply_trait, LIPSTICK_TRAIT)
hopefully_a_head?.stored_lipstick_trait = apply_trait
/**
* A wrapper for [mob/living/carbon/human/proc/update_lips] that tells us if there were lip styles to change
*/
/mob/living/carbon/human/proc/clean_lips()
if(isnull(lip_style) && lip_color == initial(lip_color))
return FALSE
lip_style = null
lip_color = initial(lip_color)
update_body()
update_lips(null)
return TRUE
/**
code/modules/mob/living/emote.dm
+16 -2
View File
@@ -200,8 +200,22 @@
/datum/emote/living/kiss
key = "kiss"
key_third_person = "kisses"
message = "blows a kiss."
message_param = "blows a kiss to %t."
/datum/emote/living/kiss/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(!.)
return
var/kiss_type = /obj/item/kisser
if(HAS_TRAIT(user, TRAIT_KISS_OF_DEATH))
kiss_type = /obj/item/kisser/death
var/obj/item/kiss_blower = new kiss_type(user)
if(user.put_in_hands(kiss_blower))
to_chat(user, "<span class='notice'>You ready your kiss-blowing hand.</span>")
else
qdel(kiss_blower)
to_chat(user, "<span class='warning'>You're incapable of blowing a kiss in your current state.</span>")
/* SKYRAT EDIT REMOVAL - EMOTES - MOVED TO EMOTES.DM MODULAR
/datum/emote/living/laugh