Skip to content

Commit

Permalink
custom research chemicals with an intensityfire above or equal to 50 …
Browse files Browse the repository at this point in the history
…will now burn white (#6521)

# About the pull request
title

# Explain why it's good for the game
warns the player of the high damage flame
super cool OB looking white flame very cool

# Testing Photographs and Procedure


https://github.com/cmss13-devs/cmss13/assets/140007537/484f7045-cd5e-45da-9822-b587cec7ea5d

# Changelog
:cl:
balance: Custom research chemicals with an intensityfire above or equal
to 50 will now burn white.
/:cl:
  • Loading branch information
iloveloopers authored Jun 22, 2024
1 parent b3b2da1 commit 8f8cb95
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3235,7 +3235,7 @@ Defined in conflicts.dm of the #defines folder.
ammo_datum.flamer_reagent_id = flamer_reagent.id
P.generate_bullet(ammo_datum)
P.icon_state = "naptha_ball"
P.color = flamer_reagent.color
P.color = flamer_reagent.burncolor
P.hit_effect_color = flamer_reagent.burncolor
P.fire_at(target, user, user, max_range, AMMO_SPEED_TIER_2, null)
var/turf/user_turf = get_turf(user)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/reagents/chemistry_properties/prop_positive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,11 @@
holder.durationfire = max(holder.durationfire, 1)
holder.intensityfire = max(holder.intensityfire, 1)

if(holder.intensityfire >= 50 && istype(holder, /datum/reagent/generated))
holder.burncolor = "#ffffff"
else
holder.burncolor = holder.color

/datum/chem_property/positive/fire/fueling
name = PROPERTY_FUELING
code = "FUL"
Expand Down

0 comments on commit 8f8cb95

Please sign in to comment.