KorPhaeron d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis ...

# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi

2016-05-31 12:03:01 -05:00

..

devices

Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free

2016-05-28 10:40:31 -04:00

robot

Minor Tweaks for PK borgs + recharger (#17940)

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

stacks

fixes some of the crap maybe

2016-05-28 11:08:46 -05:00

weapons

You've been down too long in the midnight sea

2016-05-30 23:35:03 -05:00

apc_frame.dm

…

blueprints.dm

Cyborg Blueprints

2016-04-30 03:47:51 -05:00

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

bodybag.dm

…

candle.dm

Fixes spawning lit candles printing messages

2016-05-10 19:13:11 +01:00

control_wand.dm

…

crayons.dm

Merge pull request #18039 from coiax/alt-click-spraycan

2016-05-31 15:55:22 +12:00

dehy_carp.dm

Makes dehydrated carps more fun (#17302)

2016-05-03 19:30:32 -05:00

documents.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

latexballoon.dm

…

nuke_tools.dm

clean

2016-05-21 16:42:37 +01:00

shooting_range.dm

First commit of this big PR

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

toys.dm

Readd pick to generate_messages for skeleton

2016-05-15 20:17:47 +12:00

trash.dm

…