Skip to content

Commit

Permalink
TGS Test Merge (#16114)
Browse files Browse the repository at this point in the history
  • Loading branch information
comfyorange committed Jun 22, 2024
2 parents b3025d2 + b8a986e commit e952f7b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
2 changes: 2 additions & 0 deletions code/game/objects/structures/razorwire.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
return
if(CHECK_BITFIELD(O.pass_flags, PASS_DEFENSIVE_STRUCTURE))
return
if(HAS_TRAIT(O, TRAIT_TANK_DESANT))
return
var/mob/living/M = O
if(M.status_flags & INCORPOREAL)
return
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/structures/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@
if(!ishuman(crosser))
return

if(HAS_TRAIT(crosser, TRAIT_TANK_DESANT))
return

if(CHECK_MULTIPLE_BITFIELDS(crosser.allow_pass_flags, HOVERING))
return

Expand Down
24 changes: 17 additions & 7 deletions code/modules/projectiles/guns/_shared_ammo_objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,12 @@
burn_ticks = 12

///Effects applied to a mob that crosses a burning turf
/obj/fire/flamer/on_cross(datum/source, mob/living/crosser, oldloc, oldlocs)
. = ..()
if(istype(crosser) || isobj(crosser))
crosser.fire_act(burn_level)
/obj/fire/flamer/on_cross(datum/source, atom/movable/crosser, oldloc, oldlocs)
if(!isliving(crosser) || isobj(crosser))
return
if(HAS_TRAIT(crosser, TRAIT_TANK_DESANT))
return
crosser.fire_act(burn_level)

/obj/fire/flamer/affect_mob(mob/living/carbon/affected)
. = ..()
Expand Down Expand Up @@ -199,6 +201,13 @@
return
if(target.stat == DEAD)
return
if(status_flags & (INCORPOREAL|GODMODE))
return FALSE
if(hard_armor.getRating(FIRE) >= 100)
to_chat(src, span_warning("You are untouched by the flames."))
return FALSE
if(pass_flags & PASS_FIRE)
return FALSE
var/damage = PYROGEN_MELTING_FIRE_DAMAGE
var/datum/status_effect/stacking/melting_fire/debuff = target.has_status_effect(STATUS_EFFECT_MELTING_FIRE)
if(debuff)
Expand All @@ -207,6 +216,7 @@
target.apply_status_effect(STATUS_EFFECT_MELTING_FIRE, PYROGEN_MELTING_FIRE_EFFECT_STACK)
target.take_overall_damage(damage, BURN, FIRE, max_limbs = 2)

/obj/fire/melting_fire/on_cross(datum/source, mob/living/carbon/human/crosser, oldloc, oldlocs)
if(istype(crosser))
affect_mob(crosser)
/obj/fire/melting_fire/on_cross(datum/source, atom/movable/crosser, oldloc, oldlocs)
if(!ishuman(crosser))
return
affect_mob(crosser)

0 comments on commit e952f7b

Please sign in to comment.