mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 01:53:35 +01:00
Re-enables sign emote for carbons and fixes signal emote for carbons. Adds finger restrictions to signal emote (#29872)
* re-enables signal emote for carbons * move checks to signal rather than sign, ceil and floor it, round it * Update code/modules/mob/living/carbon/human/human_emote.dm Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
@@ -140,8 +140,6 @@
|
||||
message = "signs."
|
||||
message_param = "signs the number %t."
|
||||
param_desc = "number(0-10)"
|
||||
// Humans get their own proc since they have fingers
|
||||
mob_type_blacklist_typecache = list(/mob/living/carbon/human)
|
||||
hands_use_check = TRUE
|
||||
target_behavior = EMOTE_TARGET_BHVR_NUM
|
||||
|
||||
|
||||
@@ -513,6 +513,19 @@
|
||||
message_param = "raises %t fingers."
|
||||
mob_type_allowed_typecache = list(/mob/living/carbon/human)
|
||||
|
||||
/datum/emote/living/carbon/sign/signal/run_emote(mob/user, params, type_override, intentional)
|
||||
var/fingers = round(text2num(params), 1)
|
||||
|
||||
if(fingers > 10)
|
||||
to_chat(user, "<span class='warning'>You don't have enough fingers!</span>")
|
||||
return TRUE
|
||||
else if(fingers < 0)
|
||||
to_chat(user, "<span class='warning'>You're not entirely sure how to raise negative fingers.</span>")
|
||||
return TRUE
|
||||
|
||||
params = fingers
|
||||
return ..()
|
||||
|
||||
/////////
|
||||
// Species-specific emotes
|
||||
|
||||
|
||||
Reference in New Issue
Block a user