Skip to content

Commit

Permalink
Prevent open crates from being supply dropped (#6316)
Browse files Browse the repository at this point in the history
# About the pull request

Opened crates can no longer be launched via req drop pads, so empty
crates dont get launched on accident.

# Explain why it's good for the game

Really is just so QMs dont have to stand guard over their crates while
CIC launches them, so random bald CTs dont cause empty crates to be sent
by opening them.


# Testing Photographs and Procedure
Tested launching crates both from Req and CIC, open crates dont launch,
closed ones do just as intended.



# Changelog
:cl:
qol: Requisition drop pads will now no longer launch open crates
/:cl:

Co-authored-by: Rigó János <[email protected]>
  • Loading branch information
JackieEstegado and Rigó János authored May 24, 2024
1 parent 37af837 commit 3da81ec
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/game/supplyshuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,10 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The landing zone appears to be obstructed or out of bounds. Package would be lost on drop.")]")
return

if(crate.opened)
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The crate is not secure on the drop pad. Please close it!")]")
return

crate.visible_message(SPAN_WARNING("\The [crate] loads into a launch tube. Stand clear!"))
current_squad.send_message("'[crate.name]' supply drop incoming. Heads up!")
current_squad.send_maptext(crate.name, "Incoming Supply Drop:")
Expand Down
4 changes: 4 additions & 0 deletions code/modules/cm_marines/overwatch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,10 @@
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The landing zone appears to be obstructed or out of bounds. Package would be lost on drop.")]")
return

if(crate.opened)
to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("The crate is not secure on the drop pad. Get Requisitions to close the crate!")]")
return

busy = TRUE
crate.visible_message(SPAN_WARNING("\The [crate] loads into a launch tube. Stand clear!"))
SEND_SIGNAL(crate, COMSIG_STRUCTURE_CRATE_SQUAD_LAUNCHED, current_squad)
Expand Down

0 comments on commit 3da81ec

Please sign in to comment.