Kelshark 9ce88c8c6c Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme

2017-02-03 21:35:22 -05:00

..

_global_objects.dm

Underwear + setup merges (#1812)

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

atmospherics.dm

…

datum_pool.dm

Scheduler now uses btime, and other improvements

2016-06-01 17:56:07 +01:00

files.dm

…

game.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

2016-06-26 20:14:29 -04:00

global_lists_vr.dm

Nerfed hyperzine, added more languages to borgs understanding, boosted the ERT borg's gun, added new dogborg, fixed xenomaid borg so it is selectable, other..

2016-11-27 17:33:53 -05:00

global_lists.dm

Late September Sync (#579)

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

icons.dm

…

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

Late September Sync (#579)

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

names.dm

Generic Station & System Name

2016-05-16 16:21:17 -04: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

Fix the letter ÿ in nano-ui displays

2016-05-14 23:26:15 -04: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

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

vector.dm

…