Kyep 5f2ef09a13 fixes merge conflict with bureaucracy.dmi

2018-03-01 19:12:10 -08:00

..

devices

fixes merge conflict with bureaucracy.dmi

2018-03-01 19:12:10 -08:00

mountable_frames

Mountables "rose" span removal

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

robot

Fixes merge conflict

2017-11-28 22:39:01 -08:00

stacks

Merge pull request #8651 from uraniummeltdown/titaniummineral

2018-02-21 03:20:20 -05:00

weapons

fixes merge conflict with bureaucracy.dmi

2018-03-01 19:12:10 -08:00

ashtray.dm

…

blueprints.dm

…

bodybag.dm

Removes Cryostasis Bags

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

candle.dm

…

cardboard_cutouts.dm

…

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

more

2018-01-02 19:53:57 -08:00

flag.dm

Better way of handling icon_state code

2018-02-16 19:17:04 +00:00

latexballoon.dm

…

misc.dm

…

policetape.dm

…

random_items.dm

Silver Slime Core and Random Reagent changes

2017-09-14 21:57:48 -04:00

shooting_range.dm

…

toys.dm

Toy dual eswords don't glow

2018-01-22 15:53:29 -06:00

trash.dm

…