LaharlMontogmmery 9591d2255d Hoping this solves the merge conflict

2015-06-27 19:23:13 +02:00

..

devices

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

robot

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

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

stacks

Squashed Commits

2015-06-27 00:09:16 -06:00

weapons

Hoping this solves the merge conflict

2015-06-27 19:23:13 +02: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

…

bodybag.dm

…

candle.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

crayons.dm

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

2015-06-13 20:23:29 +10:00

dehy_carp.dm

…

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

Squashed Commits

2015-06-27 00:09:16 -06:00

trash.dm

Squashed Commits

2015-06-27 00:09:16 -06:00