Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 ...

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-02-23 21:55:42 -05:00

..

machinery

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

mob

Slimes should no longer /list you.

2018-02-20 01:58:49 -06:00

tools

work

2017-09-04 21:52:47 -04:00

_xeno_setup_vr.dm

…

_xeno_setup.dm

…

controller.dm

Fixes rare empty gene_mask

2018-01-21 23:59:37 +00:00