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

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

2016-01-13 20:07:21 -06:00

..

grenades

Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2

2016-01-03 13:17:42 +03:00

implants

fixes some minor bugs

2015-12-24 04:35:08 -05:00

melee

Merge pull request #13906 from KorPhaeron/typo_fix

2015-12-23 14:46:33 -03:00

storage

Merge pull request #14389 from phil235/VisibleMessageRefactor

2016-01-09 22:16:57 -06:00

tanks

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

2016-01-13 20:07:21 -06:00

AI_modules.dm

Fixes AI lawsync

2016-01-01 17:28:52 -06:00

airlock_painter.dm

…

cards_ids.dm

…

chrono_eraser.dm

associative list

2015-12-29 13:33:12 -06:00

cigs_lighters.dm

Makes effect system code more OOP.

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

clown_items.dm

Made it possible to paint windows to make them opaque.

2015-11-01 16:26:54 +00:00

cosmetics.dm

Upgrades do_after and progress bars

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

courtroom.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

defib.dm

Notify

2016-01-06 22:40:50 -06:00

dice.dm

Adds fudge dice

2015-11-30 15:19:25 -05:00

dna_injector.dm

Fixes injectors spawned before mutation table is ready

2016-01-03 18:49:10 +01:00

explosives.dm

Fixes remotely detonating planted c4 with signaler.

2015-11-11 15:57:05 +01:00

extinguisher.dm

Buffs Dihydrogen monoxide

2016-01-01 15:17:29 +01:00

flamethrower.dm

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

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

gift_wrappaper.dm

adds christmas related suicide messages

2015-12-19 03:00:59 -05:00

handcuffs.dm

Makes effect system code more OOP.

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

janisigns.dm

…

kitchen.dm

fixes periods

2015-12-24 08:47:59 -06:00

manuals.dm

let's use the guide to chemistry wiki page instead.

2015-10-22 00:31:17 +02:00

mop.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

paint.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

paiwire.dm

…

pneumaticCannon.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

RCD.dm

NanoUI Airlock Electronics

2015-11-29 11:32:56 -06:00

RPD.dm

Makes effect system code more OOP.

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

RSF.dm

…

scrolls.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

shields.dm

crying

2015-12-26 23:19:19 -06:00

signs.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

singularityhammer.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

stunbaton.dm

Makes stun batons respect shields upon hit

2015-12-19 22:05:35 -05:00

teleportation.dm

- Refactor the visible_message() proc to be much faster.

2016-01-04 22:49:27 +01:00

teleprod.dm

fixes everything

2015-11-28 14:57:36 -08:00

tools.dm

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

twohanded.dm

Removes NOSHIELD

2015-12-20 15:21:58 -06:00

vending_items.dm

necklaces again

2015-12-16 20:47:00 -08:00

weaponry.dm

Fixes chainsaw surgery

2015-12-24 21:51:01 -06:00