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

[MIRROR] Defines damage flags. (Hopefully without 50+ commits) (#491)

Browse Source 
* Defines damage flags. (#53158)

* Defines damage flags. (Hopefully without 50+ commits)

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
This commit is contained in:
SkyratBot
2020-08-24 22:52:31 +02:00
committed by GitHub
co-authored by TemporalOroboros
parent a6c3cbb8e3
commit 3bd294f26f
278 changed files with 731 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/field_generator.dm
+2 -2
View File
@@ -34,7 +34,7 @@ field_generator power level display
max_integrity = 500
CanAtmosPass = ATMOS_PASS_YES
//100% immune to lasers and energy projectiles since it absorbs their energy.
armor = list("melee" = 25, "bullet" = 10, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
armor = list(MELEE = 25, BULLET = 10, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70)
var/power_level = 0
var/active = FG_OFFLINE
var/power = 20 // Current amount of power
@@ -163,7 +163,7 @@ field_generator power level display
..()
/obj/machinery/field/generator/bullet_act(obj/projectile/Proj)
if(Proj.flag != "bullet")
if(Proj.flag != BULLET)
power = min(power + Proj.damage, field_generator_max_power)
check_power_level()
. = ..()