VOREStation

mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 20:30:29 +00:00

Files

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

# 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

2018-01-19 17:52:25 -05:00

accessories

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

2018-01-19 17:52:25 -05:00

jobs

Grammar time, again. (#4402 )

2017-12-05 14:34:45 -06:00

xenos

Fixes a few borked teshari cloaks

2017-11-19 00:09:45 -05:00

color.dm

Grammar time, again. (#4402 )