cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 19:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into client_dir

Browse Source
This commit is contained in:
GinjaNinja32
2015-08-19 09:42:48 +01:00
parent c24478891c 9074b729fb
commit a9773207b2
27 changed files with 942 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
+2 -4
View File
@@ -291,8 +291,7 @@
set category = "Object"
set src in oview(1)
// TODO : Change to incapacitated() on merge.
if(usr.stat || usr.lying || usr.resting || usr.buckled)
if(usr.incapacitated())
return 0
if(anchored)
@@ -311,8 +310,7 @@
set category = "Object"
set src in oview(1)
// TODO : Change to incapacitated() on merge.
if(usr.stat || usr.lying || usr.resting || usr.buckled)
if(usr.incapacitated())
return 0
if(anchored)
code/game/objects/structures/window_spawner.dm
+9
View File
@@ -68,6 +68,15 @@
icon_state = "r-wingrille"
win_path = /obj/structure/window/reinforced
/obj/effect/wingrille_spawn/reinforced/crescent
name = "Crescent window grille spawner"
icon_state = "r-wingrille"
win_path = /obj/structure/window/reinforced
/obj/effect/wingrille_spawn/reinforced/crescent/handle_window_spawn(var/obj/structure/window/W)
W.maxhealth = 1000000
W.health = 1000000
/obj/effect/wingrille_spawn/phoron
name = "phoron window grille spawner"
icon_state = "p-wingrille"