Ian Turk 1b7ca8c0e5 Resolved merge conflicts

2017-08-16 08:33:24 -06:00

..

PDA

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

radio

Resolved merge conflicts

2017-08-16 08:33:24 -06:00

aicard.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

camera_bug.dm

Replaces ex_act and emp_act numbers with defines (#29215)

2017-07-13 08:56:26 -03:00

chameleonproj.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

doorCharge.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

flashlight.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

forcefieldprojector.dm

Adds defines for mouse_opacity

2017-08-14 11:18:22 -04:00

geiger_counter.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

gps.dm

Changes some 1s and 0s to TRUE and FALSE (#29144)

2017-07-10 10:31:34 -04:00

instruments.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

laserpointer.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

lightreplacer.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

machineprototype.dm

Fix origin tech

2016-06-10 23:05:05 +03:00

megaphone.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

multitool.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

paicard.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

pipe_painter.dm

Made some object lists less terrible to read (#29304)

2017-07-18 10:44:29 -04:00

powersink.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

pressureplates.dm

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

scanners.dm

Annihilates the colons! (#29812)

2017-08-15 12:49:35 -03:00

sensor_device.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

taperecorder.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

traitordevices.dm

Completes major inhand split project (#29574)

2017-07-29 16:47:37 -03:00

transfer_valve.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00