mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Port /datum/status_effect and convert wetness and fire stacks to it (#11666)
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
0000fce008
commit
9f292671ae
@@ -173,7 +173,8 @@
|
||||
|
||||
/obj/item/material/sword/rapier/solar/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
|
||||
. = ..()
|
||||
target.add_modifier(/datum/modifier/fire/weak, 12 SECONDS) //should be 12 damage?
|
||||
target.adjust_fire_stacks(10)
|
||||
target.ignite_mob()
|
||||
|
||||
//Icicle
|
||||
/obj/item/gun/energy/icelauncher
|
||||
|
||||
@@ -360,7 +360,11 @@ ANT STRUCTURES
|
||||
|
||||
/obj/effect/ant_structure/trap/burn
|
||||
icon_state = "burn_trap"
|
||||
modifiertype = /datum/modifier/fire/weak
|
||||
//No modifier.
|
||||
|
||||
/obj/effect/ant_structure/trap/burn/attack_mob(mob/living/L)
|
||||
L.adjust_fire_stacks(5)
|
||||
L.ignite_mob()
|
||||
|
||||
/obj/effect/ant_structure/trap/slowdown
|
||||
icon_state = "slow_trap"
|
||||
|
||||
@@ -175,7 +175,8 @@
|
||||
/mob/living/simple_mob/animal/tyr/explode_beetle/apply_melee_effects(var/atom/A)
|
||||
if(isliving(A))
|
||||
var/mob/living/L = A
|
||||
L.add_modifier(/datum/modifier/fire, 3 SECONDS)
|
||||
L.adjust_fire_stacks(3)
|
||||
L.ignite_mob()
|
||||
|
||||
/mob/living/simple_mob/animal/tyr/glowing_beetle
|
||||
name = "glowing beetle"
|
||||
|
||||
@@ -53,11 +53,16 @@
|
||||
armor_penetration = 40 //Large pointy crystal
|
||||
damage_type = BRUTE
|
||||
check_armour = "bullet"
|
||||
modifier_type_to_apply = /datum/modifier/fire/weak
|
||||
modifier_duration = 0.05 MINUTE
|
||||
range = 12
|
||||
hud_state = "laser_sniper"
|
||||
|
||||
/obj/item/projectile/energy/flamecrystal/on_hit(atom/target, blocked = 0, def_zone)
|
||||
. = ..()
|
||||
if(isliving(target))
|
||||
var/mob/living/L = target
|
||||
L.adjust_fire_stacks(5)
|
||||
L.ignite_mob()
|
||||
|
||||
/obj/item/projectile/bullet/flamegun
|
||||
use_submunitions = 1
|
||||
only_submunitions = 1
|
||||
|
||||
@@ -32,7 +32,8 @@
|
||||
/mob/living/simple_mob/slime/feral/orange/apply_melee_effects(var/atom/A)
|
||||
if(isliving(A))
|
||||
var/mob/living/L = A
|
||||
L.add_modifier(/datum/modifier/fire, 5 SECONDS)
|
||||
L.adjust_fire_stacks(5)
|
||||
L.ignite_mob()
|
||||
|
||||
|
||||
/mob/living/simple_mob/slime/feral/blue
|
||||
|
||||
@@ -74,11 +74,16 @@
|
||||
armor_penetration = 15
|
||||
my_chems = list(REAGENT_ID_FUEL, REAGENT_ID_MOLD)
|
||||
flammability = 0.25
|
||||
modifier_type_to_apply = /datum/modifier/fire
|
||||
modifier_duration = 6 SECONDS
|
||||
color = "#38b9ff"
|
||||
speed = 3.2
|
||||
|
||||
/obj/item/projectile/energy/blob/moth/on_hit(atom/target, blocked = 0, def_zone)
|
||||
. = ..()
|
||||
if(isliving(target))
|
||||
var/mob/living/L = target
|
||||
L.adjust_fire_stacks(10)
|
||||
L.ignite_mob()
|
||||
|
||||
/obj/item/projectile/bullet/pistol/medium/ap/eclipse
|
||||
ricochets = 1
|
||||
ricochets_max = 8
|
||||
|
||||
@@ -650,7 +650,7 @@
|
||||
/datum/reagent/ethanol/mauna_loa/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(prob(10))
|
||||
M.adjust_fire_stacks(5*removed)
|
||||
M.IgniteMob()
|
||||
M.ignite_mob()
|
||||
|
||||
/datum/reagent/ethanol/hiveminderaser
|
||||
name = REAGENT_HIVEMINDERASER
|
||||
|
||||
@@ -339,7 +339,7 @@
|
||||
M.remove_a_modifier_of_type(/datum/modifier/grievous_wounds)
|
||||
M.remove_a_modifier_of_type(/datum/modifier/deep_wounds)
|
||||
M.remove_a_modifier_of_type(/datum/modifier/hivebot_weaken)
|
||||
M.remove_a_modifier_of_type(/datum/modifier/fire)
|
||||
M.extinguish_mob()
|
||||
M.remove_a_modifier_of_type(/datum/modifier/berserk_exhaustion)
|
||||
M.remove_a_modifier_of_type(/datum/modifier/entangled)
|
||||
M.remove_a_modifier_of_type(/datum/modifier/wizfire)
|
||||
|
||||
Reference in New Issue
Block a user