mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
Removes bio resist from the code (#21108)
* BIO armor is kill * some more stuff that uses bio resist * I did a scuffed merge conflict solve but it works
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
density = TRUE
|
||||
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, RAD = 0, FIRE = 70, ACID = 60)
|
||||
var/icon_closed
|
||||
var/icon_opened
|
||||
var/open_door_sprite = "generic_door"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
icon_opened = "fireaxe_full_open"
|
||||
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, 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
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
locked = TRUE
|
||||
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, RAD = 0, FIRE = 80, ACID = 80)
|
||||
damage_deflection = 20
|
||||
|
||||
/obj/structure/closet/secure_closet/can_open()
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
icon_opened = "securecrate_open"
|
||||
icon_closed = "securecrate"
|
||||
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, RAD = 0, FIRE = 80, ACID = 80)
|
||||
damage_deflection = 25
|
||||
broken = FALSE
|
||||
locked = TRUE
|
||||
|
||||
Reference in New Issue
Block a user