phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction ...

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm

2016-04-26 21:49:51 +02:00

..

diseases

Reworks sensory.dm

2016-04-21 19:30:28 +01:00

helper_datums

Clean up magic numbers.

2016-04-18 18:28:44 -04:00

martial

removes a comment by remie's request

2016-04-21 16:43:01 -07:00

wires

First commit of this big PR

2016-04-24 20:26:24 +02:00

action.dm

Admin-spawn snowflake drone headgear, plus structural changes (#16935)

2016-04-18 11:11:10 -04:00

ai_laws.dm

Merge pull request #16050 from Dorsisdwarf/AIlaws

2016-03-12 15:12:42 -06:00

beam.dm

fixes beam() lag

2016-03-20 16:07:48 -07:00

browser.dm

Made more sleeps use stoplag

2016-04-05 11:08:28 -07:00

datacore.dm

makes manifest entries use get_flat_human_icon

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

datumvars.dm

Lag check on initialization (and on a missed del-all proc)

2016-03-15 03:39:43 -07:00

dog_fashion.dm

Grammar fixes

2016-04-25 16:28:16 +01:00

hud.dm

Neatens the code, by making non-visible antaghuds a subtype of antaghud.

2016-03-08 21:19:46 -05:00

martial.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

material_container.dm

Fix material container

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

mind.dm

Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation

2016-04-01 01:32:59 -06:00

mutations.dm

Fixes a message mistake of mine.

2016-02-22 01:23:29 +01:00

outfit.dm

Remove side effects from Character Setup

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

progressbar.dm

Renames appearance flag defines.

2016-01-24 23:26:14 -06:00

recipe.dm

Fixes proc arguments

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

votablemap.dm

map rotation base code

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