cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Browse Source 
Conflicts:
	code/game/turfs/simulated/floor.dm
This commit is contained in:
Markolie
2015-03-17 16:18:42 +01:00
parent 12aaa6a93e 09d8e839ef
commit 747c2f9a57
21 changed files with 204 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/door_assembly.dm
+6
View File
@@ -101,6 +101,12 @@ obj/structure/door_assembly
airlock_type = "/highsecurity"
glass = -1
door_assembly_shuttle
base_icon_state = "shuttle"
base_name = "shuttle airlock"
airlock_type = "/shuttle"
glass = -1
multi_tile
icon = 'icons/obj/doors/door_assembly2x1.dmi'
dir = EAST