KasparoVy 6ba20458e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' ...

# Conflicts:
#	icons/mob/human_face.dmi

2015-12-27 18:42:59 -05:00

..

autotraitor

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor

2015-12-17 22:43:09 -05:00

blob

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-03 11:03:01 -08:00

borer

Gamemode cleanup x1

2015-11-16 11:51:18 -08:00

changeling

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'

2015-12-27 18:42:59 -05:00

cult

Ports TG's Tesla Engine

2015-12-24 00:40:20 -05:00

extended

Gamemode cleanup x1

2015-11-16 11:51:18 -08:00

heist

Shuttles: Vox Skipjack + Win button

2015-12-13 13:13:39 -08:00

malfunction

Field Generator Refactor+Fixes

2015-12-22 13:40:53 -05:00

meteor

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-17 18:46:50 -08:00

mutiny

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

nations

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

2015-12-15 03:08:16 -05:00

nuclear

Nukeynukes~

2015-12-24 12:31:40 -08:00

revolution

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor

2015-12-17 22:43:09 -05:00

sandbox

Syndicate borg update, add medical syndicate borg, energy sword refactor

2015-10-01 04:21:24 +02:00

shadowling

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor

2015-12-17 22:43:09 -05:00

traitor

don't code half awake

2015-12-20 07:16:35 -05:00

vampire

no more changling cyborgs

2015-12-20 01:47:15 -05:00

wizard

Final Pass

2015-12-27 05:45:25 -05:00

xenos

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor

2015-12-17 22:43:09 -05:00

antag_hud.dm

good news everyone! It works!

2015-12-17 01:29:21 -05:00

antag_spawner.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

events.dm

Pipenet overhaul

2015-09-21 02:11:54 +02:00

factions.dm

…

game_mode.dm

Supply shuttle, initial_move() fixes, dock fixes

2015-12-04 21:48:40 -08:00

gameticker.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

intercept_report.dm

…

newobjective.dm

Merge branch 'master' of https://github.com/Tastyfish/Paradise

2015-10-28 19:04:54 -04:00

objective.dm

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-17 18:46:50 -08:00

scoreboard.dm

Supply shuttle, initial_move() fixes, dock fixes

2015-12-04 21:48:40 -08:00

setupgame.dm

Another del->qdel pass

2015-10-08 16:49:10 -04:00

steal_items.dm

Drill and drone fixes

2015-08-01 10:13:54 -04:00