Skip to content

Commit

Permalink
Reinforced windows and windoors are a bit more resistant to fires and…
Browse files Browse the repository at this point in the history
… blasts

- Regular windows/windoors: 1073k
- Reinforced windows/windoors: 1873k
- Reinforced windows/windoors will count as walls for blast range calculation (The lowest possible value)
  • Loading branch information
Ikarrus committed Jul 14, 2015
1 parent b284e44 commit 2bc5fd2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
5 changes: 4 additions & 1 deletion code/game/machinery/doors/windowdoor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
flags = ON_BORDER
opacity = 0
var/obj/item/weapon/airlock_electronics/electronics = null
var/reinf = 0

/obj/machinery/door/window/New()
..()
Expand Down Expand Up @@ -184,7 +185,7 @@
..()

/obj/machinery/door/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 800)
if(exposed_temperature > T0C + (reinf ? 1600 : 800))
take_damage(round(exposed_volume / 200))
..()

Expand Down Expand Up @@ -380,6 +381,8 @@
base_state = "leftsecure"
var/id = null
health = 300.0 //Stronger doors for prison (regular window door health is 200)
reinf = 1
explosion_block = 1


/obj/machinery/door/window/northleft
Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/explosion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@
if(D.density && D.explosion_block)
dist += D.explosion_block

for(var/obj/structure/window/W in Trajectory)
if(W.reinf && W.fulltile)
dist += W.explosion_block

var/flame_dist = 0
var/throw_dist = dist

Expand Down Expand Up @@ -205,6 +209,10 @@
if(D.density && D.explosion_block)
dist += D.explosion_block

for(var/obj/structure/window/W in TT)
if(W.explosion_block && W.fulltile)
dist += W.explosion_block

if(dist < dev)
T.color = "red"
T.maptext = "Dev"
Expand Down
4 changes: 3 additions & 1 deletion code/game/objects/structures/window.dm
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
overlays += crack_overlay

/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 800)
if(exposed_temperature > T0C + (reinf ? 1600 : 800))
hit(round(exposed_volume / 100), 0)
..()

Expand All @@ -421,6 +421,7 @@
icon_state = "rwindow"
reinf = 1
maxhealth = 50
explosion_block = 1

/obj/structure/window/reinforced/tinted
name = "tinted window"
Expand Down Expand Up @@ -472,3 +473,4 @@
reinf = 1
smooth = 1
canSmoothWith = null
explosion_block = 1
6 changes: 6 additions & 0 deletions html/changelogs/ikarrus-honkl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
author: Ikarrus

delete-after: True

changes:
- tweak: "Reinforced windows and windoors are a bit more resistant to fires and blasts."

0 comments on commit 2bc5fd2

Please sign in to comment.