From 10c844e70d9b112bb39ccc0f469a8ca401db57a0 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 8 Dec 2019 03:36:09 -0500 Subject: [PATCH 1/9] does this even work --- code/modules/mob/living/carbon/human/human.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3ae2e3bdbd..3d4d8a3813 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -867,8 +867,9 @@ return //If you dragged them to you and you're aggressively grabbing try to fireman carry them else if(user != target) - fireman_carry(target) - return + if(user.a_intent = INTENT_HELP) + fireman_carry(target) + return . = ..() //src is the user that will be carrying, target is the mob to be carried From b015d2571a94c9dd8cc2e7281b0851b8e10ed072 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 8 Dec 2019 03:51:36 -0500 Subject: [PATCH 2/9] =?UTF-8?q?=3D=3D=3F?= --- 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 3d4d8a3813..7751095d9b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -867,7 +867,7 @@ return //If you dragged them to you and you're aggressively grabbing try to fireman carry them else if(user != target) - if(user.a_intent = INTENT_HELP) + if(user.a_intent == INTENT_HELP) fireman_carry(target) return . = ..() From 52a050e9eeb9ba029e1323875f2db75a4355fd0a Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 8 Dec 2019 03:54:02 -0500 Subject: [PATCH 3/9] maybe --- code/modules/mob/living/carbon/human/human.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7751095d9b..3cb4b5edde 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -866,8 +866,7 @@ piggyback(target) return //If you dragged them to you and you're aggressively grabbing try to fireman carry them - else if(user != target) - if(user.a_intent == INTENT_HELP) + else if(user != target && user.a_intent = INTENT_HELP) fireman_carry(target) return . = ..() From 48be47d4d1c380a5c10f9cff473c5faf614e96b4 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 8 Dec 2019 03:54:29 -0500 Subject: [PATCH 4/9] yes? --- 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 3cb4b5edde..5bbc62c3f9 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -866,7 +866,7 @@ piggyback(target) return //If you dragged them to you and you're aggressively grabbing try to fireman carry them - else if(user != target && user.a_intent = INTENT_HELP) + else if(user != target && user.a_intent == INTENT_HELP) fireman_carry(target) return . = ..() From cdda28f85ca374ff76193abb36e5e1fe0acdb3f5 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 8 Dec 2019 03:54:55 -0500 Subject: [PATCH 5/9] tabs --- 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 5bbc62c3f9..13b57b0715 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -867,8 +867,8 @@ return //If you dragged them to you and you're aggressively grabbing try to fireman carry them else if(user != target && user.a_intent == INTENT_HELP) - fireman_carry(target) - return + fireman_carry(target) + return . = ..() //src is the user that will be carrying, target is the mob to be carried From be3439e461e39a0e16375302eea4bf9bf465c654 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Wed, 11 Dec 2019 16:57:06 -0500 Subject: [PATCH 6/9] idk maybe? --- code/modules/mob/living/carbon/human/human.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 13b57b0715..b07a00e6d2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -866,9 +866,13 @@ piggyback(target) return //If you dragged them to you and you're aggressively grabbing try to fireman carry them - else if(user != target && user.a_intent == INTENT_HELP) - fireman_carry(target) + else if(user != target) + if(user.a_intent != INTENT_HELP) + to_chat(user, "You need to be in help intent to do that!") return + else if(user.a_intent == INTENT_HELP) + fireman_carry(target) + return . = ..() //src is the user that will be carrying, target is the mob to be carried From 2b8f81bca3036ed0b013e651b9df37187428c5d5 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Wed, 11 Dec 2019 17:22:14 -0500 Subject: [PATCH 7/9] idk maybe --- 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 b07a00e6d2..bd61140faa 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -867,7 +867,7 @@ return //If you dragged them to you and you're aggressively grabbing try to fireman carry them else if(user != target) - if(user.a_intent != INTENT_HELP) + if(user.a_intent == INTENT_GRAB || INTENT_DISARM || INTENT_HARM) to_chat(user, "You need to be in help intent to do that!") return else if(user.a_intent == INTENT_HELP) From b89d04884e9f06d41b6dbc011d116f0cc4b4a893 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Wed, 11 Dec 2019 17:23:00 -0500 Subject: [PATCH 8/9] indents oops --- 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 bd61140faa..0501a2a5ea 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -868,8 +868,8 @@ //If you dragged them to you and you're aggressively grabbing try to fireman carry them else if(user != target) if(user.a_intent == INTENT_GRAB || INTENT_DISARM || INTENT_HARM) - to_chat(user, "You need to be in help intent to do that!") - return + to_chat(user, "You need to be in help intent to do that!") + return else if(user.a_intent == INTENT_HELP) fireman_carry(target) return From f8a05b5ae15286d362284c9a99b7b1654609ec86 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 15 Dec 2019 17:31:49 -0500 Subject: [PATCH 9/9] perhaps --- code/modules/mob/living/carbon/human/human.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 0501a2a5ea..1e584c67c3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -867,10 +867,7 @@ return //If you dragged them to you and you're aggressively grabbing try to fireman carry them else if(user != target) - if(user.a_intent == INTENT_GRAB || INTENT_DISARM || INTENT_HARM) - to_chat(user, "You need to be in help intent to do that!") - return - else if(user.a_intent == INTENT_HELP) + if(user.a_intent == INTENT_GRAB) fireman_carry(target) return . = ..()