No burrow surfacing on lifeboats/unburrowable areas #5603

hislittlecuzingames · 2024-01-31T06:41:17Z

About the pull request

This is to prevent burrowers from surfacing in areas marked as not tunnleable.
IE the lifeboats in an evac of the almeyer.

Explain why it's good for the game

I think surfacing was an oversight of the original burrow ability.
This will stop goofy burrows that are nonsensical like a burrower emerging inside a lifeboat during a hijack.
HOWEVER, it doesn't stop burrowers from burrowing on the almeyer. Only /area/foobar that are explicitly tagged as flags_area = AREA_NOTUNNEL cannot be emerged from now. before it was just preventing burrowing down into these tiles.

Testing Photographs and Procedure

Map changes were not included. Only code changes were made. Chance's claim is just my default map for some reason, so I used its areas and edited them temporarily for testing.

https://youtu.be/EwlO7mJ017s

Changelog

🆑
fix: fixed burrower ability. Disallowed ability to surface in areas marked as not tunnel-able.
/:cl:

cm13-github · 2024-01-31T06:41:29Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

hislittlecuzingames · 2024-01-31T06:54:46Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Yeah I gotta fix my base branch-has some artifacts.

SHould be good now.

code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm

…o-Burrow-On-Lifeboats # Conflicts: # code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm

…cuzingames/cmss13 into No-Burrow-On-Lifeboats # Conflicts: # code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm

…cuzingames/cmss13 into No-Burrow-On-Lifeboats

…find in my changes.

hislittlecuzingames · 2024-02-02T22:41:12Z

Most of the changes were to fix the small grammer stuff.

The fix is very small.

github-actions · 2024-02-10T00:57:42Z

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

Drulikar · 2024-02-12T01:02:01Z

code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm

+	var/area/current_area = get_area(T)
+	if(current_area.flags_area & AREA_NOTUNNEL)
+		to_chat(src, SPAN_XENOWARNING("There's no way to surface here!!"))
+		return
+


This is unnecessary; its already done further down at line 129/134 so should revert this change.

The difference is you spend some time trying to tunnel there and find out you can't - which is fine.

Without that code, it wouldn't work.
It lets them surface.

Did you test this? Because I can comment it out and it still is checked because its a duplicate check as I said.

So either you need to more clearly specify what conditions require this duplicate check; but I don't currently see any situation this isn't simply redundant.

code/game/area/shuttles.dm

Co-authored-by: Drathek <[email protected]>

hislittlecuzingames · 2024-02-17T05:29:54Z

Going to re-test it another day since I committed suggested changes.

Also going to verify my comment that I needed the code stated to be unnecessary.

Drulikar · 2024-02-17T07:17:55Z

code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm

+	var/area/current_area = get_area(T)
+	if(current_area.flags_area & AREA_NOTUNNEL)
+		to_chat(src, SPAN_XENOWARNING("There's no way to surface here!!"))
+		return
+


Did you test this? Because I can comment it out and it still is checked because its a duplicate check as I said.

So either you need to more clearly specify what conditions require this duplicate check; but I don't currently see any situation this isn't simply redundant.

hislittlecuzingames · 2024-02-21T07:41:43Z

I said I would test at a later date.
#5603 (comment)

# About the pull request This PR effectively revives the fix from #5603 that was allowing burrowing in lifeboats. The other grammar changes it was doing were for marines, so it would not be correct to we/our them. # Explain why it's good for the game Fixes burrowing into lifeboats. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: AtticusRezzer fix: Fixed the incorrect area flag in lifeboats allowing tunneling /:cl:

hislittlecuzingames added 18 commits November 19, 2023 23:07

Testing out a new map

6f9088e

some changes

9120bdd

Testing Areas

73b9f74

Added Flanker Zone

aa0a701

Created first drafts of first frontline combat

da281fa

Some work on combat encounters

81b5dc5

Some work on testmap

3865c5f

More detailing

7f34a3e

Lots of CC SE work

4dd36cb

Completed Version 1

9deeda7

Minor work

352a659

detailing

af248d5

backup space hulk and isaac lament

b05e787

fixed syntax

e236225

undone syntax to what it was.

70da50e

Added surface block for unable to burrow.

662fba4

added surface check.

f521199

Added no tunnel to lifeboat area.

