Skip to content

Commit

Permalink
[MIRROR] Grilles dont break by just walking into them under any circu…
Browse files Browse the repository at this point in the history
…mstances (#1187)

* Grilles dont break by just walking into them under any circumstances (#81594)

## About The Pull Request

you can no longer just walk into a grille to destroy it rather fast
also single letter variable cleanup from that proc

## Why It's Good For The Game

this is a bug and bugs are bad

## Changelog
:cl:
fix: Grilles dont break by just walking into them under any
circumstances
/:cl:

* Grilles dont break by just walking into them under any circumstances

---------

Co-authored-by: jimmyl <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Feb 28, 2024
1 parent b0339fa commit 974f6c0
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions code/game/objects/structures/grille.dm
Original file line number Diff line number Diff line change
Expand Up @@ -339,19 +339,19 @@
var/turf/T = get_turf(src)
if(T.overfloor_placed)//cant be a floor in the way!
return FALSE
// Shocking hurts the grille (to weaken monkey powersinks)
if(prob(50))

var/obj/structure/cable/cable_node = T.get_cable_node()
if(isnull(cable_node))
return FALSE
if(!electrocute_mob(user, cable_node, src, 1, TRUE))
return FALSE
if(prob(50)) // Shocking hurts the grille (to weaken monkey powersinks)
take_damage(1, BURN, FIRE, sound_effect = FALSE)
var/obj/structure/cable/C = T.get_cable_node()
if(C)
if(electrocute_mob(user, C, src, 1, TRUE))
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
return TRUE
else
return FALSE
return FALSE
var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
sparks.set_up(3, 1, src)
sparks.start()

return TRUE

/obj/structure/grille/should_atmos_process(datum/gas_mixture/air, exposed_temperature)
return exposed_temperature > T0C + 1500 && !broken
Expand Down

0 comments on commit 974f6c0

Please sign in to comment.