Mloc-Argent a33cb7272b Merge remote-tracking branch 'upstream/master' into dev

2014-06-23 20:57:47 +01:00

..

autotraitor

Fixes a missing config check in autotraitor

2014-06-19 00:01:47 -04:00

blob

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

changeling

Fixes a missing config check in autotraitor

2014-06-19 00:01:47 -04:00

cult

Adds suit cooling device

2014-06-21 16:53:18 -04:00

epidemic

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

events

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

extended

Fixes a separate infinite loop error, as detailed here: https://github.com/ss13-daedalus/daedalus/issues/2

2012-05-10 14:34:32 +01:00

heist

Moved the Vox skipjack console over to a multi-destination shuttle datum setup.

2014-06-03 23:21:10 +09:30

malfunction

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

meme

Fixes a missing config check in autotraitor

2014-06-19 00:01:47 -04:00

meteor

Fixes for the tg cherrypicks.

2014-01-08 20:32:35 +00:00

mutiny

Adds docking support to shuttles, NanoUI

2014-06-09 23:41:08 -04:00

ninja

Fixes a missing config check in autotraitor

2014-06-19 00:01:47 -04:00

nuclear

Merge pull request #5330 from mwerezak/emergency-shuttle

2014-06-23 21:19:36 +09:30

revolution

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

sandbox

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

traitor

Fixes a missing config check in autotraitor

2014-06-19 00:01:47 -04:00

wizard

Fixes a missing config check in autotraitor

2014-06-19 00:01:47 -04:00

events.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

factions.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

game_mode.dm

Merge pull request #5330 from mwerezak/emergency-shuttle

2014-06-23 21:19:36 +09:30

gameticker.dm

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

intercept_report.dm

Efficiency: Joblist

2014-03-10 21:57:36 -05:00

newobjective.dm

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

objective.dm

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

setupgame.dm

And now tested in game, with some fixes.

2014-02-10 22:47:29 -06:00