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

white phosphorus smoke can no longer override stronger flames #6137

Merged
merged 9 commits into from
Apr 20, 2024
Merged

white phosphorus smoke can no longer override stronger flames #6137

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
46189db
Update rocket.dm
iloveloopers Apr 12, 2024
879de8c
Merge branch 'cmss13-devs:master' into WP-rocket
iloveloopers Apr 13, 2024
c13a7a0
Update rocket.dm
iloveloopers Apr 13, 2024
4428cae
Merge branch 'cmss13-devs:master' into WP-rocket
iloveloopers Apr 14, 2024
0816480
Update rocket.dm
iloveloopers Apr 14, 2024
77a3e18
Update rocket.dm
iloveloopers Apr 14, 2024
8e7831a
Update smoke.dm
iloveloopers Apr 14, 2024
7e0bb79
Update smoke.dm
iloveloopers Apr 14, 2024
6dd2332
Update smoke.dm
iloveloopers Apr 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
4 changes: 2 additions & 2 deletions code/game/objects/effects/effect_system/smoke.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@
if(isyautja(M) || isxeno(M))
burn_damage *= xeno_yautja_reduction

var/reagent = new /datum/reagent/napalm/ut()
M.burn_skin(burn_damage)
M.adjust_fire_stacks(applied_fire_stacks)
M.fire_reagent = new /datum/reagent/napalm/ut()
M.adjust_fire_stacks(applied_fire_stacks, reagent)
M.IgniteMob()
M.updatehealth()

Expand Down
Loading