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

..

grenades

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

2016-04-24 21:22:37 +02:00

implants

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

2016-04-24 21:22:37 +02:00

melee

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

storage

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

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

tanks

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

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

AI_modules.dm

Merge pull request #16087 from Dorsisdwarf/AIlaws

2016-03-14 14:16:16 -05:00

airlock_painter.dm

First commit of this big PR

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

cards_ids.dm

First commit of this big PR

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

chrono_eraser.dm

Refactored the item's action system. Items can now hold multiple actions.

2016-02-23 19:37:42 +01:00

cigs_lighters.dm

First commit of this big PR

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

clown_items.dm

First commit of this big PR

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

cosmetics.dm

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

2016-02-04 14:34:45 +01:00

courtroom.dm

First commit of this big PR

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

defib.dm

First commit of this big PR

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

dice.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

dna_injector.dm

fixes dna injector bug

2016-04-14 12:45:05 -07:00

explosives.dm

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

2016-04-24 21:22:37 +02:00

extinguisher.dm

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

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

flamethrower.dm

First commit of this big PR

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

gift.dm

Fixes gift sprite

2016-04-11 11:32:32 -07:00

handcuffs.dm

First commit of this big PR

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

holosign_creator.dm

Same things but with structures now.

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

holy_weapons.dm

Typo fix

2016-03-03 12:41:07 -06:00

kitchen.dm

Added hacked autolathe design for butcher cleaver

2016-04-12 20:01:26 +01:00

manuals.dm

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

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

miscellaneous.dm

Final Solution for one shitty meme

2016-04-19 11:02:56 +03:00

mop.dm

First commit of this big PR

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

paint.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

paiwire.dm

First commit of this big PR

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

pneumaticCannon.dm

Same things but with structures now.

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

RCD.dm

First commit of this big PR

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

RPD.dm

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

RSF.dm

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

scrolls.dm

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00:00

sharpener.dm

increases the player skill gap

2016-02-29 11:43:21 -05:00

shields.dm

First commit of this big PR

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

signs.dm

First commit of this big PR

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

singularityhammer.dm

First commit of this big PR

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

stunbaton.dm

First commit of this big PR

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

teleportation.dm

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

2016-02-17 14:21:29 +00:00

teleprod.dm

First commit of this big PR

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

tools.dm

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

2016-04-24 21:22:37 +02:00

twohanded.dm

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

2016-04-24 21:22:37 +02:00

vending_items.dm

okay mr.phil man

2016-04-09 10:43:35 -04:00

weaponry.dm

First commit of this big PR

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