mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
*hand, or That /One/ Emote You Always Felt Was Missing (#71600)
## About The Pull Request It's happened to me _repeatedly_ that I'd see someone down on the floor, and wanted to just, give them a hand, so they could take it and get up that way, without just, directly clicking on them, since that's a little bland. I've also wanted to just, offer my hand to someone so they could grab it, so that I could pull them alongside me, rather than just targeting one of their arms and ctrl-clicking them. I've had this idea for a _long_ time, and only just decided to do this today. Now, I know what you might say. "Golden, that's a lot of code for something this simple!" You're not wrong. _However_. I decided to go along and to give some more love to the `/datum/status_effect/offering` status effect and the offering-related alerts, to make them a lot more versatile and a lot less hardcoded. Hence the whole "refactoring" part of this. Of course, when I add something, I don't do it half-way. So, the way the emote works is much like the `*slap` emote, except that: - When you click on someone, it does the exact same as if you were offering the item to them, except that it's targeted (much like ctrl-shift-click). - If there's nobody directly adjacent to you, it won't do anything. - If there's at least one person lying down around you, you will offer them your help to get up. Should they take your hand and let you help them up, you will both receive a simple memory about being helped up (or helping up), as well as a 45-seconds-long small mood buff, because it feels nice to be on either end of such a friendly gesture. If they get up, they automatically get disqualified from being offered some help standing up, and likewise, if you lie down, that offer goes away as well. - If there's at least one person around you, you will instead extend your hand in their direction, for them to grab onto it. Should they do so, you will then grab them by their arms and pull them. I reworked the offering status effect to no longer have a hardcoded `can_hold_items()` check, so that kisses and the hand offering would no longer need you to have free hands to complete. The logic here is that you can still pull someone even with both hands filled, so I figured I'd leave it this way. Note: If anyone would like to give the item a better sprite, by all means, go ahead, that'd be amazing. I'm just not really a great spriter and couldn't be bothered to waste hours making a very _meh_ hand. ## Why It's Good For The Game It's fluff, and nice fluff at that. It makes it easier for people to be nice to one-another without having to necessarily spend so long writing up an emote that the person on the floor will already have gotten back up. I'm sure the MRP folks will like it, and I'm certain the HRP downstreams will love it too ;) ## Changelog 🆑 add: Added the *hand emote, which you can offer to someone standing up in order to give them the possibility to grab onto your hand and let you drag them away, or to someone lying down to help them back up, which always makes everyone involved a little happier! refactor: De-hardcoded and genericized a lot of the offering status effect and alert code, to make it require a lot less copy-paste to handle new cases. fix: Offering a kiss no longer requires the receiver to have free hands to accept said kiss! /🆑
This commit is contained in:
GoldenAlpharex
@@ -313,7 +313,7 @@
|
||||
user.visible_message("<b>[span_danger("[user] slams [user.p_their()] fist down on [table]!")]</b>", "<b>[span_danger("You slam your fist down on [table]!")]</b>")
|
||||
qdel(src)
|
||||
|
||||
/obj/item/hand_item/slapper/on_offered(mob/living/carbon/offerer)
|
||||
/obj/item/hand_item/slapper/on_offered(mob/living/carbon/offerer, mob/living/carbon/offered)
|
||||
. = TRUE
|
||||
|
||||
if(!(locate(/mob/living/carbon) in orange(1, offerer)))
|
||||
@@ -363,6 +363,109 @@
|
||||
taker.add_mood_event("high_five", /datum/mood_event/high_five)
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/item/hand_item/hand
|
||||
name = "hand"
|
||||
desc = "Sometimes, you just want to act gentlemanly."
|
||||
icon_state = "latexballon"
|
||||
inhand_icon_state = "nothing"
|
||||
|
||||
|
||||
/obj/item/hand_item/hand/pre_attack(mob/living/carbon/help_target, mob/living/carbon/helper, params)
|
||||
if(!loc.Adjacent(help_target) || !istype(helper) || !istype(help_target))
|
||||
return ..()
|
||||
|
||||
if(helper.resting)
|
||||
to_chat(helper, span_warning("You can't act gentlemanly when you're lying down!"))
|
||||
return TRUE
|
||||
|
||||
|
||||
/obj/item/hand_item/hand/pre_attack_secondary(mob/living/carbon/help_target, mob/living/carbon/helper, params)
|
||||
if(!loc.Adjacent(help_target) || !istype(helper) || !istype(help_target))
|
||||
return ..()
|
||||
|
||||
if(helper.resting)
|
||||
to_chat(helper, span_warning("You can't act gentlemanly when you're lying down!"))
|
||||
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
|
||||
|
||||
return SECONDARY_ATTACK_CALL_NORMAL
|
||||
|
||||
|
||||
/obj/item/hand_item/hand/attack(mob/living/carbon/target_mob, mob/living/carbon/user, params)
|
||||
if(!loc.Adjacent(target_mob) || !istype(user) || !istype(target_mob))
|
||||
return TRUE
|
||||
|
||||
user.give(target_mob)
|
||||
return TRUE
|
||||
|
||||
|
||||
/obj/item/hand_item/hand/on_offered(mob/living/carbon/offerer, mob/living/carbon/offered)
|
||||
. = TRUE
|
||||
|
||||
if(!istype(offerer))
|
||||
return
|
||||
|
||||
if(offerer.body_position == LYING_DOWN)
|
||||
to_chat(offerer, span_warning("You can't act gentlemanly when you're lying down!"))
|
||||
return
|
||||
|
||||
if(!offered)
|
||||
offered = locate(/mob/living/carbon) in orange(1, offerer)
|
||||
|
||||
if(offered && istype(offered) && offered.body_position == LYING_DOWN)
|
||||
offerer.visible_message(span_notice("[offerer] offers [offerer.p_their()] hand to [offered], looking to help them up!"),
|
||||
span_notice("You offer [offered] your hand, to try to help them up!"), null, 2)
|
||||
|
||||
offerer.apply_status_effect(/datum/status_effect/offering/no_item_received/needs_resting, src, /atom/movable/screen/alert/give/hand/helping, offered)
|
||||
return
|
||||
|
||||
offerer.visible_message(span_notice("[offerer] extends out [offerer.p_their()] hand."),
|
||||
span_notice("You extend out your hand."), null, 2)
|
||||
|
||||
offerer.apply_status_effect(/datum/status_effect/offering/no_item_received, src, /atom/movable/screen/alert/give/hand)
|
||||
return
|
||||
|
||||
|
||||
/obj/item/hand_item/hand/on_offer_taken(mob/living/carbon/offerer, mob/living/carbon/taker)
|
||||
. = TRUE
|
||||
|
||||
if(taker.body_position == LYING_DOWN)
|
||||
taker.help_shake_act(offerer)
|
||||
|
||||
if(taker.body_position == LYING_DOWN)
|
||||
return // That didn't help them. Awkwaaaaard.
|
||||
|
||||
offerer.visible_message(span_notice("[offerer] helps [taker] up!"), span_nicegreen("You help [taker] up!"), span_hear("You hear someone helping someone else up!"), ignored_mobs = taker)
|
||||
to_chat(taker, span_nicegreen("You take [offerer]'s hand, letting [offerer.p_them()] help your up! How nice of them!"))
|
||||
|
||||
offerer.mind.add_memory(MEMORY_HELPED_UP, list(DETAIL_DEUTERAGONIST = taker), story_value = STORY_VALUE_OKAY)
|
||||
taker.mind.add_memory(MEMORY_HELPED_UP, list(DETAIL_DEUTERAGONIST = offerer), story_value = STORY_VALUE_OKAY)
|
||||
|
||||
offerer.add_mood_event("helping_up", /datum/mood_event/helped_up, taker, TRUE) // Different IDs because you could be helped up and then help someone else up.
|
||||
taker.add_mood_event("helped_up", /datum/mood_event/helped_up, offerer, FALSE)
|
||||
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
if(taker.buckled?.buckle_prevents_pull)
|
||||
return // Can't start pulling them if they're buckled and that prevents pulls.
|
||||
|
||||
// We do a little switcheroo to ensure that it displays the pulling message that mentions
|
||||
// taking taker by their hands.
|
||||
var/offerer_zone_selected = offerer.zone_selected
|
||||
offerer.zone_selected = "r_arm"
|
||||
var/did_we_pull = offerer.start_pulling(taker) // Will return either null or FALSE. We only want to silence FALSE.
|
||||
offerer.zone_selected = offerer_zone_selected
|
||||
|
||||
if(did_we_pull == FALSE)
|
||||
return // That didn't work for one reason or the other. No need to display anything.
|
||||
|
||||
to_chat(offerer, span_notice("[taker] takes your hand, allowing you to pull [taker.p_them()] along."))
|
||||
to_chat(taker, span_notice("You take [offerer]'s hand, which allows [offerer.p_them()] to pull you along. How polite!"))
|
||||
|
||||
qdel(src)
|
||||
|
||||
|
||||
/obj/item/hand_item/stealer
|
||||
name = "steal"
|
||||
desc = "Your filthy little fingers are ready to commit crimes."
|
||||
@@ -427,14 +530,14 @@
|
||||
blown_kiss.fire()
|
||||
qdel(src)
|
||||
|
||||
/obj/item/hand_item/kisser/on_offered(mob/living/carbon/offerer)
|
||||
/obj/item/hand_item/kisser/on_offered(mob/living/carbon/offerer, mob/living/carbon/offered)
|
||||
if(!(locate(/mob/living/carbon) in orange(1, offerer)))
|
||||
return TRUE
|
||||
|
||||
cheek_kiss = (offerer.zone_selected != BODY_ZONE_PRECISE_MOUTH)
|
||||
offerer.visible_message(span_notice("[offerer] leans in slightly, offering a kiss[cheek_kiss ? " on the cheek" : ""]!"),
|
||||
span_notice("You lean in slightly, indicating you'd like to offer a kiss[cheek_kiss ? " on the cheek" : ""]!"), null, 2)
|
||||
offerer.apply_status_effect(/datum/status_effect/offering, src)
|
||||
offerer.apply_status_effect(/datum/status_effect/offering/no_item_received, src)
|
||||
return TRUE
|
||||
|
||||
/obj/item/hand_item/kisser/on_offer_taken(mob/living/carbon/offerer, mob/living/carbon/taker)
|
||||
|
||||
Reference in New Issue
Block a user