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

Merge remote-tracking branch 'upstream/master' into CRAZY_HUDS_AMIRITE

Browse Source 
Conflicts:
	code/game/gamemodes/vampire/hud.dm
This commit is contained in:
Tigercat2000
2016-04-21 20:31:58 -07:00
parent 0f70e6810b ff27b4f77a
commit 66416ae5ec
27 changed files with 3028 additions and 2883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/fullwindow.dm
+11 -5
View File
@@ -89,12 +89,18 @@
health = 160
reinf = 1
New()
..()
color = null
/obj/structure/window/full/shuttle/New()
..()
color = null
update_icon() //icon_state has to be set manually
return
/obj/structure/window/full/shuttle/update_icon() //icon_state has to be set manually
return
/obj/structure/window/full/shuttle/shuttleRotate(rotation)
..()
var/matrix/M = transform
M.Turn(rotation)
transform = M
/obj/structure/window/full/shuttle/dark
icon = 'icons/turf/shuttle.dmi'