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

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

Browse Source 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
This commit is contained in:
mwerezak
2015-06-28 22:35:14 -04:00
parent 0071ed3f24 4a2d7b661e
commit 087a978d56
438 changed files with 8879 additions and 7628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
-4
View File
@@ -125,10 +125,6 @@
/obj/structure/window/blob_act()
shatter()
/obj/structure/window/meteorhit()
shatter()
//TODO: Make full windows a separate type of window.
//Once a full window, it will always be a full window, so there's no point
//having the same type for both.