Fox McCloud ed9915edd9 Merge remote-tracking branch 'upstream/master' into two-handed ...

# Conflicts:
#	code/game/objects/items/weapons/twohanded.dm

2018-05-26 19:05:17 -04:00

..

devices

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

2018-05-25 18:39:37 -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

Their

2018-05-25 18:34:24 -07:00

weapons

Merge remote-tracking branch 'upstream/master' into two-handed

2018-05-26 19:05:17 -04: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

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

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

dehy_carp.dm

…

documents.dm

Using Weight Defines

2017-05-27 16:34:49 +01: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

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

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

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

trash.dm

Using Weight Defines

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