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

[MIRROR] Multi Bugfix (#12824)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-06-19 12:02:42 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent 0bfbc28d10
commit 3eabaa37be
22 changed files with 109 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/_modifiers/modifiers_vr.dm
+5
View File
@@ -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))