Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm

2017-06-01 17:27:00 -04:00

..

_global_objects.dm

Underwear + setup merges (#1812)

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

atmospherics.dm

…

files.dm

…

game.dm

Adjusts Changelings

2017-04-23 13:22:32 -04:00

global_lists_vr.dm

Basically initial working traits

2017-05-29 05:08:25 -04: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

Allow AI to use custom holograms (#3114)

2017-03-22 16:09:04 -05:00

lists.dm

Rewrite english_list to be a little nicer on lists of objects, and also faster

2016-08-15 17:31:10 +01:00

logging.dm

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

maths.dm

Added ceil() macro, replaced n_ceil() as GN said.

2016-02-01 04:12:11 +10:30

matrices.dm

Late September Sync (#579)

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

mobs.dm

FBPs can have numbers in their names.

2017-04-02 13:53:49 -07: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

FBPs can have numbers in their names.

2017-04-02 13:53:49 -07:00

time.dm

more time proc call fixes

2016-07-30 17:39:47 -04: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

Teshari Tweaks

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

unsorted.dm

Surgery Modifications

2017-05-31 17:41:02 -04:00

vector.dm

…