Reverts the HP of grilles back to their pre-buff state, but makes meteors take more damage from them (#30918)

* Update grille.dm

* fully back
This commit is contained in:
1080pCat
2025-11-17 18:30:08 +00:00
committed by GitHub
parent 357a772b6f
commit 0012d870dc
2 changed files with 6 additions and 2 deletions
+4 -1
View File
@@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(meteors_gore, list(/obj/effect/meteor/meaty = 5, /obj/effect/me
var/damage_cap = wall.damage_cap
if(wall.rotting)
damage_cap /= 10
var/damage_needed = (damage_cap - wall.damage) * OBJ_INTEGRITY_TO_WALL_DAMAGE
var/damage_needed = (damage_cap - wall.damage) * OBJ_INTEGRITY_TO_WALL_DAMAGE
if(damage_needed <= 0)
wall.dismantle_wall()
else if(damage_needed < obj_integrity)
@@ -199,6 +199,9 @@ GLOBAL_LIST_INIT(meteors_gore, list(/obj/effect/meteor/meaty = 5, /obj/effect/me
. = TRUE // Hit an object.
var/damage_needed = obstacle.calculate_oneshot_damage(BRUTE, MELEE)
if(istype(obstacle, /obj/structure/grille))
damage_needed *= 6
if(obj_integrity > damage_needed)
obj_integrity -= damage_needed
obstacle.obj_break(MELEE)
+2 -1
View File
@@ -10,7 +10,8 @@
layer = BELOW_OBJ_LAYER
level = 3
armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 0, ACID = 0)
integrity_failure = 100
max_integrity = 50
integrity_failure = 20
cares_about_temperature = TRUE
rad_insulation_beta = RAD_BETA_BLOCKER
var/rods_type = /obj/item/stack/rods