From 71eef5de4142eb61e1ad6280b0d5b2aa2637cab2 Mon Sep 17 00:00:00 2001
From: S34NW <12197162+S34NW@users.noreply.github.com>
Date: Fri, 25 Jun 2021 13:17:26 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=94=20Come=20get=20your=20early=20retu?=
=?UTF-8?q?rns=20here!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
code/game/mecha/equipment/tools/work_tools.dm | 47 +++++++++----------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 0573ef0bfb7..7d73bd617c2 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -41,27 +41,28 @@
chassis.occupant.dust()
SM.Bumped(chassis)
return
-
- if(!O.anchored)
- if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
- chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
- O.anchored = TRUE
- if(do_after_cooldown(target))
- cargo_holder.cargo += O
- O.loc = chassis
- O.anchored = FALSE
- occupant_message("[target] successfully loaded.")
- log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
- else
- O.anchored = initial(O.anchored)
- else
- occupant_message("Not enough room in cargo compartment!")
- else
+ if(O.anchored)
occupant_message("[target] is firmly secured!")
+ return
+ if(cargo_holder.cargo.len >= cargo_holder.cargo_capacity)
+ occupant_message("Not enough room in cargo compartment!")
+ return
+ chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
+ O.anchored = TRUE
+ if(!do_after_cooldown(target))
+ O.anchored = initial(O.anchored)
+ return
+ cargo_holder.cargo += O
+ O.loc = chassis
+ O.anchored = FALSE
+ occupant_message("[target] successfully loaded.")
+ log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
+ return
- else if(istype(target,/mob/living))
+ if(istype(target,/mob/living))
var/mob/living/M = target
- if(M.stat == DEAD) return
+ if(M.stat == DEAD)
+ return
if(chassis.occupant.a_intent == INTENT_HARM)
M.take_overall_damage(dam_force)
if(!M)
@@ -72,12 +73,10 @@
"You hear something crack.")
add_attack_logs(chassis.occupant, M, "Squeezed with [src] ([uppertext(chassis.occupant.a_intent)]) ([uppertext(damtype)])")
start_cooldown()
- else
- step_away(M,chassis)
- occupant_message("You push [target] out of the way.")
- chassis.visible_message("[chassis] pushes [target] out of the way.")
- return 1
-
+ return
+ step_away(M,chassis)
+ occupant_message("You push [target] out of the way.")
+ chassis.visible_message("[chassis] pushes [target] out of the way.")
//This is pretty much just for the death-ripley