Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168) ...

* fixes #15649
fixes #16575

* oops forgot those lines

2016-06-03 14:46:42 -05:00

..

grenades

origin and req lvl changes

2016-05-21 17:17:20 +03:00

implants

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

2016-05-28 01:37:55 +03:00

melee

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

storage

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

tanks

Revert "Removes some obselete attackby() code [Removes attackby crafting]"

2016-05-27 20:37:45 -03: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

Origin tech changes and some fixes

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

cards_ids.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

chrono_eraser.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

cigs_lighters.dm

Refactors NOREACT flag; minor cig refactor

2016-05-26 10:12:59 +01:00

clown_items.dm

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

2016-05-24 22:17:44 +03:00

cosmetics.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

courtroom.dm

…

defib.dm

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

2016-05-25 18:45:31 +03:00

dice.dm

…

dna_injector.dm

…

explosives.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

extinguisher.dm

MakeSlippery made more understandable by named args tweak

2016-05-22 00:42:11 +00:00

flamethrower.dm

Revert "Removes some obselete attackby() code [Removes attackby crafting]"

2016-05-27 20:37:45 -03:00

gift.dm

…

handcuffs.dm

Revert "Removes some obselete attackby() code [Removes attackby crafting]"

2016-05-27 20:37:45 -03:00

holosign_creator.dm

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

2016-05-24 22:17:44 +03:00

holy_weapons.dm

Kills the sword ghost properly

2016-05-31 17:13:59 -05:00

kitchen.dm

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

2016-05-24 22:17:44 +03:00

manuals.dm

…

miscellaneous.dm

…

mop.dm

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

2016-05-25 18:45:31 +03:00

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

Turns tablecrafting into personal crafting (#17341)

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

RCD.dm

Moves tools from items.dmi to tools.dmi

2016-04-30 04:12:12 +03:00

RPD.dm

Moves tools from items.dmi to tools.dmi

2016-04-30 04:12:12 +03: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

…

shields.dm

origin and req lvl changes

2016-05-21 17:17:20 +03:00

signs.dm

Turns tablecrafting into personal crafting (#17341)

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

singularityhammer.dm

Origin tech changes and some fixes

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

stunbaton.dm

Removing reliability

2016-05-12 02:43:18 +03:00

teleportation.dm

Origin tech changes and some fixes

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

teleprod.dm

Teleprods fixes (#17965)

2016-05-27 21:32:01 -05:00

tools.dm

Revert "Removes some obselete attackby() code [Removes attackby crafting]"

2016-05-27 20:37:45 -03:00

twohanded.dm

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

2016-05-24 22:17:44 +03:00

vending_items.dm

adds letterman jackets

2016-05-30 17:13:00 -07:00

weaponry.dm

Revert "Removes some obselete attackby() code [Removes attackby crafting]"

2016-05-27 20:37:45 -03:00