phil235 95959a76ef Merge branch 'master' of https://github.com/tgstation/-tg-station into AdminRequests1 ...

Conflicts:
	code/modules/admin/verbs/randomverbs.dm

2016-05-07 12:33:06 +02:00

..

grenades

Implements freezie floors and buffs frostoil (#17081)

2016-05-01 17:26:46 +10:00

implants

Fixes runtime when using gibself on an animal.

2016-04-29 03:57:16 +02:00

melee

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

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

storage

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

2016-05-05 21:57:10 +02:00

tanks

Blobs can no longer eat the supermatter (#17205)

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

AI_modules.dm

…

airlock_painter.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

cards_ids.dm

First commit of this big PR

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

chrono_eraser.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02: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

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

First commit of this big PR

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

defib.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

dice.dm

…

dna_injector.dm

fixes dna injector bug

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

explosives.dm

Merge pull request #17245 from nullbear/c4-path

2016-05-01 16:41:07 +10: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

Removes the voting cooldown fix and the say_log timestamp and coordinates.

2016-04-29 18:51:14 +02:00

gift.dm

Fixes gift sprite

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

handcuffs.dm

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

2016-05-05 21:57:10 +02:00

holosign_creator.dm

Blobs can no longer eat the supermatter (#17205)

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

holy_weapons.dm

…

kitchen.dm

Added hacked autolathe design for butcher cleaver

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

manuals.dm

…

miscellaneous.dm

sandbags rah rah rah

2016-04-25 05:04:11 -05:00

mop.dm

First commit of this big PR

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

paint.dm

…

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

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

Suicide and RSF fix

2016-04-30 19:27:13 +01:00

scrolls.dm

…

sharpener.dm

…

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

…

teleprod.dm

First commit of this big PR

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

tools.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

twohanded.dm

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

2016-05-05 21:57:10 +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