From d6393061ac6edff662df3484f60ede80519c72b9 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 13 Jan 2024 21:18:13 +0000 Subject: [PATCH 1/2] M56D --- code/modules/cm_marines/smartgun_mount.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index b4c01a8842aa..e307ef8a611b 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -45,7 +45,7 @@ ///How many rounds are in the weapon. This is useful if we break down our guns. var/rounds = 0 ///Indicates whether the M56D will come with its folding mount already attached - var/has_mount = FALSE + var/has_mount = FALSE ///The distance this has to be away from other m56d_hmg and m56d_post to be placed. var/defense_check_range = 5 @@ -827,6 +827,9 @@ // If the user isn't a human. if(!istype(user)) return + // If the user is unconscious or dead. + if(user.stat) + return // If the user isn't actually allowed to use guns. if(!user.allow_gun_usage) From 1561c9ab1a60d85005dd7fcffad4010b44493e33 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat, 13 Jan 2024 21:20:23 +0000 Subject: [PATCH 2/2] And this too because I'm here anyway The M2C doesn't have the same problem, but dragging it onto yourself will quickly flash a progress indicator up. --- code/modules/cm_marines/m2c.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm index 742ad954c20b..4001e72b02f3 100644 --- a/code/modules/cm_marines/m2c.dm +++ b/code/modules/cm_marines/m2c.dm @@ -454,8 +454,12 @@ // DISASSEMBLY /obj/structure/machinery/m56d_hmg/auto/MouseDrop(over_object, src_location, over_location) - if(!ishuman(usr)) return + if(!ishuman(usr)) + return var/mob/living/carbon/human/user = usr + // If the user is unconscious or dead. + if(user.stat) + return if(over_object == user && in_range(src, user)) if((rounds > 0) && (user.a_intent & (INTENT_GRAB)))