From fea0e2270cc8696c7148e7638fc37f01edcf305a Mon Sep 17 00:00:00 2001 From: cuberound <122645057+cuberound@users.noreply.github.com> Date: Wed, 13 Dec 2023 15:47:54 +0100 Subject: [PATCH 1/2] Update dropship_equipment.dm --- code/modules/cm_marines/dropship_equipment.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index b50198095aab..d944970cb4c3 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -339,9 +339,10 @@ if(ship_base.base_category == DROPSHIP_WEAPON) switch(dir) if(NORTH) - if( istype(get_step(src, WEST), /turf/open) ) + var step_contents = get_step(src, EAST).contents + if(locate(/obj/structure) in step_contents) deployed_mg.pixel_x = 5 - else if ( istype(get_step(src, EAST), /turf/open) ) + else deployed_mg.pixel_x = -5 if(EAST) deployed_mg.pixel_y = 9 @@ -368,12 +369,11 @@ if(ship_base.base_category == DROPSHIP_WEAPON) switch(dir) if(NORTH) - if( istype(get_step(src, WEST), /turf/open) ) + var step_contents = get_step(src, EAST).contents + if(locate(/obj/structure) in step_contents) deployed_mg.forceMove(get_step(src, WEST)) - else if ( istype(get_step(src, EAST), /turf/open) ) - deployed_mg.forceMove(get_step(src, EAST)) else - deployed_mg.forceMove(get_step(src, NORTH)) + deployed_mg.forceMove(get_step(src, EAST)) if(EAST) deployed_mg.forceMove(get_step(src, SOUTH)) if(WEST) From 16b691fcbb107f6b9b41f773e43b47f76a073dd6 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Thu, 21 Dec 2023 14:30:01 -0800 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: harryob --- code/modules/cm_marines/dropship_equipment.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index d944970cb4c3..bb3e642c4ac9 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -339,7 +339,7 @@ if(ship_base.base_category == DROPSHIP_WEAPON) switch(dir) if(NORTH) - var step_contents = get_step(src, EAST).contents + var/step_contents = get_step(src, EAST).contents if(locate(/obj/structure) in step_contents) deployed_mg.pixel_x = 5 else @@ -369,7 +369,7 @@ if(ship_base.base_category == DROPSHIP_WEAPON) switch(dir) if(NORTH) - var step_contents = get_step(src, EAST).contents + var/step_contents = get_step(src, EAST).contents if(locate(/obj/structure) in step_contents) deployed_mg.forceMove(get_step(src, WEST)) else