[MIRROR] Deletes magic armor [MDB IGNORE] (#9330)

* Deletes magic armor (#62594)

* Deletes magic armor

* removes arcane barrage's 0 armor penetration

* makes magic use NO flags. Get fucked.

* Deletes magic armor

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-11-09 13:09:46 +00:00
committed by GitHub
parent d666734423
commit bd39aef673
6 changed files with 14 additions and 27 deletions

View File

@@ -126,7 +126,8 @@
var/damage = 10
var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
var/nodamage = FALSE //Determines if the projectile will skip any damage inflictions
var/flag = BULLET //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb
///Defines what armor to use when it hits things. Must be set to bullet, laser, energy, or bomb
var/flag = BULLET
///How much armor this projectile pierces.
var/armour_penetration = 0
///Whether or not our bullet lacks penetrative power, and is easily stopped by armor.

View File

@@ -5,7 +5,7 @@
damage_type = OXY
nodamage = TRUE
armour_penetration = 100
flag = MAGIC
flag = NONE
/obj/projectile/magic/death
name = "bolt of death"
@@ -203,7 +203,6 @@
icon_state = "lavastaff"
damage = 15
damage_type = BURN
flag = MAGIC
dismemberment = 50
nodamage = FALSE
@@ -222,8 +221,6 @@
damage = 20
damage_type = BURN
nodamage = FALSE
armour_penetration = 0
flag = MAGIC
hitsound = 'sound/weapons/barragespellhit.ogg'
/obj/projectile/magic/arcane_barrage/on_hit(target)
@@ -240,7 +237,6 @@
name = "locker bolt"
icon_state = "locker"
nodamage = TRUE
flag = MAGIC
var/weld = TRUE
var/created = FALSE //prevents creation of more then one locker if it has multiple hits
var/locker_suck = TRUE
@@ -475,7 +471,6 @@
damage_type = BURN
nodamage = FALSE
speed = 0.3
flag = MAGIC
var/zap_power = 20000
var/zap_range = 15
@@ -543,7 +538,6 @@
nodamage = FALSE
armour_penetration = 100
temperature = -200 // Cools you down greatly per hit
flag = MAGIC
/obj/projectile/magic/nothing
name = "bolt of nothing"