cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16579 from FlattestGuitar/armor-defines

Browse Source 
Adds defines for damage flags
This commit is contained in:
variableundefined
2021-09-17 22:10:20 -05:00
committed by GitHub
parent a271eb71a6 00dedfe6a9
commit fa3fa1dc6a
181 changed files with 458 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -6,7 +6,7 @@
density = 1
max_integrity = 200
integrity_failure = 50
armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60)
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60)
var/icon_closed = "closed"
var/icon_opened = "open"
var/opened = FALSE
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+1 -1
View File
@@ -8,7 +8,7 @@
icon_opened = "fireaxe1100"
anchored = TRUE
density = FALSE
armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
armor = list(MELEE = 50, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 90, ACID = 50)
var/localopened = FALSE //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
opened = TRUE
var/hitstaken = FALSE
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+1 -1
View File
@@ -9,7 +9,7 @@
broken = 0
can_be_emaged = TRUE
max_integrity = 250
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80)
damage_deflection = 20
icon_closed = "secure"
var/icon_locked = "secure1"
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
-4
View File
@@ -51,10 +51,6 @@
if("delete")
qdel(src)
//If you want to re-add fire, just add "fire" = 15 to the pick list.
/*if("fire")
new /obj/structure/closet/firecloset(src.loc)
qdel(src)*/
/obj/structure/closet/emcloset/legacy/populate_contents()
new /obj/item/tank/internals/oxygen(src)
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -169,7 +169,7 @@
var/sparks = "securecratesparks"
var/emag = "securecrateemag"
max_integrity = 500
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80)
damage_deflection = 25
var/tamperproof = FALSE
broken = FALSE