cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[no gbp] Sparks don't ignite furniture (unless you made it out of plasma you fucking lunatic), sparks have a decreasing chance to ignite bigger items, small fix to obj/fire_act() signal (#84111)

Browse Source 
## About The Pull Request

Even though it's hilarious, sparks currently ignite any flammable thing
they touch whatsoever; including gigantic wooden/cloth items, or tables
and chairs. Turning areas with wooden furnitures into fields of ash
wasn't the intent, so I adjusted sparks to not ignite furniture (you can
put welding fuel under them if that's your intent) and items bigger than
small items have a steadily decreasing chance to get ignited by sparks
(normal is 50%, bulky is 20%, bigger than bulky won't ignite only from
sparks)
## Why It's Good For The Game

Even in a death trap space station of the future, sparks aren't THAT
much of a fire hazard.
## Changelog
🆑
fix: Sparks will no longer turn areas with wooden furniture or similar
into naught but a field of ashes; they no longer ignite furniture,
(unless it's made of plasma(?!)) and have a decreasing chance to ignite
items bigger than small size.
/🆑
This commit is contained in:
Joshua Kidder
2024-06-19 23:25:34 +01:00
committed by GitHub
parent c77eeb3205
commit daa34b9f19
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_sparks.dm
+20 -5
View File
@@ -74,12 +74,27 @@
if(isobj(singed))
var/obj/singed_obj = singed
if(singed_obj.resistance_flags & FLAMMABLE && !(singed_obj.resistance_flags & ON_FIRE)) //only fire_act flammable objects instead of burning EVERYTHING
singed_obj.fire_act(1,100)
if(singed_obj.reagents)
var/datum/reagents/reagents = singed_obj.reagents
reagents?.expose_temperature(1000)
return
var/datum/reagents/reagents = singed_obj.reagents // heat up things that contain reagents before we check to see if they burn
reagents?.expose_temperature(1000) // we set this at 1000 because that's the max reagent temp for a chem heater, higher temps require more than sparks
if(singed_obj.custom_materials && (GET_MATERIAL_REF(/datum/material/plasma) in singed_obj.custom_materials))
singed_obj.fire_act(FIRE_MINIMUM_TEMPERATURE_TO_SPREAD,100)
return // if it's made of plasma we just start burning no matter what, even furniture (see right below)
if(isstructure(singed_obj) || ismachinery(singed_obj)) // don't ignite furniture even if it's flammable, leave that to actual fires
return
if(singed_obj.resistance_flags & FLAMMABLE && !(singed_obj.resistance_flags & ON_FIRE)) //only fire_act flammable objects instead of burning EVERYTHING
if(isitem(singed_obj))
var/obj/item/singed_item = singed_obj
var/ignite_chance = 120 // base chance applies to anything under WEIGHT_CLASS_NORMAL, so burn everything flammable that's small/tiny
if(singed_item.w_class > WEIGHT_CLASS_SMALL)
var/ignite_chance_penalty = (singed_item.w_class * 2 + round(singed_item.w_class * 0.5)) * 10 // size penalties to ignite chance: normal = 70, bulky = 100,
ignite_chance -= ignite_chance_penalty // the bigger the item, the less likely it is to ignite
if(prob(ignite_chance))
singed_item.fire_act(FIRE_MINIMUM_TEMPERATURE_TO_SPREAD,100)
return
else
singed_obj.fire_act(FIRE_MINIMUM_TEMPERATURE_TO_SPREAD,100)
return
if(isliving(singed))
var/mob/living/singed_living = singed
if(singed_living.fire_stacks)