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

Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot

2016-01-02 18:02:54 -06:00

..

diseases

god dammit

2015-12-31 01:54:49 +00:00

helper_datums

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

spells

Cleans up code

2015-12-30 20:10:15 -06:00

wires

Convert bots to simple animals - Updated 7.0

2015-11-26 22:06:07 +01:00

ai_laws.dm

Revert "changes robocop law priority"

2015-12-19 00:50:51 +01:00

beam.dm

Fixes beam loc bug

2016-01-01 15:23:05 +01:00

browser.dm

Some minor ghost popup fixes

2015-12-31 02:23:53 -08:00

datacore.dm

makes manifest entries use get_flat_human_icon

2015-12-30 23:47:37 +01:00

datumvars.dm

Missing checks

2015-12-30 10:28:27 -06:00

debug.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

gas_mixture.dm

fixes superheating; makes gas flow

2016-01-02 17:11:51 -06:00

hud.dm

Merge remote-tracking branch 'upstream/master' into fuk

2015-11-07 15:56:39 -03:00

martial.dm

Merge pull request #14121 from AnturK/martialfix

2015-12-29 20:09:32 -03:00

material_container.dm

Fix material container

2015-09-13 23:35:49 +01:00

mind.dm

NanoUI is now 'tgui'

2016-01-01 17:47:44 -06:00

modules.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

mutations.dm

Removes cloak of shadows

2015-12-19 08:04:43 -06:00

outfit.dm

Remove side effects from Character Setup

2015-11-25 18:06:05 -05:00

progressbar.dm

Upgrades do_after and progress bars

2015-12-26 21:04:19 -08:00

recipe.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

spell.dm

Allows you to cancel Targetted spells.

2015-12-23 22:13:43 +00:00

supplypacks.dm

tactical gear

2015-12-22 13:59:02 -06:00

uplink_item.dm

Merge pull request #14107 from LanCartwright/newvirogrenades

2015-12-31 00:04:38 -03:00

votablemap.dm

map rotation base code

2015-09-30 07:13:38 -07:00