SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -04:00

..

calamity

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

changeling

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

2016-07-19 17:37:14 -04:00

cult

item_state cleanup

2016-07-11 22:31:32 -04:00

endgame

510 Improved Overlays

2016-06-18 15:50:10 -03:00

epidemic

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

events

Ports event system from Bay

2016-06-01 22:05:04 +01:00

extended

…

heist

Generic Station & System Name

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

malfunction

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

meme

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

meteor

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

mixed

Some more work + prep for drydocking.

2016-07-08 20:38:34 -04:00

ninja

Swaps secret player count for ninja/wizard and ninja&wizard

2016-05-08 16:05:07 +01:00

nuclear

Generic Station & System Name

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

revolution

Lowers revolution required players to 12 (#1692)

2016-05-18 21:15:26 -04:00

sandbox

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

technomancer

Technomancer Additions/Fixes

2016-07-21 18:22:15 -04:00

traitor

Generic Station & System Name

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

wizard

Some more work + prep for drydocking.

2016-07-08 20:38:34 -04:00

events.dm

Merge branch 'master' into botFixes

2016-03-01 14:48:24 +03:00

game_mode_latespawn.dm

Gives mods AOOC, fixes AUTOAUTOTRAITOR.

2016-01-05 18:12:56 -05:00

game_mode.dm

Ensures post-start antag selection does not select banned people or ghosts or anything else it isn't meant to

2016-06-29 23:58:07 +01:00

gameticker.dm

Adjusts secret game mode possibility formatting

2016-04-04 19:22:03 +01:00

newobjective.dm

…

objective.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

setupgame.dm

…