cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19

Browse Source 
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
This commit is contained in:
Leshana
2018-01-19 17:52:25 -05:00
parent 169a188ad0 8255744c2b
commit 3c3dac7102
81 changed files with 2358 additions and 16423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/update_icons.dm
+1 -1
View File
@@ -208,7 +208,7 @@ Please contact me on #coderbus IRC. ~Carn x
M.Scale(desired_scale)
M.Translate(1,-6)
ma.transform = M
ma.layer = MOB_LAYER -0.1 // Fix for a byond bug where turf entry order no longer matters
ma.layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters
else
var/matrix/M = matrix()
M.Scale(desired_scale)