Skip to content

Revert "Fire colony" #81

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

Merged
Zenith00000 merged 1 commit into from
May 8, 2026
Merged

Revert "Fire colony" #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 2 additions & 16 deletions code/datums/components/damage_over_time.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,20 @@
var/cause_path
/// Whether the damage is considered to be from an environmental source
var/enviro = FALSE
/// Whether the DOT applies fire stacks or not
var/apply_fire = FALSE
/// stuff for fire stacks
var/burn_reagent = /datum/reagent/napalm/ut
var/burn_stacks = 30

/// Parent as a living mob
var/mob/living/living_parent

/datum/component/damage_over_time/InheritComponent(cause_path, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult, pred_dmg_mult, warning_message, enviro, apply_fire, burn_reagent, burn_stacks)
/datum/component/damage_over_time/InheritComponent(cause_path, dam_amount, dam_type, target_temp, temp_delta, synth_dmg_mult, pred_dmg_mult, warning_message, enviro)
return // Ultimately just here to suppress named arg errors

/datum/component/damage_over_time/Initialize(cause_path, dam_amount=5, dam_type=BURN, target_temp=T90C, temp_delta=5, synth_dmg_mult=0.5, pred_dmg_mult=0.5, warning_message="You feel your body start to shake as the scalding water sears your skin, heat overwhelming your senses...", enviro=FALSE, apply_fire=FALSE, burn_reagent = /datum/reagent/napalm/ut, burn_stacks = 30)
/datum/component/damage_over_time/Initialize(cause_path, dam_amount=5, dam_type=BURN, target_temp=T90C, temp_delta=5, synth_dmg_mult=0.5, pred_dmg_mult=0.5, warning_message="You feel your body start to shake as the scalding water sears your skin, heat overwhelming your senses...", enviro=FALSE)
src.dam_amount = dam_amount
src.dam_type = dam_type
src.target_temp = target_temp
src.temp_delta = temp_delta
src.cause_path = cause_path
src.enviro = enviro
src.apply_fire = apply_fire
src.burn_reagent = burn_reagent
src.burn_stacks = burn_stacks

living_parent = parent

Expand Down Expand Up @@ -86,12 +78,6 @@
living_parent.bodytemperature -= temp_delta
else
living_parent.bodytemperature = target_temp
if(apply_fire)
if(ispath(burn_reagent))
var/datum/reagent/temp = burn_reagent
burn_reagent = GLOB.chemical_reagents_list[initial(temp.id)]
living_parent.TryIgniteMob(burn_stacks, burn_reagent) //30 burn stacks, proc needs a reagent to work.


/datum/component/damage_over_time/RegisterWithParent()
START_PROCESSING(SSdcs, src)
Expand Down
31 changes: 0 additions & 31 deletions code/modules/fire_colony/lava.dm
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion colonialmarines.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,7 +1931,6 @@
#include "code\modules\events\destructible_terrain.dm"
#include "code\modules\events\inflation.dm"
#include "code\modules\events\nothing_happens.dm"
#include "code\modules\fire_colony\lava.dm"
#include "code\modules\fishing\bait\generic.dm"
#include "code\modules\fishing\datums\generic.dm"
#include "code\modules\fishing\datums\helpers.dm"
Expand Down
Loading