From 20352ddf0c8ef3ca9bc398910778dc4b1f7d61d6 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 24 Sep 2017 11:57:07 -0400 Subject: [PATCH 1/8] Allows resting people to get off the ground w/ assistance. --- code/modules/mob/living/carbon/carbon.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index fb4c3f50f95..c71d2316d56 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -258,7 +258,16 @@ "You shake [src] trying to wake [t_him] up!") else var/mob/living/carbon/human/hugger = M - if(istype(hugger)) + if(M.resting == 1) //Are they resting on the ground? + M.visible_message("[M] grabs onto [src] and pulls theirself up off the ground!", \ + "You grip onto [src] and pull yourself up off the ground!") + M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. + if(M.fire_stacks >= (src.fire_stacks + 3)) //Fire checks. + src.fire_stacks += 1 + M.fire_stacks -= 1 + if(M.on_fire) + src.IgniteMob() + else if(istype(hugger)) hugger.species.hug(hugger,src) else M.visible_message("[M] hugs [src] to make [t_him] feel better!", \ From 1b8cbd3b7869d259b2fa2f6988fa14745633bad0 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 24 Sep 2017 12:10:17 -0400 Subject: [PATCH 2/8] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c71d2316d56..deaf5b25fb2 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -259,12 +259,12 @@ else var/mob/living/carbon/human/hugger = M if(M.resting == 1) //Are they resting on the ground? - M.visible_message("[M] grabs onto [src] and pulls theirself up off the ground!", \ + M.visible_message("[M] grabs onto [src] and pulls [get_visible_gender() == MALE ? "himself" : get_visible_gender() == FEMALE ? "herself" : "themselves"] up off the ground!", \ "You grip onto [src] and pull yourself up off the ground!") M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. if(M.fire_stacks >= (src.fire_stacks + 3)) //Fire checks. - src.fire_stacks += 1 - M.fire_stacks -= 1 + src.adjust_fire_stacks(1) + M.adjust_fire_stacks(-1) if(M.on_fire) src.IgniteMob() else if(istype(hugger)) @@ -273,8 +273,8 @@ M.visible_message("[M] hugs [src] to make [t_him] feel better!", \ "You hug [src] to make [t_him] feel better!") if(M.fire_stacks >= (src.fire_stacks + 3)) - src.fire_stacks += 1 - M.fire_stacks -= 1 + src.adjust_fire_stacks(1) + M.adjust_fire_stacks(-1) if(M.on_fire) src.IgniteMob() AdjustParalysis(-3) From 05a4b1a31f46657aa8f255d864c75807ef088502 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 24 Sep 2017 12:10:53 -0400 Subject: [PATCH 3/8] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index deaf5b25fb2..e8ba56fac66 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -259,7 +259,7 @@ else var/mob/living/carbon/human/hugger = M if(M.resting == 1) //Are they resting on the ground? - M.visible_message("[M] grabs onto [src] and pulls [get_visible_gender() == MALE ? "himself" : get_visible_gender() == FEMALE ? "herself" : "themselves"] up off the ground!", \ + M.visible_message("[M] grabs onto [src] and pulls [M.get_visible_gender() == MALE ? "himself" : get_visible_gender() == FEMALE ? "herself" : "themselves"] up off the ground!", \ "You grip onto [src] and pull yourself up off the ground!") M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. if(M.fire_stacks >= (src.fire_stacks + 3)) //Fire checks. From a752b2ac39e58a0ad91407afe68a71027db07dca Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 24 Sep 2017 12:24:27 -0400 Subject: [PATCH 4/8] Adds delay, fixes gender check. --- code/modules/mob/living/carbon/carbon.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e8ba56fac66..4d391a129cc 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -259,14 +259,15 @@ else var/mob/living/carbon/human/hugger = M if(M.resting == 1) //Are they resting on the ground? - M.visible_message("[M] grabs onto [src] and pulls [M.get_visible_gender() == MALE ? "himself" : get_visible_gender() == FEMALE ? "herself" : "themselves"] up off the ground!", \ - "You grip onto [src] and pull yourself up off the ground!") - M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. + M.visible_message("[M] grabs onto [src] and pulls \himself ", \ + "You grip onto [src] and pull yourself up off the ground!") //AHHH gender checks are hard, but this should work if(M.fire_stacks >= (src.fire_stacks + 3)) //Fire checks. src.adjust_fire_stacks(1) M.adjust_fire_stacks(-1) if(M.on_fire) src.IgniteMob() + sleep(5) //.5 second delay. Makes it a bit stronger than just typing rest. + M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. else if(istype(hugger)) hugger.species.hug(hugger,src) else From a71b7c599bce8901b9099883133ed3b00cfeb3e5 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 24 Sep 2017 12:27:25 -0400 Subject: [PATCH 5/8] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 4d391a129cc..b459040d9b9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -267,7 +267,7 @@ if(M.on_fire) src.IgniteMob() sleep(5) //.5 second delay. Makes it a bit stronger than just typing rest. - M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. + M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. else if(istype(hugger)) hugger.species.hug(hugger,src) else From 3113e37afa1f01fe99a2111cb20d6b409a7298b1 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 24 Sep 2017 12:55:59 -0400 Subject: [PATCH 6/8] Update carbon.dm --- code/modules/mob/living/carbon/carbon.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index b459040d9b9..ae94791899a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -266,8 +266,8 @@ M.adjust_fire_stacks(-1) if(M.on_fire) src.IgniteMob() - sleep(5) //.5 second delay. Makes it a bit stronger than just typing rest. - M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. + if(do_after(user, 0.5 SECONDS)) //.5 second delay. Makes it a bit stronger than just typing rest. + M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. else if(istype(hugger)) hugger.species.hug(hugger,src) else From 67d3d1b890b19159353cec423e26c94c0bb29d44 Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 24 Sep 2017 13:13:42 -0400 Subject: [PATCH 7/8] Whoops --- code/modules/mob/living/carbon/carbon.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index ae94791899a..536a7c7f5f9 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -260,13 +260,13 @@ var/mob/living/carbon/human/hugger = M if(M.resting == 1) //Are they resting on the ground? M.visible_message("[M] grabs onto [src] and pulls \himself ", \ - "You grip onto [src] and pull yourself up off the ground!") //AHHH gender checks are hard, but this should work + "You grip onto [src] and pull yourself up off the ground!") //AHHH gender checks are hard, but this should work if(M.fire_stacks >= (src.fire_stacks + 3)) //Fire checks. src.adjust_fire_stacks(1) M.adjust_fire_stacks(-1) if(M.on_fire) src.IgniteMob() - if(do_after(user, 0.5 SECONDS)) //.5 second delay. Makes it a bit stronger than just typing rest. + if(do_after(M, 0.5 SECONDS)) //.5 second delay. Makes it a bit stronger than just typing rest. M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal. else if(istype(hugger)) hugger.species.hug(hugger,src) From b41c2fec9a1320c1d63dcd34c8670b587a11e85e Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 24 Sep 2017 13:26:38 -0400 Subject: [PATCH 8/8] One final fix --- code/modules/mob/living/carbon/carbon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 536a7c7f5f9..1f70ad54ed1 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -259,7 +259,7 @@ else var/mob/living/carbon/human/hugger = M if(M.resting == 1) //Are they resting on the ground? - M.visible_message("[M] grabs onto [src] and pulls \himself ", \ + M.visible_message("[M] grabs onto [src] and pulls \himself up", \ "You grip onto [src] and pull yourself up off the ground!") //AHHH gender checks are hard, but this should work if(M.fire_stacks >= (src.fire_stacks + 3)) //Fire checks. src.adjust_fire_stacks(1)