Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet ...

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

2015-06-22 22:57:53 -05:00

..

devices

Merge pull request #8876 from xxalpha/fixfixfix

2015-06-21 22:12:17 +03:00

robot

Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(

2015-06-14 20:11:40 +01:00

stacks

REMOVES CABLE CUFF

2015-06-06 16:21:41 -05:00

weapons

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

2015-06-22 22:57:53 -05:00

apc_frame.dm

…

blueprints.dm

Fixes construction permits dissapearing even when usage fails and fixes a small grammar error with blueprints.

2015-06-20 22:04:39 -06:00

body_egg.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

bodybag.dm

…

candle.dm

…

crayons.dm

- Ghosts can hear gang messages

2015-06-12 08:22:42 -06:00

dehy_carp.dm

Dehydrated carps inherit factions (minus neutral) from their owner.

2015-04-24 15:18:37 -05:00

documents.dm

…

holotape.dm

Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages

2015-06-20 00:19:03 -05:00

latexballoon.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

shooting_range.dm

Fixes range targets changing icons

2015-05-14 03:30:32 -03:00

toys.dm

Gang Update: Fashion War Edition

2015-06-18 20:01:57 -06:00

trash.dm

…