FalseIncarnate 1a43297db6 merge conflict fix

2017-10-15 21:47:14 -04:00

..

devices

Megaphone FIx

2017-09-30 14:43:31 -04:00

mountable_frames

Mountables "rose" span removal

2017-08-19 01:33:23 -04:00

robot

isrobot check

2017-09-28 12:15:52 +02:00

stacks

merge conflict fix

2017-10-15 21:47:14 -04:00

weapons

Merge pull request #7482 from Aurorablade/DreamFluff

2017-10-15 13:53:02 -07:00

ashtray.dm

…

blueprints.dm

…

bodybag.dm

Removes Cryostasis Bags

2017-07-13 22:21:54 -04:00

candle.dm

…

cardboard_cutouts.dm

Fixes conflict

2017-06-10 10:18:05 +01:00

changestone.dm

…

contraband.dm

…

control_wand.dm

Revert "Buffs the HoP Door remote"

2017-08-28 21:35:18 -07:00

crayons.dm

Praise Honkmother! 📯 🤡 (Fixes mime and clown crayons not changing colour) (#7726)

2017-07-08 20:26:49 -04:00

dehy_carp.dm

…

documents.dm

…

flag.dm

it's update_icon not update_icons

2017-08-06 01:12:29 +01:00

latexballoon.dm

…

misc.dm

…

policetape.dm

Merge remote-tracking branch 'upstream/master' into embedding

2017-07-01 01:03:04 -04:00

random_items.dm

…

shooting_range.dm

…

toys.dm

Wound, not would

2017-09-24 17:37:15 +02:00

trash.dm

…