From 8fff9a327a6ab1867b69b49de509b96f1d783f2a Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sun, 11 Oct 2015 15:58:41 -0700 Subject: [PATCH] Rigsuit Fixes: WHO DOESN'T LOVE SOME REDUNDANCY UP IN HERE --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- .../mob/living/carbon/human/human_movement.dm | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b8e58315cce..26d3aa99875 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -258,7 +258,7 @@ stat("Tank Pressure", internal.air_contents.return_pressure()) stat("Distribution Pressure", internal.distribute_pressure) - if(back && istype(back, /obj/item/weapon/rig)) + if(istype(back, /obj/item/weapon/rig)) var/obj/item/weapon/rig/suit = back var/cell_status = "ERROR" if(suit.cell) @@ -1840,4 +1840,4 @@ /mob/living/carbon/human/proc/get_full_print() if(!dna || !dna.uni_identity) return - return md5(dna.uni_identity) + return md5(dna.uni_identity) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 3a2464d013e..0e336efad26 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -60,14 +60,13 @@ //Do we have a working jetpack? var/obj/item/weapon/tank/jetpack/thrust - if(back) - if(istype(back,/obj/item/weapon/tank/jetpack)) - thrust = back - else if(istype(back,/obj/item/weapon/rig)) - var/obj/item/weapon/rig/rig = back - for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules) - thrust = module.jets - break + if(istype(back,/obj/item/weapon/tank/jetpack)) + thrust = back + else if(istype(back,/obj/item/weapon/rig)) + var/obj/item/weapon/rig/rig = back + for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules) + thrust = module.jets + break if(thrust) if((movement_dir || thrust.stabilization_on) && thrust.allow_thrust(0.01, src))