shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some extra touches

Browse Source
This commit is contained in:
SandPoot
2023-02-09 02:25:34 -03:00
parent 4491abc2d7
commit d29ce2328c
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_context.dm
+1 -1
View File
@@ -38,7 +38,7 @@
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HARM, "Attack")
// Did you know we cannot upgrade grabs from ctrl-click, that's cool
// Monkeys cannot be grabbed harder using ctrl-click, don't ask.
if((pulledby != user) && (src != user))
LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Pull")
// Happens on any intent i believe
code/modules/mob/living/carbon/human/human_context.dm
+15
View File
@@ -18,4 +18,19 @@
else if(aim_for_groin && (src == user || lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_DISARM, "Slap ass")
// Humans can actually be upgrade grabbed using ctrl-click
if(src != user)
if (pulledby == user)
switch (user.grab_state)
if (GRAB_PASSIVE)
LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Grip")
if (GRAB_AGGRESSIVE)
LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Choke")
if (GRAB_NECK)
LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Strangle")
else
return .
else
LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Pull")
return CONTEXTUAL_SCREENTIP_SET