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

Dev merge.

Browse Source
This commit is contained in:
Zuhayr
2015-05-11 18:45:14 +09:30
parent bc50ba5166 dcdc0a4862
commit e28acd5045
182 changed files with 2647 additions and 2741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/curtains.dm
+2 -2
View File
@@ -1,5 +1,5 @@
#define SHOWER_OPEN_LAYER MOB_LAYER + 0.1
#define SHOWER_CLOSED_LAYER OBJ_LAYER + 0.4
#define SHOWER_OPEN_LAYER OBJ_LAYER + 0.4
#define SHOWER_CLOSED_LAYER MOB_LAYER + 0.1
/obj/structure/curtain
name = "curtain"
code/game/objects/structures/mineral_doors.dm
+1 -1
View File
@@ -154,7 +154,7 @@
/obj/structure/mineral_door/uranium
mineralType = "uranium"
hardness = 3
luminosity = 2
light_range = 2
/obj/structure/mineral_door/sandstone
mineralType = "sandstone"
code/game/objects/structures/window.dm
+2 -2
View File
@@ -479,10 +479,10 @@
/obj/structure/window/reinforced/polarized/proc/toggle()
if(opacity)
animate(src, color="#FFFFFF", time=5)
SetOpacity(0)
set_opacity(0)
else
animate(src, color="#222222", time=5)
SetOpacity(1)
set_opacity(1)