Kyrah Abattoir
ccc06644a0
/code/controllers/* lowercasing pass.
2013-11-18 02:16:23 +01:00
Aranclanos
ee35e83494
Small changes for cael's shuttle loan event
2013-10-09 16:44:52 -03:00
Aranclanos
b6e1fc6d95
Merge branch 'terbs_weekly_fun' of https://github.com/caelaislinn/-tg-station into terbs_weekly_fun
...
Conflicts:
code/controllers/supply_shuttle.dm
2013-10-09 16:03:39 -03:00
Cael_Aislinn
d1332ec834
adds shuttle loan random event - centcomm asks to borrow the shuttle for 5 mins and it returns with a reward (and sometimes something bad)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-09-24 17:14:06 +10:00
KazeEspada
27bc778449
Merge branch 'master' of https://github.com/tgstation/-tg-station into computers
2013-09-23 13:37:00 -07:00
KazeEspada
0ac2f255c8
fixes a error I made when merging.
2013-09-15 16:47:21 -07:00
KazeEspada
2a1278ca88
Makes Supply Pack datums no longer garbage collect. Prevents them from making artifacts like mulebot #3 . Fixes issue #137 .
...
Moves the supply shuttle controller to the controller folder and adds its creation to the new proc of the master controller.
Also, makes the supply shuttle make supply packs on new instead process.
2013-09-10 11:00:43 -07:00