deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

PDA

Update PDA_types.dm

2017-12-05 17:43:52 -05:00

radio

[READY]Refactors uplinks to a component!

2017-11-22 15:17:03 -06:00

aicard.dm

…

camera_bug.dm

Update camera_bug.dm

2017-11-12 10:02:32 -06:00

chameleonproj.dm

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

doorCharge.dm

…

electroadaptive_pseudocircuit.dm

Merge pull request #32964 from AutomaticFrenzy/patch/joules

2017-12-05 03:23:06 -06:00

flashlight.dm

merges #3877 proper

2017-11-22 17:37:22 -05:00

forcefieldprojector.dm

Minor speedups to movement: First Blood Part 2

2017-11-14 15:00:45 -06:00

geiger_counter.dm

More radiation balance changes and fixes (#32051)

2017-10-27 03:08:03 -05:00

gps.dm

Merge pull request #31842 from GunHog/GPS_Name_Fix

2017-10-18 07:23:31 -05:00

instruments.dm

Adds force to items that really should hurt when hit by (#32200)

2017-10-29 18:49:48 -05:00

laserpointer.dm

Update laserpointer.dm

2017-11-24 19:03:25 -05:00

lightreplacer.dm

Adds force to items that really should hurt when hit by (#32200)

2017-10-29 18:49:48 -05:00

machineprototype.dm

…

megaphone.dm

…

multitool.dm

Update multitool.dm

2017-11-26 21:36:10 -05:00

paicard.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

pinpointer.dm

…

pipe_painter.dm

Merge pull request #30863 from pubby/bluepipe

2017-09-25 12:28:14 -05:00

powersink.dm

Href tokens

2017-09-24 17:34:37 -05:00

pressureplates.dm

[MIRROR] Fix pressure plate spam (#2775)

2017-09-16 04:35:45 -05:00

scanners.dm

Update scanners.dm

2017-11-28 22:31:54 -05:00

sensor_device.dm

…

taperecorder.dm

merges #3877 proper

2017-11-22 17:37:22 -05:00

traitordevices.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

transfer_valve.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

uplink_devices.dm

Merge branch 'master' into donoritemmodularization

2017-12-04 20:17:02 -05:00