kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

grenades

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

implants

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07: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

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

tanks

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

AI_modules.dm

[s]Exploit whack-a-mole

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

airlock_painter.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

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

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

defib.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

dice.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

dna_injector.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

extinguisher.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

flamethrower.dm

Changes a bunch of hrefs to the proper defines

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

gift.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

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

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

manuals.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

miscellaneous.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

mop.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

paint.dm

Overhauls and 2/28 sync (#244)

2017-02-28 09:30:49 -06:00

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

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

RCD.dm

[s] Fixes RCD,RCLD & ARCD (#403)

2017-04-15 14:44:58 -04:00

RPD.dm

Gas injectors are now buildable

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

RSF.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

scrolls.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

sharpener.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

shields.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

signs.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

singularityhammer.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

stunbaton.dm

Changes some << to to_chat

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

teleportation.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

teleprod.dm

Bleeding edgy refresh (#303)

2017-03-21 11:44:10 -05:00

tools.dm

Gives wirecutters origin tech

2017-04-19 04:32:43 -05:00

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

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00