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

..

admin.dm

…

base.dm

…

conscious.dm

…

contained.dm

…

default.dm

Fixed pAI communicator buttons.

2018-02-22 03:17:03 +00:00

interactive.dm

…

inventory_deep.dm

…

inventory_vr.dm

Finishing Up NIFs

2017-06-06 19:34:41 -04:00

inventory.dm

…

outside.dm

…

physical.dm

…

remote.dm

…

self.dm

…

zlevel.dm

…