Merge pull request #16579 from FlattestGuitar/armor-defines

Adds defines for damage flags
This commit is contained in:
variableundefined
2021-09-17 22:10:20 -05:00
committed by GitHub
181 changed files with 458 additions and 450 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/vehicles/4wheeler.dmi'
icon_state = "atv"
max_integrity = 150
armor = list("melee" = 50, "bullet" = 25, "laser" = 20, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
armor = list(MELEE = 50, BULLET = 25, LASER = 20, ENERGY = 0, BOMB = 50, BIO = 0, RAD = 0, FIRE = 60, ACID = 60)
key_type = /obj/item/key
integrity_failure = 70
generic_pixel_x = 0
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "A brave security cyborg gave its life to help you look like a complete tool."
icon_state = "secway"
max_integrity = 100
armor = list("melee" = 20, "bullet" = 15, "laser" = 10, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
armor = list(MELEE = 20, BULLET = 15, LASER = 10, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 60, ACID = 60)
key_type = /obj/item/key/security
integrity_failure = 50
generic_pixel_x = 0
+1 -1
View File
@@ -9,7 +9,7 @@
can_buckle = TRUE
buckle_lying = FALSE
max_integrity = 300
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 60, ACID = 60)
var/key_type
var/held_key_type //Similar to above, but the vehicle needs the key in hands as opposed to inserted into the ignition
var/obj/item/key/inserted_key