cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes bio resist from the code (#21108)

Browse Source 
* 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:
DGamerL
2023-06-03 09:50:22 +01:00
committed by GitHub
parent edef576f2e
commit 173bfb92f5
163 changed files with 428 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+6 -6
View File
@@ -407,7 +407,7 @@
canSmoothWith = list(SMOOTH_GROUP_GLASS_TABLES)
max_integrity = 70
resistance_flags = ACID_PROOF
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 100)
var/list/debris = list()
var/shardtype = /obj/item/shard
@@ -511,7 +511,7 @@
max_integrity = 100
integrity_failure = 50
deconstruction_ready = FALSE
armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, RAD = 0, FIRE = 80, ACID = 70)
smoothing_groups = list(SMOOTH_GROUP_REINFORCED_TABLES)
canSmoothWith = list(SMOOTH_GROUP_REINFORCED_TABLES)
@@ -707,7 +707,7 @@
canSmoothWith = list(SMOOTH_GROUP_REINFORCED_TABLES)
max_integrity = 200
integrity_failure = 50
armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
armor = list(MELEE = 10, BULLET = 30, LASER = 30, ENERGY = 100, BOMB = 20, RAD = 0, FIRE = 80, ACID = 70)
/obj/structure/table/reinforced/deconstruction_hints(mob/user)
if(deconstruction_ready)
@@ -805,8 +805,8 @@
var/mob/living/M = user
if(M.UID() in held_items)
return FALSE
return ..()
return ..()
/obj/structure/table/tray/item_placed(atom/movable/item)
. = ..()
if(is_type_in_typecache(item, typecache_can_hold))
@@ -815,7 +815,7 @@
var/mob/living/M = item
if(M.pulling == src)
M.stop_pulling()
/obj/structure/table/tray/deconstruct(disassembled = TRUE, wrench_disassembly = 0)
if(!(flags & NODECONSTRUCT))
var/turf/T = get_turf(src)