Remie Richards 897e8c5b88 Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work ...

Conflicts:
	code/game/objects/items/weapons/storage/storage.dm

2016-09-02 18:04:18 +01:00

..

grenades

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

implants

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

melee

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

storage

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

2016-09-02 18:04:18 +01:00

tanks

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

AI_modules.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

airlock_painter.dm

Fixes/tweaks a lot of typos/descriptions. (#18956)

2016-06-28 22:02:28 +12:00

cards_ids.dm

haha testing features xd (#19138)

2016-07-05 20:12:05 -04:00

chrono_eraser.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

cigs_lighters.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

clown_items.dm

Adds canned laughter (#19405)

2016-07-21 10:10:46 +02:00

cosmetics.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

courtroom.dm

First commit of this big PR

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

defib.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

dice.dm

Improves dice tactical combat for deaf

2016-06-26 21:56:39 +00:00

dna_injector.dm

ports high priority critical fix from vg

2016-08-16 16:40:40 -07:00

explosives.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

extinguisher.dm

Adds fireplaces, eswords are hot, cardboard is flammable (#19118)

2016-07-06 10:16:47 +12:00

flamethrower.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

gift.dm

Fixes gift sprite

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

handcuffs.dm

Hitsounds for CoC, rapiers. Throwsound for bolas. (#19773)

2016-08-08 21:23:08 -05:00

holosign_creator.dm

typo (#20196)

2016-08-28 18:34:52 -05:00

holy_weapons.dm

Gives extradimensional chap weapon a unique gimmick. (#20112)

2016-08-27 10:00:36 -05:00

kitchen.dm

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00

manuals.dm

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

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

miscellaneous.dm

Adds skub to the Autodrobe as a premium item

2016-06-28 17:23:38 -07:00

mop.dm

Wetting turfs should actually last for some time

2016-06-28 14:28:51 -04:00

paint.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

paiwire.dm

First commit of this big PR

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

pneumaticCannon.dm

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

powerfist.dm

Hyper-kinetics will no longer cause gibtonite to instantly explode (#19677)

2016-08-05 17:51:12 -05:00

RCD.dm

Fixed being able to spam grilles on a single tile with an RCD.

2016-08-03 00:43:28 -07:00

RPD.dm

Manual repair of some edge cases.

2016-06-11 23:11:54 +01:00

RSF.dm

Minor Tweaks for PK borgs + recharger (#17940)

2016-05-30 10:52:52 +12:00

scrolls.dm

Origin tech changes and some fixes

2016-05-17 20:57:01 +03:00

sharpener.dm

increases the player skill gap

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

shields.dm

Xenomorph Tweaks (#19720)

2016-08-09 09:38:10 +12:00

signs.dm

Turns tablecrafting into personal crafting (#17341)

2016-05-09 18:14:48 +02:00

singularityhammer.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

stunbaton.dm

Throwing an active stunbaton now has a chance to stun people! (#19083)

2016-07-03 18:53:11 -04:00

teleportation.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

teleprod.dm

Adds noteleport variable

2016-06-09 20:33:25 +12:00

tools.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

twohanded.dm

More than 2 hands!? WHAAAAAAT

2016-09-02 16:10:16 +01:00

vending_items.dm

Adds "Jabroni Outfit" to ClothesMate (#19930)

2016-08-17 14:12:04 -05:00

weaponry.dm

Removes nodrop from claymores

2016-08-27 22:23:58 -04:00