Kyep eb464ebd24 fixes merge conflict

2020-09-16 06:54:30 -07:00

..

devices

Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co

2020-09-16 15:26:19 +02:00

mountable_frames

…

robot

Merge pull request #13175 from farie82/logging-improvements

2020-08-08 16:23:06 +01:00

stacks

Removed the crafting time of the warning cones

2020-09-01 16:07:49 +02:00

tools

…

weapons

fixes merge conflict

2020-09-16 06:54:30 -07:00

ashtray.dm

…

blueprints.dm

Overhauls and Refactors Alarms

2020-07-01 17:41:47 -04:00

bodybag.dm

…

candle.dm

…

cardboard_cutouts.dm

…

changestone.dm

…

contraband.dm

Fixes Random Drugs failing Travis and Maint Loot (#13719)

2020-06-30 17:58:12 -06:00

control_wand.dm

…

crayons.dm

replaced some magic values

2020-09-01 16:26:25 +02:00

decorations.dm

…

dehy_carp.dm

…

documents.dm

…

flag.dm

Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co

2020-09-16 15:26:19 +02:00

latexballoon.dm

…

misc.dm

…

mixing_bowl.dm

…

random_items.dm

…

shooting_range.dm

…

toys.dm

Adds inhand sprites, makes naming more consistant

2020-09-02 05:49:05 -05:00

trash.dm

Minor fixes. Removes Plastic

2020-07-14 21:26:45 -07:00