Archie c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2

2021-01-08 15:20:47 -03:00

..

PDA

Merge pull request #10813 from Ghommie/Ghommie-cit540

2021-01-08 07:11:56 -03:00

radio

Merge remote-tracking branch 'upstream/master' into nexties2

2021-01-08 15:20:47 -03:00

aicard.dm

…

anomaly_neutralizer.dm

…

beacon.dm

…

camera_bug.dm

…

chameleonproj.dm

Merge pull request #9589 from Ghommie/Ghommie-cit259

2020-10-27 14:42:55 -03:00

compressionkit.dm

Examine Code Refactor

2020-10-06 23:36:21 -03:00

desynchronizer.dm

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

dogborg_sleeper.dm

Merge pull request #9658 from Ghommie/Ghommie-cit291

2021-01-07 15:22:39 -03:00

doorCharge.dm

Examine Code Refactor

2020-10-06 23:36:21 -03:00

electroadaptive_pseudocircuit.dm

Examine Code Refactor

2020-10-06 23:36:21 -03:00

flashlight.dm

Changing Nanotrasen to Kinaris where needed

2020-12-31 17:58:25 +00:00

forcefieldprojector.dm

Examine Code Refactor

2020-10-06 23:36:21 -03:00

geiger_counter.dm

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

glue.dm

…

gps.dm

Fix merge conflicts

2021-01-05 03:41:08 -03:00

instruments.dm

…

laserpointer.dm

…

lightreplacer.dm

Examine Code Refactor

2020-10-06 23:36:21 -03:00

megaphone.dm

…

multitool.dm

Examine Code Refactor

2020-10-06 23:36:21 -03:00

paicard.dm

Merge pull request #10813 from Ghommie/Ghommie-cit540

2021-01-08 07:11:56 -03:00

pipe_painter.dm

Examine Code Refactor

2020-10-06 23:36:21 -03:00

powersink.dm

…

pressureplates.dm

…

quantum_keycard.dm

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

reverse_bear_trap.dm

…

scanners.dm

Merge pull request #10813 from Ghommie/Ghommie-cit540

2021-01-08 07:11:56 -03:00

sensor_device.dm

…

taperecorder.dm

Merge pull request #9747 from Ghommie/Ghommie-cit329

2021-01-05 16:58:19 -03:00

traitordevices.dm

…

transfer_valve.dm

…