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.

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

Merge upstream 14.10.24 #573

Merged
merged 50 commits into from
Oct 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
91e14ba
Plasmaman Species Refactor | Jesus Christ This Hurts Edition (#87086)
SmArtKar Oct 12, 2024
993d6dd
Automatic changelog for PR #87086 [ci skip]
tgstation-ci[bot] Oct 12, 2024
a3a91f4
pet emotes, pet bonus adjustment (#87126)
Sadboysuss Oct 12, 2024
0a0d414
Automatic changelog for PR #87126 [ci skip]
tgstation-ci[bot] Oct 12, 2024
58daf1b
snore fix [no gbp] (#87168)
Sadboysuss Oct 12, 2024
cde641f
Automatic changelog for PR #87168 [ci skip]
tgstation-ci[bot] Oct 12, 2024
08ebaa1
fixes ashdrake arena attack not clearing out lavaland walls (#87160)
Ben10Omintrix Oct 12, 2024
abe52df
Automatic changelog for PR #87160 [ci skip]
tgstation-ci[bot] Oct 12, 2024
afd4932
Proofreads nebula virologist fax (#87158)
YakumoChen Oct 12, 2024
49fa660
Automatic changelog for PR #87158 [ci skip]
tgstation-ci[bot] Oct 12, 2024
bd37221
Changes incorrect override in untie shoes spell (#87183)
SmArtKar Oct 12, 2024
59f698f
Automatic changelog for PR #87183 [ci skip]
tgstation-ci[bot] Oct 12, 2024
f106b8f
Fix automatic map votes requiring manual map voting config (#87164)
FlufflesTheDog Oct 12, 2024
6639857
Better ghost tray scan (#87143)
Jewelry-x Oct 12, 2024
68e1465
Automatic changelog for PR #87143 [ci skip]
tgstation-ci[bot] Oct 12, 2024
e378b00
Removes gas mask fov, pepperspray now applies tint to masks until was…
spiders24110 Oct 12, 2024
eb593b0
Automatic changelog for PR #87102 [ci skip]
tgstation-ci[bot] Oct 12, 2024
3b444ff
DNA Infusers now check for a datum trait instead of whether non-livin…
Ghommie Oct 12, 2024
f89e9f3
Automatic changelog for PR #87154 [ci skip]
tgstation-ci[bot] Oct 12, 2024
1fa9958
All chainsaws can behead (#87145)
Sadboysuss Oct 12, 2024
26f9d63
Automatic changelog for PR #87145 [ci skip]
tgstation-ci[bot] Oct 12, 2024
3c30e56
Option to Offload non-technical PR discussion to a Discord Thread (#8…
Cyberboss Oct 12, 2024
f5825f7
Fish feed to the Library vending machine, rescue hook to the mining o…
Ghommie Oct 12, 2024
4b8a530
Automatic changelog for PR #87110 [ci skip]
tgstation-ci[bot] Oct 12, 2024
6658d9f
Pyro/Cryokinesis cast range is the same as the projectile's range. Py…
necromanceranne Oct 12, 2024
b1ab674
Automatic changelog for PR #87144 [ci skip]
tgstation-ci[bot] Oct 12, 2024
b6b9d78
Automatic changelog compile [ci skip]
tgstation-ci[bot] Oct 13, 2024
a76084b
Helmet and visor sounds (#87165)
Sadboysuss Oct 13, 2024
daca181
Automatic changelog for PR #87165 [ci skip]
tgstation-ci[bot] Oct 13, 2024
4298025
fix merge skew with cat folder [no gbp] (#87186)
Sadboysuss Oct 13, 2024
2a365a4
Fixes incorrect use of pronoun macros in multiple lives component (#8…
SmArtKar Oct 13, 2024
a253a3f
Automatic changelog for PR #87185 [ci skip]
tgstation-ci[bot] Oct 13, 2024
c3ce1c6
Offering an item displays a balloon alert to viewers (#87174)
Sadboysuss Oct 13, 2024
a5104c3
Automatic changelog for PR #87174 [ci skip]
tgstation-ci[bot] Oct 13, 2024
d12fca5
[NO GBP] Prevents ghosts from cutting tethers (#87194)
SmArtKar Oct 13, 2024
8d43cbf
Automatic changelog for PR #87194 [ci skip]
tgstation-ci[bot] Oct 13, 2024
0b02c2a
gas analyzer handling sounds (#87190)
Sadboysuss Oct 13, 2024
db034fb
Automatic changelog for PR #87190 [ci skip]
tgstation-ci[bot] Oct 13, 2024
8de35ca
you can use lizards to get lizard organs in the dna infuser (#87204)
carlarctg Oct 13, 2024
d123008
Automatic changelog for PR #87204 [ci skip]
tgstation-ci[bot] Oct 13, 2024
4452aa0
Makes the 1643 error more explicit (#87172)
MrMelbert Oct 14, 2024
55ded2d
[NO GBP] Fixes a small typo for adjusting kitsune masks (#87195)
Hardly3D Oct 14, 2024
d36865d
Automatic changelog for PR #87195 [ci skip]
tgstation-ci[bot] Oct 14, 2024
1f3382a
Automatic changelog compile [ci skip]
tgstation-ci[bot] Oct 14, 2024
aba9f59
Improvements to mech sound logic (#87184)
Jewelry-x Oct 14, 2024
29b618c
Automatic changelog for PR #87184 [ci skip]
tgstation-ci[bot] Oct 14, 2024
2b0485d
Adds a flipping skillchip, the Chipped quirk, a chip connector implan…
carlarctg Oct 14, 2024
c012027
Automatic changelog for PR #87082 [ci skip]
tgstation-ci[bot] Oct 14, 2024
79365eb
Webhook: Prevent connection errors to game servers from blocking disc…
MrsTonedOne Oct 14, 2024
252581e
Merge branch 'master-upstream' into merge-upstream
larentoun Oct 14, 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
Prev Previous commit
Next Next commit
fixes ashdrake arena attack not clearing out lavaland walls (tgstatio…
…n#87160)

## About The Pull Request
this was changed a few weeks back but wasnt actually intentional.

## Why It's Good For The Game
fixes ashdrake arena attack not clearing out lavaland walls

## Changelog
:cl:
fix: fixes ashdrake arena attack not clearing out lavaland walls
/:cl:
Ben10Omintrix authored Oct 12, 2024
commit 08ebaa16267c366ab4baf7f614a3d47e2f930475
14 changes: 10 additions & 4 deletions code/datums/actions/mobs/lava_swoop.dm
Original file line number Diff line number Diff line change
@@ -144,11 +144,17 @@
for(var/turf/T in walled)
drakewalls += new /obj/effect/temp_visual/drakewall(T) // no people with lava immunity can just run away from the attack for free
var/list/indestructible_turfs = list()
for(var/turf/T in RANGE_TURFS(2, center))
if(isindestructiblefloor(T))

for(var/turf/turf_target as anything in RANGE_TURFS(2, center))
if(isindestructiblefloor(turf_target))
continue
if(isindestructiblewall(turf_target))
indestructible_turfs += turf_target
continue
if(isindestructiblewall(T))
indestructible_turfs += T
if(ismineralturf(turf_target))
var/turf/closed/mineral/mineral_turf = turf_target
mineral_turf.gets_drilled(owner)

SLEEP_CHECK_DEATH(1 SECONDS, owner) // give them a bit of time to realize what attack is actually happening

var/list/turfs = RANGE_TURFS(2, center)