mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 15:08:02 +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:
@@ -79,7 +79,7 @@
|
||||
req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
|
||||
max_integrity = 250
|
||||
integrity_failure = 80
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 90, ACID = 30)
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 90, ACID = 30)
|
||||
resistance_flags = FIRE_PROOF
|
||||
siemens_strength = 1
|
||||
var/custom_name
|
||||
|
||||
@@ -16,7 +16,7 @@ Pipelines + Other Objects -> Pipe network
|
||||
power_state = NO_POWER_USE
|
||||
power_channel = PW_CHANNEL_ENVIRONMENT
|
||||
on_blueprints = TRUE
|
||||
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
|
||||
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 100, ACID = 70)
|
||||
|
||||
layer = GAS_PIPE_HIDDEN_LAYER //under wires
|
||||
var/layer_offset = 0.0 // generic over VISIBLE and HIDDEN, should be less than 0.01, or you'll reorder non-pipe things
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
plane = GAME_PLANE
|
||||
interact_offline = TRUE
|
||||
max_integrity = 350
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 30, ACID = 30)
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 30, ACID = 30)
|
||||
var/temperature_archived
|
||||
var/current_heat_capacity = 50
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
density = TRUE
|
||||
max_integrity = 300
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 80, ACID = 30)
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 80, ACID = 30)
|
||||
layer = OBJ_LAYER
|
||||
|
||||
idle_power_consumption = 500
|
||||
|
||||
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(gas_meters)
|
||||
layer_offset = GAS_PUMP_OFFSET
|
||||
anchored = TRUE
|
||||
max_integrity = 150
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 40, ACID = 0)
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 40, ACID = 0)
|
||||
power_channel = PW_CHANNEL_ENVIRONMENT
|
||||
power_state = IDLE_POWER_USE
|
||||
idle_power_consumption = 2
|
||||
|
||||
@@ -58,7 +58,7 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new())
|
||||
icon_state = "yellow"
|
||||
density = TRUE
|
||||
flags = CONDUCT
|
||||
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 80, ACID = 50)
|
||||
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 80, ACID = 50)
|
||||
max_integrity = 250
|
||||
integrity_failure = 100
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
layer = BELOW_OBJ_LAYER
|
||||
power_state = NO_POWER_USE
|
||||
max_integrity = 250
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 60, ACID = 30)
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 60, ACID = 30)
|
||||
var/datum/gas_mixture/air_contents = new
|
||||
|
||||
var/obj/machinery/atmospherics/unary/portables_connector/connected_port
|
||||
|
||||
Reference in New Issue
Block a user