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

..

sorts

Port /tg garbage collection tweaks and statistics improvements

2017-12-27 21:45:37 -05:00

_global_objects.dm

Underwear + setup merges (#1812)

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

atmospherics.dm

…

files.dm

…

game.dm

Attempt to clean up player_list if an issue is found

2017-12-12 15:24:55 -05:00

global_lists_vr.dm

Refactor Digestion

2018-01-10 02:06:13 -05: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

Planes Framework (#4545)

2018-01-17 13:45:54 -06: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

Fixes players not being removed from the manifest immediately when cryoing.

2017-06-15 17:19:52 -04:00

maths.dm

…

matrices.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

mobs_vr.dm

Prevent certain things from including spooky ghosts

2018-01-15 20:38:28 -05:00

mobs.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -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

Basic Vore Implementation for #1 (#25)

2016-05-07 23:51:53 -04:00

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

Basic Vore Implementation for #1 (#25)

2016-05-07 23:51:53 -04:00

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-01-19

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

vector.dm

…