cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tgstation r4633 into bs12_with_tgport

Browse Source 
Conflicts:
	code/defines/obj/costume.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/power/power.dm
	code/modules/power/switch.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-06 13:13:57 +10:00
parent aa88e69cd1 db2d703f72
commit 56f5cb9e4e
84 changed files with 9014 additions and 8406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/game/objects/structures/window.dm
View File

@@ -1,3 +1,19 @@
/obj/structure/window
name = "window"
icon = 'icons/obj/structures.dmi'
desc = "A window."
density = 1
layer = 3.2//Just above doors
var/health = 14.0
var/ini_dir = null
var/state = 0
var/reinf = 0
var/silicate = 0 // number of units of silicate
var/icon/silicateIcon = null // the silicated icon
pressure_resistance = 4*ONE_ATMOSPHERE
anchored = 1.0
flags = ON_BORDER
/obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
health -= Proj.damage
..()
@@ -392,3 +408,22 @@
src.icon_state = "window[junction]"
return
/obj/structure/window/basic
icon_state = "window"
/obj/structure/window/reinforced
reinf = 1
icon_state = "rwindow"
name = "reinforced window"
/obj/structure/window/reinforced/tinted
name = "tinted window"
icon_state = "twindow"
opacity = 1
/obj/structure/window/reinforced/tinted/frosted
icon_state = "fwindow"
name = "frosted window"