mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-23 05:07:51 +01:00
[MIRROR] Multi Bugfix (#12824)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
0bfbc28d10
commit
3eabaa37be
@@ -160,8 +160,13 @@
|
||||
/datum/modifier/shield_projection/tick() //When the shield generator runs out of charge, it'll remove this naturally.
|
||||
if(holder.stat == DEAD)
|
||||
expire(silent = TRUE) //If you're dead the generator stops protecting you but keeps running.
|
||||
return
|
||||
if(!shield_generator || !shield_generator.slot_check()) //No shield to begin with/shield is not on them any longer.
|
||||
expire(silent = FALSE)
|
||||
return
|
||||
if(QDELETED(energy_source) || !energy_source.charge)
|
||||
expire(silent = FALSE)
|
||||
return
|
||||
|
||||
var/shield_efficiency = (energy_source.charge/energy_source.maxcharge) //1 = complete resistance. 0 = no resistance. Must be adjusted for subtypes!
|
||||
if(!isnull(effective_damage_resistance))
|
||||
|
||||
@@ -295,8 +295,9 @@
|
||||
M.adjust_fire_stacks(-1)
|
||||
if(M.on_fire)
|
||||
src.ignite_mob()
|
||||
M.resting = 0 //Hoist yourself up up off the ground. No para/stunned/weakened removal.
|
||||
update_canmove()
|
||||
M.resting = !M.resting
|
||||
M.AdjustWeakened(-3)
|
||||
M.update_canmove()
|
||||
else if(istype(hugger))
|
||||
hugger.species.hug(hugger,src)
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user