cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +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/modules/events/blob/blob_structures/blob_core.dm
+1 -1
View File
@@ -3,7 +3,7 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
max_integrity = 400
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 75, ACID = 90)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 75, ACID = 90)
fire_resist = 2
point_return = -1
var/overmind_get_delay = 0 // we don't want to constantly try to find an overmind, do it every 5 minutes
code/modules/events/blob/blob_structures/captured_nuke.dm
+1 -1
View File
@@ -3,7 +3,7 @@
icon_state = "blob"
desc = "A Nuclear Warhead tangled in blob tendrils pulsating with a horrific green glow."
max_integrity = 100
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 65, ACID = 90)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 65, ACID = 90)
point_return = 0
/obj/structure/blob/captured_nuke/Initialize(mapload, obj/machinery/nuclearbomb/N)
code/modules/events/blob/blob_structures/node.dm
+1 -1
View File
@@ -3,7 +3,7 @@
icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 65, ACID = 90)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 65, ACID = 90)
point_return = 18
/obj/structure/blob/node/Initialize(mapload)
code/modules/events/blob/blob_structures/strong_blob.dm
+1 -1
View File
@@ -7,7 +7,7 @@
brute_resist = 0.25
explosion_block = 3
atmosblock = TRUE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 90, ACID = 90)
/obj/structure/blob/shield/core
point_return = 0
code/modules/events/blob/theblob.dm
+1 -1
View File
@@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
opacity = FALSE
anchored = TRUE
max_integrity = 30
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 70)
flags_2 = CRITICAL_ATOM_2
var/point_return = 0 //How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed.
var/health_timestamp = 0