From 6f20e343f6cbc506874816e9c86ec89c09fbe495 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 16 Oct 2016 20:28:02 -0400 Subject: [PATCH 1/4] No more human jetpacks --- code/modules/mob/living/carbon/human/human_movement.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index cf66c1d2c15..884a89ace95 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -68,6 +68,8 @@ if(..()) return 1 + if(pulling && istype(pulling, /mob/living/carbon/human)) + stop_pulling() //Do we have a working jetpack? var/obj/item/weapon/tank/jetpack/thrust if(istype(back,/obj/item/weapon/tank/jetpack)) From d12cf4b298bf33ca997b2e80ae405cc304a6dd59 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 20 Oct 2016 23:24:08 -0400 Subject: [PATCH 2/4] Revert "No more human jetpacks" This reverts commit 6f20e343f6cbc506874816e9c86ec89c09fbe495. --- code/modules/mob/living/carbon/human/human_movement.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 884a89ace95..cf66c1d2c15 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -68,8 +68,6 @@ if(..()) return 1 - if(pulling && istype(pulling, /mob/living/carbon/human)) - stop_pulling() //Do we have a working jetpack? var/obj/item/weapon/tank/jetpack/thrust if(istype(back,/obj/item/weapon/tank/jetpack)) From 0e3f9e63341fea32a9a2462ab25777bce857ae58 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 21 Oct 2016 21:25:40 -0400 Subject: [PATCH 3/4] Breaking the bond of love ...Coderchat is fun --- code/game/atoms_movable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 0dd6c109170..7f4b0574450 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -179,7 +179,7 @@ if(has_gravity(src)) return 1 - if(pulledby) + if(pulledby && !pulledby.pulling) return 1 if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier From c0f28fd0aa3afc6466074faba89967847e5a3834 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 9 Nov 2016 00:51:54 -0500 Subject: [PATCH 4/4] fix a ref id error --- code/modules/recycling/conveyor2.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 2a36ba585df..1e56d9d6d57 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -300,7 +300,7 @@ /obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P) return {" "}