EmperorJon d0ee55a6f1 Merge branch 'master' into 30_Nov._Fix_AI_door_UI

2015-12-01 05:03:32 +00:00

..

__defines

Reduces the loadout points from 15 to 10. We can see where we go from there, but I think we all agree that 15 was just a large number chosen for testing and is probably a little ridiculous, but we want higher than 5 - hence 10.

2015-11-22 11:02:59 +00:00

_helpers

Replaces most instances of Nyx to Vir.

2015-11-26 01:01:06 -05:00

_onclick

Finishes new ling, need better sprites but that's for another time.

2015-11-18 16:20:28 -05:00

ATMOSPHERICS

Woodrat 9.1 "Back in Action"

2015-10-16 22:57:13 -07:00

controllers

Woodrat 1.0 Dawn of the first day

2015-11-28 00:59:27 -08:00

datums

Update locations.dm

2015-11-26 11:07:04 -05:00

defines

Revert 58ef59734f

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

FEA

…

game

Changes here (https://github.com/Baystation12/Baystation12/pull/11446) were made when adding some sort of hacking tool.

2015-11-30 18:11:33 +00:00

js

…

modules

Merge branch 'master' into Devtweaks

2015-11-29 22:36:08 -05:00

ZAS

Revert 58ef59734f

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

_macros.dm

Compilation fixes.

2015-10-04 17:48:41 +02:00

global.dm

Revert 58ef59734f

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

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

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

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