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

No burrow surfacing on lifeboats/unburrowable areas #5603

Closed
wants to merge 40 commits into from
Closed

No burrow surfacing on lifeboats/unburrowable areas #5603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6f9088e
Testing out a new map
hislittlecuzingames Nov 20, 2023
9120bdd
some changes
hislittlecuzingames Nov 21, 2023
73b9f74
Testing Areas
hislittlecuzingames Nov 21, 2023
aa0a701
Added Flanker Zone
hislittlecuzingames Nov 22, 2023
da281fa
Created first drafts of first frontline combat
hislittlecuzingames Nov 27, 2023
81b5dc5
Some work on combat encounters
hislittlecuzingames Nov 27, 2023
3865c5f
Some work on testmap
hislittlecuzingames Dec 1, 2023
7f34a3e
More detailing
hislittlecuzingames Dec 1, 2023
4dd36cb
Lots of CC SE work
hislittlecuzingames Dec 2, 2023
9deeda7
Completed Version 1
hislittlecuzingames Dec 2, 2023
352a659
Minor work
hislittlecuzingames Dec 2, 2023
af248d5
detailing
hislittlecuzingames Dec 2, 2023
b05e787
backup space hulk and isaac lament
hislittlecuzingames Jan 28, 2024
e236225
fixed syntax
hislittlecuzingames Jan 31, 2024
70da50e
undone syntax to what it was.
hislittlecuzingames Jan 31, 2024
662fba4
Added surface block for unable to burrow.
hislittlecuzingames Jan 31, 2024
f521199
added surface check.
hislittlecuzingames Jan 31, 2024
1f383f2
Added no tunnel to lifeboat area.
hislittlecuzingames Jan 31, 2024
1dc206e
Delete maps/map_files/Space_Hulk/space_hulk.dmm
hislittlecuzingames Jan 31, 2024
05cbb41
Delete maps/map_files/TestMap/TestMap.dmm
hislittlecuzingames Jan 31, 2024
6152f1a
Delete maps/map_files/IsaacsLament/IsaacsLament.dmm
hislittlecuzingames Jan 31, 2024
cc4657e
Update maps.dm
hislittlecuzingames Jan 31, 2024
5400ee2
Update __game.dm
hislittlecuzingames Jan 31, 2024
30bb25b
Update burrower_powers.dm
hislittlecuzingames Jan 31, 2024
bfa0e49
Merge branch 'master' into No-Burrow-On-Lifeboats
hislittlecuzingames Jan 31, 2024
1ea2143
Update burrower_powers.dm
hislittlecuzingames Jan 31, 2024
437f82f
Update burrower_powers.dm
hislittlecuzingames Jan 31, 2024
b3b9f8a
Update burrower_powers.dm
hislittlecuzingames Jan 31, 2024
68d4955
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into N…
hislittlecuzingames Jan 31, 2024
638d411
Merge branch 'No-Burrow-On-Lifeboats' of https://github.com/hislittle…
hislittlecuzingames Jan 31, 2024
fa1a3c8
Update __game.dm
hislittlecuzingames Jan 31, 2024
8c4a5e0
Update maps.dm
hislittlecuzingames Jan 31, 2024
d890a5c
Delete maps/map_files/IsaacsLament/IsaacsLament.dmm
hislittlecuzingames Jan 31, 2024
6a4b3b2
Delete maps/map_files/TestMap/TestMap.dmm
hislittlecuzingames Jan 31, 2024
671a7e9
Delete maps/map_files/Space_Hulk/space_hulk.dmm
hislittlecuzingames Jan 31, 2024
2666955
Fixed plural self reference for xeno flavour
hislittlecuzingames Jan 31, 2024
d760afb
removed map artifacts
hislittlecuzingames Jan 31, 2024
18580cb
Merge branch 'No-Burrow-On-Lifeboats' of https://github.com/hislittle…
hislittlecuzingames Jan 31, 2024
1f5757a
Removed code I don't remember writing but Git says I did and I can't …
hislittlecuzingames Jan 31, 2024
9d3e7d8
Update code/game/area/shuttles.dm
hislittlecuzingames Feb 17, 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
2 changes: 1 addition & 1 deletion code/game/area/shuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@
/area/shuttle/lifeboat
icon = 'icons/turf/area_almayer.dmi'
icon_state = "lifeboat"
flags_atom = AREA_NOTUNNEL
flags_area = AREA_NOTUNNEL
11 changes: 8 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@
to_chat(src, SPAN_NOTICE("We must be burrowed to do this."))
return

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

Comment on lines +101 to +105
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

image

if(tunnel)
tunnel = FALSE
to_chat(src, SPAN_NOTICE("We stop tunneling."))
Expand Down Expand Up @@ -156,7 +161,7 @@
addtimer(CALLBACK(src, PROC_REF(process_tunnel), T), 1 SECONDS)

/mob/living/carbon/xenomorph/proc/do_tunnel(turf/T)
to_chat(src, SPAN_NOTICE("We tunnel to your destination."))
to_chat(src, SPAN_NOTICE("We tunnel to our destination."))
anchored = FALSE
forceMove(T)
burrow_off()
Expand Down Expand Up @@ -211,14 +216,14 @@
used_tremor = 1

for(var/mob/living/carbon/carbon_target in range(7, loc))
to_chat(carbon_target, SPAN_WARNING("You struggle to remain on your feet as the ground shakes beneath your feet!"))
to_chat(carbon_target, SPAN_WARNING("We struggle to remain on our feet as the ground shakes beneath our feet!"))
shake_camera(carbon_target, 2, 3)
if(get_dist(loc, carbon_target) <= 3 && !src.can_not_harm(carbon_target))
if(carbon_target.mob_size >= MOB_SIZE_BIG)
carbon_target.apply_effect(1, SLOW)
else
carbon_target.apply_effect(1, WEAKEN)
to_chat(carbon_target, SPAN_WARNING("The violent tremors make you lose your footing!"))
to_chat(carbon_target, SPAN_WARNING("The violent tremors make us lose our footing!"))

spawn(caste.tremor_cooldown)
used_tremor = 0
Expand Down
Loading