dannno 29f48bfda4 conflicts more like con-fixed

2015-02-18 16:20:46 -05:00

..

__DEFINES

Fixes conflicts, fixes casually worn uniforms looking weird

2015-02-15 13:07:06 -05:00

__HELPERS

Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul

2015-02-07 20:22:49 +01:00

_globalvars

Lots of fixes and improvements

2015-02-04 17:35:42 +04:00

_onclick

Merge pull request #7517 from RemieRichards/MovableUIElements

2015-02-10 17:50:33 +01:00

ATMOSPHERICS

* Fixes the air stored inside atmos machinery not updating on construction

2015-02-04 21:56:07 +01:00

controllers

Fixes that fucking typo.

2015-02-05 21:48:15 +01:00

datums

Air Alarm Deconstruction fix: you no longer need to cut the syphon wire to deconstruct the air alarm.

2015-02-14 17:53:22 +01:00

defines

framework for a future "suicide hotline" job

2015-02-01 19:44:54 -05:00

game

conflicts more like con-fixed

2015-02-18 16:20:46 -05:00

js

…

LINDA

Resolves #3947 - Fires can now spread on shuttle turfs (and all simulated turfs). However, fires will not burn non-turf/simulated/floor

2015-01-11 00:11:22 +00:00

modules

conflicts more like con-fixed

2015-02-18 16:20:46 -05:00

_compile_options.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

hub.dm

…

world.dm

Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo

2015-02-05 18:45:53 +01:00