Skip to content

Commit

Permalink
Fix dropship equipment infinite loop (#5823)
Browse files Browse the repository at this point in the history
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->
Resolves issue patched by
cmss13-devs/cmss13#5817
Bugs are bad

<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>

:cl:
code: removed duplicated signal code from dropship equipment
/:cl:
  • Loading branch information
mullenpaul authored and Doubleumc committed Jul 25, 2024
1 parent 169e26e commit effc9ad
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/modules/cm_marines/dropship_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
var/skill_required = SKILL_PILOT_TRAINED
var/combat_equipment = TRUE


/obj/structure/dropship_equipment/Destroy()
QDEL_NULL(ammo_equipped)
if(linked_shuttle)
Expand All @@ -35,6 +36,7 @@
linked_console = null
. = ..()


/obj/structure/dropship_equipment/attack_alien(mob/living/carbon/xenomorph/current_xenomorph)
if(unslashable)
return XENO_NO_DELAY_ACTION
Expand Down

0 comments on commit effc9ad

Please sign in to comment.