Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 ...

# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme

2018-02-07 19:30:50 -05:00

..

communicator

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

PDA

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

radio

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

advnifrepair.dm

Advanced NIF Repair Tool

2018-01-08 17:14:56 -05:00

ai_detector.dm

…

aicard.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

binoculars.dm

…

body_snatcher_vr.dm

Bodysnatcher message tweak.

2017-12-29 15:39:42 +02:00

chameleonproj.dm

…

debugger.dm

…

defib.dm

Corrects a compile error

2017-11-26 18:13:34 -06:00

flash_vr.dm

…

flash.dm

Polaris sync

2017-12-21 04:01:07 -05:00

flashlight.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

floor_painter.dm

…

geiger.dm

Tweaks Geiger Counters

2017-11-16 18:13:29 -05:00

gps.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

hacktool.dm

…

lightreplacer.dm

Adds force to a pair of items that were lacking for some reason, and standardizes light replacer file. (#4280)

2017-11-19 02:52:56 -06:00

locker_painter.dm

…

megaphone.dm

fixed megaphone lore

2017-11-04 01:59:00 -07:00

modkit.dm

…

multitool.dm

Fix uses of TECH_MAGNETS to TECH_MAGNET

2018-01-15 03:27:26 -05:00

paicard.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

pipe_painter.dm

…

powersink.dm

Transformed the machinery processor into an StonedMC subsystem

2017-12-29 15:31:59 -05:00

scanners_vr.dm

Fixes initial nif backups and adds a flashlight nifsoft.

2017-10-23 16:26:36 +03:00

scanners.dm

Adds more med gear to R&D and Cargo (#4691)

2018-02-04 22:18:36 -06:00

spy_bug.dm

Mobile Camera Pods (#4330)

2017-12-01 16:00:49 -06:00

suit_cooling.dm

…

t_scanner.dm

…

taperecorder.dm

…

text_to_speech.dm

Loadout Text-To-Speech device. (#4697)

2018-02-03 22:47:01 -06:00

traitordevices.dm

…

transfer_valve.dm

…

translator.dm

Further translator tweaks

2018-02-04 13:56:25 -05:00

tvcamera.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

uplink_random_lists.dm

…

uplink.dm

Fixes runtime in uplink.dm

2018-01-15 16:35:04 -08:00

violin.dm

…

whistle.dm

…