Markolie e31886016b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/objects/structures/window.dm

2014-12-13 02:15:05 +01:00

..

_DynamicAreaLighting_TG.dm

lighting: fix + optimize colored lights

2014-07-13 05:33:10 -04:00

configuration.dm

Stamina

2014-12-12 06:52:20 -05:00

emergency_shuttle_controller.dm

Add Vox Heist directive and call shuttle on completion of Directive X

2014-08-06 23:12:24 +02:00

failsafe.dm

Revert the new lighting system.

2014-04-07 23:51:35 +02:00

garbage.dm

Loop through garbage queue to remove nulls

2014-03-05 20:29:58 -05:00

hooks-defs.dm

Final Nations patch before live testing. This is going to be painful.

2014-05-27 20:09:10 -04:00

hooks.dm

Mutiny Mode

2014-05-15 01:01:54 -04:00

lighting_controller.dm

Following /tg/'s lead, removes set background 1 for smoother gameplay.

2014-01-08 01:25:20 -05:00

master_controller.dm

Bot port from /tg/

2014-12-02 17:59:40 +01:00

shuttle_controller.dm

Xenos gamemode rework

2014-12-13 02:08:22 +01:00

verbs.dm

Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.

2014-07-13 08:44:47 -04:00

voting.dm

…