Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes dead marines being able to use the M56D #5451

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Fixes dead marines being able to use the M56D #5451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d639306
M56D
SabreML Jan 13, 2024
1561c9a
And this too because I'm here anyway
SabreML Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion code/modules/cm_marines/m2c.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
5 changes: 4 additions & 1 deletion code/modules/cm_marines/smartgun_mount.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
Loading