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

# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi

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

..

_compile_options.dm

…

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

chemistry.dm

Made slimes more interesting.

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

damage_organs.dm

Adds new type of wounds - piercing.

2016-04-22 19:00:17 +01: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

…

machinery.dm

Generic Station & System Name

2016-05-16 15:34:03 -04:00

math_physics.dm

Revert "Revert "Bay update.""

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

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

…

unit_tests.dm

Adds color to unit tests

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