LetterJay a80a00bc6e Merge branch 'master' into upstream-merge-27324

2017-05-23 07:17:45 -05:00

..

grenades

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268

2017-05-21 00:44:08 -05:00

implants

Reorganizes martial arts and stores them in the MIND.

2017-05-22 07:13:10 -05:00

melee

[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)

2017-05-18 09:37:30 -05:00

storage

Adds webbing

2017-05-22 22:20:14 -05:00

tanks

Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268

2017-05-22 12:39:52 -05:00

AI_modules.dm

[s]Exploit whack-a-mole

2017-04-25 01:31:50 -05:00

airlock_painter.dm

…

cards_ids.dm

Removes an unused var

2017-04-25 23:33:13 -05:00

chrono_eraser.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

cigs_lighters.dm

Vending machines are more dangerous when throwing items

2017-05-18 16:37:18 -05:00

clown_items.dm

Refactors ears into organs (#513)

2017-04-26 09:52:35 -05:00

clown.dm

[MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935)

2017-05-14 20:18:02 -07:00

cosmetics.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

courtroom.dm

…

defib.dm

…

dice.dm

…

dna_injector.dm

DNA injector inject proc now properly returns success

2017-05-22 22:44:49 -05:00

extinguisher.dm

…

flamethrower.dm

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

gift.dm

…

handcuffs.dm

manual merge

2017-04-29 11:42:28 -05:00

his_grace.dm

Fixes his grace CtrlClick

2017-05-07 11:33:55 -05:00

holosign_creator.dm

Changes some << to to_chat

2017-04-28 06:14:47 -05:00

holy_weapons.dm

applies the previous fixes for cult on a closed PR

2017-05-16 22:59:41 -05:00

kitchen.dm

…

manuals.dm

…

miscellaneous.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

Clowns get an automatic self-recharging pie cannon as a traitor item for 10TC

2017-05-18 16:37:07 -05:00

powerfist.dm

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2017-05-18 16:38:09 -05:00

RCD.dm

…

RPD.dm

Gas injectors are now buildable

2017-04-26 04:35:40 -05:00

RSF.dm

…

scrolls.dm

…

sharpener.dm

…

shields.dm

…

signs.dm

…

singularityhammer.dm

…

stunbaton.dm

Changes some << to to_chat

2017-04-28 06:14:47 -05:00

teleportation.dm

…

teleprod.dm

…

tools.dm

…

twohanded.dm

[MIRROR] Devil refactor+small revamp (#887)

2017-05-18 09:06:01 -05:00

vending_items.dm

[MIRROR] Fixes language code ignoring holder restrictions (#858)

2017-05-18 04:13:57 -05:00

weaponry.dm

Repaths C4 (#808)

2017-05-18 00:37:20 -05:00