Kyep 102ff67095 fixes merge conflict

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

..

radio

squash 2

2018-07-07 16:34:23 -07:00

aicard.dm

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

autopsy.dm

Removes All Weapons

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

camera_bug.dm

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

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

chameleonproj.dm

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

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

flash.dm

Them

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

flashlight.dm

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

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

floor_painter.dm

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

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

instruments.dm

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

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

laserpointer.dm

AGHHHHHHHHHHHHHHHHHHH WHATTT

2018-07-17 04:58:36 -04:00

lightreplacer.dm

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

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

machineprototype.dm

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

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

megaphone.dm

abductor stuff

2018-07-18 19:51:22 -04:00

multitool.dm

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

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

paicard.dm

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

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

pipe_painter.dm

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

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

pizza_bomb.dm

fixes merge conflict

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

powersink.dm

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

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

scanners.dm

Standardized Robotic Organ Checking--Removes Mechassited Organs

2018-07-07 21:33:42 -04:00

sensor_device.dm

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

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

taperecorder.dm

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

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

traitordevices.dm

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

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

transfer_valve.dm

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

uplinks.dm

Their

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

whistle.dm

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

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