1f383f2

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jan 31, 2024

github-actions bot added Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more labels Jan 31, 2024

hislittlecuzingames added 6 commits January 31, 2024 01:50

Delete maps/map_files/Space_Hulk/space_hulk.dmm

1dc206e

Delete maps/map_files/TestMap/TestMap.dmm

05cbb41

Delete maps/map_files/IsaacsLament/IsaacsLament.dmm

6152f1a

Update maps.dm

cc4657e

Update __game.dm

5400ee2

Update burrower_powers.dm

30bb25b

Merge branch 'master' into No-Burrow-On-Lifeboats

bfa0e49

hislittlecuzingames commented Jan 31, 2024

View reviewed changes

code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm Outdated Show resolved Hide resolved

realforest2001 marked this pull request as draft January 31, 2024 12:36

hislittlecuzingames and others added 11 commits January 31, 2024 12:07

Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into N…

68d4955

…o-Burrow-On-Lifeboats # Conflicts: # code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm

Merge branch 'No-Burrow-On-Lifeboats' of https://github.com/hislittle…

638d411

…cuzingames/cmss13 into No-Burrow-On-Lifeboats # Conflicts: # code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm

Update __game.dm

fa1a3c8

Update maps.dm

8c4a5e0

Delete maps/map_files/IsaacsLament/IsaacsLament.dmm

d890a5c

Delete maps/map_files/TestMap/TestMap.dmm

6a4b3b2

Delete maps/map_files/Space_Hulk/space_hulk.dmm

671a7e9

Fixed plural self reference for xeno flavour

2666955

removed map artifacts

d760afb

Merge branch 'No-Burrow-On-Lifeboats' of https://github.com/hislittle…

18580cb

…cuzingames/cmss13 into No-Burrow-On-Lifeboats

Removed code I don't remember writing but Git says I did and I can't …

1f5757a

…find in my changes.

hislittlecuzingames marked this pull request as ready for review January 31, 2024 18:02

Birdtalon added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Jan 31, 2024

Nanu308 removed the Mapping did you remember to save in tgm format? label Feb 2, 2024

github-actions bot added the Stale beg a maintainer to review your PR label Feb 10, 2024

Drulikar requested changes Feb 12, 2024

View reviewed changes

Drulikar added Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. and removed Stale beg a maintainer to review your PR labels Feb 12, 2024

Drulikar marked this pull request as draft February 12, 2024 01:03

Update code/game/area/shuttles.dm

9d3e7d8

Co-authored-by: Drathek <[email protected]>

Drulikar requested changes Feb 17, 2024

View reviewed changes

hislittlecuzingames closed this by deleting the head repository Feb 21, 2024

Drulikar mentioned this pull request Feb 21, 2024

Fix burrower lifeboat tunneling #5778

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

No burrow surfacing on lifeboats/unburrowable areas #5603

No burrow surfacing on lifeboats/unburrowable areas #5603

hislittlecuzingames commented Jan 31, 2024 •

edited

Loading

cm13-github commented Jan 31, 2024

hislittlecuzingames commented Jan 31, 2024

hislittlecuzingames commented Feb 2, 2024

github-actions bot commented Feb 10, 2024

Drulikar Feb 12, 2024

hislittlecuzingames Feb 17, 2024

Drulikar Feb 17, 2024

hislittlecuzingames commented Feb 17, 2024

Drulikar Feb 17, 2024

hislittlecuzingames commented Feb 21, 2024

No burrow surfacing on lifeboats/unburrowable areas #5603

No burrow surfacing on lifeboats/unburrowable areas #5603

Conversation

hislittlecuzingames commented Jan 31, 2024 • edited Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

cm13-github commented Jan 31, 2024

hislittlecuzingames commented Jan 31, 2024

hislittlecuzingames commented Feb 2, 2024

github-actions bot commented Feb 10, 2024

Drulikar Feb 12, 2024

Choose a reason for hiding this comment

hislittlecuzingames Feb 17, 2024

Choose a reason for hiding this comment

Drulikar Feb 17, 2024

Choose a reason for hiding this comment

hislittlecuzingames commented Feb 17, 2024

Drulikar Feb 17, 2024

Choose a reason for hiding this comment

hislittlecuzingames commented Feb 21, 2024

hislittlecuzingames commented Jan 31, 2024 •

edited

Loading