DeityLink cbfd4ec08a solving conflict

2014-11-27 06:47:56 +01:00

..

autotraitor

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

blob

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

borer

Borer fixes

2014-11-14 12:46:46 -08:00

changeling

Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into refactor-signup

2014-11-08 17:33:50 -08:00

cult

Merge remote-tracking branch 'origin/Bleeding-Edge' into adminbus-final

2014-11-25 04:03:35 +01:00

endgame

Adminbus fixing part 1

2014-11-23 16:19:23 +01:00

epidemic

…

events

system_integrity from bay.

2014-11-23 19:08:36 -08:00

extended

…

heist

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

malfunction

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

meme

…

meteor

No explication needed

2014-11-01 21:19:46 +01:00

mixed

Reverting sandbox removal because BurnZeZ is an asshole and CBA to ask people about big changes.

2014-06-25 22:46:19 -07:00

mutiny/directives

This is a cursory glace through the files and dealing with some conflicts.

2014-09-27 18:05:34 -04:00

nuclear

Adminbus part4

2014-11-17 08:53:31 +01:00

revolution

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

sandbox

Reverting sandbox removal because BurnZeZ is an asshole and CBA to ask people about big changes.

2014-06-25 22:46:19 -07:00

traitor

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

vampire

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

wizard

Update Ragin' Cajuns for Roles 2.

2014-11-11 10:06:55 -08:00

antag_spawner.dm

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

events.dm

More work on refactor.

2014-11-08 11:14:23 -08:00

factions.dm

…

game_mode.dm

Job role signup refactor. PLAYERS2.SQLITE MUST BE UPDATED!

2014-11-06 18:19:19 -08:00

gameticker.dm

solving conflict

2014-11-27 06:47:56 +01:00

intercept_report.dm

…

newobjective.dm

This is a cursory glace through the files and dealing with some conflicts.

2014-09-27 18:05:34 -04:00

objective.dm

Borer fixes

2014-11-14 12:46:46 -08:00

scoreboard.dm

This triggered me

2014-11-25 13:35:54 -08:00

setupgame.dm

Update setupgame.dm

2014-08-07 14:44:23 -07:00

steal_items.dm

gib readable

2014-09-22 06:24:20 -08:00