Kyep 102ff67095 fixes merge conflict

2018-08-01 04:13:22 -07:00

..

devices

fixes merge conflict

2018-08-01 04:13:22 -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

Lazylen!

2018-07-25 07:21:48 +08:00

weapons

fixes merge conflict

2018-08-01 04:13:22 -07:00

ashtray.dm

Removes All Weapons

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

blueprints.dm

…

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

…

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

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

dehy_carp.dm

…

documents.dm

made some traps fairer

2018-06-22 01:05:03 -07: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

random_items.dm

we the good format now

2018-07-29 13:53:45 -04:00

shooting_range.dm

Removes All Weapons

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

toys.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

trash.dm

…