Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

_compile_options.dm

Base Life-addition()

2015-06-13 13:36:08 +02:00

admin.dm

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

appearance.dm

Adds progress bars to tasks that take time

2016-03-21 17:13:23 +00:00

atmos.dm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30

belly_modes_vr.dm

A fix to Issue #30 - Repeated Nomming (#99)

2016-05-17 22:43:36 -04:00

chemistry_vr.dm

Species, informationally, done

2016-05-10 20:36:42 -04:00

chemistry.dm

Made slimes more interesting.

2016-05-06 04:07:52 +09:30

damage_organs.dm

The Terminator Update

2016-05-29 02:37:13 -04:00

dna.dm

Cleans up defines

2015-08-18 17:05:26 -04:00

gamemode.dm

Replaces BE_MONKEY with BE_RENEGADE

2016-05-16 21:20:30 -05:00

items_clothing.dm

Updates blob

2015-10-05 18:10:16 +03:00

lighting.dm

Moves code to relevant define.

2015-07-31 10:00:34 +02:00

machinery.dm

Generic Station & System Name

2016-05-16 16:21:17 -04:00

math_physics.dm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30

misc_vr.dm

Makes pay equal for everyone

2016-05-23 16:14:11 +01:00

misc.dm

Adjusts and adds more colors of cables

2016-05-19 18:13:12 +01:00

mobs.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3

2016-05-25 15:09:23 -04:00

research.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

species_languages.dm

Gives Cult Cultist Language (Again) (#1651)

2016-05-15 18:32:31 -04:00

targeting.dm

Rewrote targeting.

2015-12-16 10:26:40 +10:30

turfs.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

unit_tests.dm

Adds color to unit tests

2016-04-04 11:46:39 +03:00