Skip to content

Commit

Permalink
Jumping out of a dropship heading towards an LZ now throws your body …
Browse files Browse the repository at this point in the history
…at the ground, instead of deleting it. (#5584)

<!-- 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.
-->

Jumping out of a dropship heading towards an LZ now throws your body at
the ground, instead of deleting it. This does around 500 damage, and
permanently kills you.

![image](https://github.com/cmss13-devs/cmss13/assets/91113370/6bbd7926-1f8b-4078-a1ea-2dc583725ece)

These people falling out of the sky, can land anywhere where there is no
ceiling (or a glass one). Basically anywhere you can mortar, medevac, or
laze something.

This only works if the dropship is heading towards one of the LZs, if
not, then they're deleted like normal.

I also fixed the throwing, so it doesn't appear like you're just
standing in space for 0.5 seconds before being disappeared.

I also removed some unused arguments in `take_overall_damage` and
`take_overall_armored_damage`.

It adds a bit of depth to the game, instead of your character being just
outright deleted, their body actually ends up somewhere.

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

https://github.com/cmss13-devs/cmss13/assets/91113370/a6df19dc-7f9f-4c8d-8169-2db1497b6c54

(It does play sounds when you land, you just cant really hear them in
this clip because they died.)

![image](https://github.com/cmss13-devs/cmss13/assets/91113370/b7f1bf66-fdce-4082-97c2-3fa841e168eb)

![image](https://github.com/cmss13-devs/cmss13/assets/91113370/f0819fea-4ac8-47b5-a012-f8ea12f08799)

https://github.com/cmss13-devs/cmss13/assets/91113370/f727b8f7-1df3-4725-bb82-f16dc8294eea

(Items do a little bounce when they land too)

</details>

:cl:
add: Falling out of a Dropship en route to an LZ, now lets your corpse
plummet to the ground instead of being deleted.
/:cl:

---------

Co-authored-by: private-tristan <[email protected]>
  • Loading branch information
2 people authored and Doubleumc committed Aug 3, 2024
1 parent 7edba34 commit edde0fb
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
8 changes: 8 additions & 0 deletions code/game/turfs/transit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@
shuttle_tag = DROPSHIP_NORMANDY
dir = SOUTH

/turf/open/space/transit/dropship/midway
shuttle_tag = DROPSHIP_MIDWAY
dir = SOUTH

/turf/open/space/transit/dropship/cyclone
shuttle_tag = DROPSHIP_CYCLONE
dir = SOUTH

/turf/open/space/transit/south
dir = SOUTH

Expand Down
16 changes: 14 additions & 2 deletions code/modules/shuttle/shuttles/dropship.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@
dwidth = 4
dheight = 8

/obj/docking_port/mobile/marine_dropship/midway/get_transit_path_type()
return /turf/open/space/transit/dropship/midway

/obj/docking_port/mobile/marine_dropship/upp
name = "Akademia Nauk"
id = DROPSHIP_UPP
Expand All @@ -148,15 +151,24 @@
dwidth = 4
dheight = 8

/obj/docking_port/mobile/marine_dropship/cyclone/get_transit_path_type()
return /turf/open/space/transit/dropship/cyclone

/obj/docking_port/mobile/marine_dropship/alamo
name = "Alamo"
id = DROPSHIP_ALAMO
preferred_direction = SOUTH
preferred_direction = SOUTH // If you are changing this, please update the dir of the path below as well

/obj/docking_port/mobile/marine_dropship/alamo/get_transit_path_type()
return /turf/open/space/transit/dropship/alamo

/obj/docking_port/mobile/marine_dropship/normandy
name = "Normandy"
id = DROPSHIP_NORMANDY
preferred_direction = SOUTH
preferred_direction = SOUTH // If you are changing this, please update the dir of the path below as well

/obj/docking_port/mobile/marine_dropship/normandy/get_transit_path_type()
return /turf/open/space/transit/dropship/normandy

/obj/docking_port/mobile/marine_dropship/check()
. = ..()
Expand Down

0 comments on commit edde0fb

Please sign in to comment.