From 707461981bfb03418ba3f6335447834e9a4df221 Mon Sep 17 00:00:00 2001
From: mentgah <52985409+mentgah@users.noreply.github.com>
Date: Mon, 31 Mar 2025 20:24:09 +0200
Subject: [PATCH 1/3] the handholding update
---
code/modules/mob/living/carbon/human/human.dm | 22 ++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ae01e81f787d..47548f3bc477 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -501,6 +501,7 @@
if(legcuffed)
dat += "
Legcuffed: Remove"
+ dat += "
Hold hands"
dat += {"
Close
@@ -516,7 +517,26 @@
if(usr.incapacitated() || !Adjacent(usr)|| isanimal(usr))
return
handle_strip_id(usr)
-
+ else if (href_list["want_to_hold_hands"])
+ if(usr.incapacitated() || !Adjacent(usr)|| isanimal(usr))
+ return
+ to_chat(usr, "You try to hold hands with [src].")
+ switch(alert(src, "[usr] wants to hold hands with you!", , "Yes", "No"))
+ if("Yes")
+ if(!Adjacent(usr))
+ to_chat(usr, "You need to stay still to hold hands.")
+ to_chat(src, "[usr] moved away.")//What an asshole
+ var/image/heart = image('icons/mob/animal.dmi',src,"heart-ani2")
+ heart.pixel_y = 7
+ heart.plane = ABOVE_HUMAN_PLANE
+ flick_overlay(heart, list(src.client,usr.client), 20)
+ heart = image('icons/mob/animal.dmi',usr,"heart-ani2")
+ heart.pixel_y = 7
+ heart.plane = ABOVE_HUMAN_PLANE
+ flick_overlay(heart, list(src.client,usr.client), 20)
+ src.visible_message("[usr] holds hands with [src].")
+ if("No")
+ src.visible_message("[usr] tried to hold hands with [src] but \he didn't want to.")
else if(href_list["pockets"]) //href_list "pockets" would be "left" or "right"
if(usr.incapacitated() || !Adjacent(usr)|| isanimal(usr))
return
From beec1c4a49f29ace167571a1e91525665dedfeac Mon Sep 17 00:00:00 2001
From: mentgah <52985409+mentgah@users.noreply.github.com>
Date: Mon, 31 Mar 2025 20:41:32 +0200
Subject: [PATCH 2/3] more emotionally charged Yes/No options
---
code/modules/mob/living/carbon/human/human.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 47548f3bc477..ca7a54f01039 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -521,7 +521,7 @@
if(usr.incapacitated() || !Adjacent(usr)|| isanimal(usr))
return
to_chat(usr, "You try to hold hands with [src].")
- switch(alert(src, "[usr] wants to hold hands with you!", , "Yes", "No"))
+ switch(alert(src, "[usr] wants to hold hands with you!", , "Yes!", "No, I'm a fucking loser."))
if("Yes")
if(!Adjacent(usr))
to_chat(usr, "You need to stay still to hold hands.")
From fec786ccc2cfd65e0617458d13cd943bb098c98d Mon Sep 17 00:00:00 2001
From: mentgah <52985409+mentgah@users.noreply.github.com>
Date: Mon, 31 Mar 2025 20:45:40 +0200
Subject: [PATCH 3/3] whoops
---
code/modules/mob/living/carbon/human/human.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ca7a54f01039..bd4f9c222cb5 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -522,7 +522,7 @@
return
to_chat(usr, "You try to hold hands with [src].")
switch(alert(src, "[usr] wants to hold hands with you!", , "Yes!", "No, I'm a fucking loser."))
- if("Yes")
+ if("Yes!")
if(!Adjacent(usr))
to_chat(usr, "You need to stay still to hold hands.")
to_chat(src, "[usr] moved away.")//What an asshole
@@ -535,7 +535,7 @@
heart.plane = ABOVE_HUMAN_PLANE
flick_overlay(heart, list(src.client,usr.client), 20)
src.visible_message("[usr] holds hands with [src].")
- if("No")
+ if("No, I'm a fucking loser.")
src.visible_message("[usr] tried to hold hands with [src] but \he didn't want to.")
else if(href_list["pockets"]) //href_list "pockets" would be "left" or "right"
if(usr.incapacitated() || !Adjacent(usr)|| isanimal(usr))