Arokha Sieyes 17a64bebea Merge branch 'master' of https://github.com/PolarisSS13/Polaris into breakfix ...

# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/new_player/new_player.dm
#	vorestation.dme

2016-05-12 13:02:51 -04:00

..

antagonist

Renegade cap changed, autotraitor added to mixed traitor renegade. (#1529)

2016-05-04 15:27:37 +01:00

area

Resolves Issue #8 - Making Juke Boxes hackable

2016-05-09 22:50:45 -04:00

dna

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

gamemodes

Fixes #1586

2016-05-11 17:17:43 +01:00

jobs

Changes the colors of the occupation setup tab.

2016-05-11 21:23:40 -04:00

machinery

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

2016-05-12 13:02:51 -04:00

magic

…

mecha

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

objects

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

2016-05-12 13:02:51 -04:00

turfs

Makes blue carpet and AI floor removable

2016-05-12 14:54:40 +01:00

vehicles

…

verbs

Adds ability for players to ignore other players. (#1539)

2016-05-05 10:14:34 -04:00

atoms_movable.dm

Revert "Revert "Bay update.""

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

atoms.dm

May fix massive lag issues with autofire guns.

2016-01-01 11:29:50 +10:30

base_turf.dm

# This is a combination of 2 commits.

2015-12-16 15:26:38 +10:30

json.dm

…

periodic_news.dm

Replaces most instances of Nyx to Vir.

2015-11-26 01:01:06 -05:00

response_team.dm

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Makes it possible to have more than 16 preferences

2016-03-21 18:56:27 +00:00

supplyshuttle.dm

Revamps cargo supply code to allow for nicer code (#1508)

2016-05-04 17:20:22 -04:00