Birdtalon d35155baec Merge branch 'master' into ERT-gun ...

# Conflicts:
#	code/modules/response_team/ert_outfits.dm

2018-09-22 14:04:35 +01:00

..

devices

Merge branch 'master' into ERT-gun

2018-09-22 14:04:35 +01: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 #9283 from Aurorablade/PlasmaIsGrifingMe

2018-09-04 09:23:11 -07:00

weapons

Merge branch 'master' into ERT-gun

2018-09-22 14:04:35 +01: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

CrazyLemon 1, all the minor issues

2018-08-06 21:08:01 -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

Changed Card Icon Update

2018-08-03 15:39:20 -04:00

trash.dm

…