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

changes projectile's armor resistance flag to "armor_flag" (#65487)

Browse Source 
* IHATEVARIABLES

* removes the face
This commit is contained in:
capsaicinz
2022-03-22 17:14:53 -04:00
committed by GitHub
parent 0d4f2c1e47
commit 75f7c7a69c
31 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/field_generator.dm
+1 -1
View File
@@ -176,7 +176,7 @@ no power level overlay is currently in the overlays list.
return ..()
/obj/machinery/field/generator/bullet_act(obj/projectile/considered_bullet)
if(considered_bullet.flag != BULLET)
if(considered_bullet.armor_flag != BULLET)
power = min(power + considered_bullet.damage, field_generator_max_power)
check_power_level()
. = ..()
code/modules/power/supermatter/supermatter.dm
+1 -1
View File
@@ -890,7 +890,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
return FALSE
if(!istype(projectile.firer, /obj/machinery/power/emitter) && power_changes)
investigate_log("has been hit by [projectile] fired by [key_name(projectile.firer)]", INVESTIGATE_SUPERMATTER)
if(projectile.flag != BULLET || kiss_power)
if(projectile.armor_flag != BULLET || kiss_power)
if(kiss_power)
psyCoeff = 1
psy_overlay = TRUE