Kyep 08fdc2bce3 merge conflict fix

2018-04-25 23:48:44 -07:00

..

devices

merge conflict fix

2018-04-25 23:48:44 -07:00

mountable_frames

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

robot

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

stacks

Merge pull request #8897 from Fox-McCloud/adds-frame

2018-04-25 18:57:29 -07:00

weapons

merge conflict fix

2018-04-25 23:48:44 -07:00

ashtray.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

blueprints.dm

Using Weight Defines

2017-05-27 16:34:49 +01:00

bodybag.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

candle.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

cardboard_cutouts.dm

Fixes conflict

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

changestone.dm

…

contraband.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

control_wand.dm

Merge remote-tracking branch 'upstream/master' into remove-weapons

2018-04-19 17:01:38 -04: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

Removes All Weapons

2018-04-15 16:25:56 -04:00

latexballoon.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

misc.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

policetape.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

random_items.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

shooting_range.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

toys.dm

Fixes Random Plushie Spawning

2018-04-24 21:02:07 -04:00

trash.dm

Using Weight Defines

2017-05-27 16:34:49 +01:00