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

..

sorts

POLARIS: Sort jobs into correct departments

2018-01-27 14:57:43 -05:00

_global_objects.dm

Underwear + setup merges (#1812)

2016-05-30 19:19:45 +01:00

atmospherics.dm

…

files.dm

…

game.dm

Port Bay-style attack animations (#4827)

2018-02-15 22:02:04 -06:00

global_lists_vr.dm

Squashed commit of the following:

2018-02-04 22:43:02 +02:00

global_lists.dm

Basically initial working traits

2017-05-29 05:08:25 -04:00

icons_vr.dm

Does custom food stuff

2017-02-19 01:02:12 +00:00

icons.dm

Adds a 'Save PNG' verb for fun (#4658)

2018-01-28 18:11:49 -08:00

lists.dm

Implements the Tesla engine and supporting features (#4539)

2018-01-19 14:56:08 -06:00

logging_vr.dm

Soulcatcher chat logging, and subtle logging for free

2017-06-10 14:57:32 -04:00

logging.dm

Preliminary implementation of ZAS as a StonedMC subsystem.

2018-01-30 12:28:45 -05:00

maths.dm

…

matrices.dm

Enhance orbiting animations to actually support circles.

2018-01-21 20:52:33 -05:00

mobs.dm

Initial cleanup/changes

2018-02-17 19:47:39 -06:00

names.dm

Fix server startup runtimes from uninitaizlied using_map

2017-03-03 19:52:26 -05:00

sanitize_values.dm

…

storage.dm

Adds subtype friendly method to populate crates.

2016-10-25 21:40:28 +01:00

text_vr.dm

…

text.dm

Port's TG's Maploader

2017-09-08 12:49:26 -04:00

time.dm

Ports /tg controller optimizations

2017-12-27 21:19:55 -05:00

turfs.dm

Teshari Tweaks

2017-01-15 01:21:48 -06:00

type2type_vr.dm

…

type2type.dm

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

unsorted_vr.dm

Various and sundry admin messages

2018-01-06 19:15:54 -05:00

unsorted.dm

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

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

vector.dm

…