izac112 933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update ...

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

2020-01-31 18:23:50 +01:00

..

communicator

Update messaging.dm

2019-12-15 23:27:50 -05:00

PDA

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

2020-01-31 18:23:50 +01:00

radio

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

2020-01-31 18:23:50 +01:00

advnifrepair.dm

…

ai_detector.dm

…

aicard.dm

…

binoculars.dm

…

body_snatcher_vr.dm

…

chameleonproj.dm

…

debugger.dm

…

defib.dm

Blind port of Bay Radiation Subsystem

2019-10-06 03:30:36 -04:00

flash_vr.dm

…

flash.dm

Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2

2019-07-03 23:10:55 -04:00

flashlight.dm

Merge pull request #6547 from TheFurryFeline/TFF-Lamps_Lights_Lackluster

2019-11-29 19:51:34 -05:00

floor_painter.dm

…

geiger.dm

Blind port of Bay Radiation Subsystem

2019-10-06 03:30:36 -04:00

gps.dm

Merge pull request #6248 from Heroman3003/gpsing

2019-07-01 20:47:22 -04:00

hacktool.dm

…

holowarrant.dm

Fixes oversights with last PRs

2019-04-28 23:28:19 -04:00

instruments.dm

Map Overhaul+instruments

2019-11-23 22:06:21 -05:00

laserpointer.dm

…

lightreplacer.dm

Merge pull request #6569 from TheFurryFeline/TFF-Bulbs_Recycling

2019-12-21 14:31:10 -05:00

locker_painter.dm

…

megaphone.dm

…

modkit.dm

…

multitool.dm

Merge pull request #6566 from Mechoid/MultitoolFix

2019-12-15 14:52:47 -05:00

paicard.dm

…

pipe_painter.dm

Moar descriptions for things

2020-01-20 22:50:39 -05:00

powersink.dm

…

scanners_vr.dm

…

scanners.dm

Medical Expansion

2019-10-19 23:28:38 -04:00

spy_bug.dm

Fixes Elven Weapons

2019-12-06 19:14:35 -05:00

suit_cooling.dm

…

t_scanner.dm

…

taperecorder.dm

…

text_to_speech.dm

…

traitordevices.dm

…

transfer_valve.dm

…

translator.dm

…

translocator_vr.dm

Misc Tweaks Pt. 2

2019-12-06 18:44:16 -05:00

tvcamera.dm

…

uplink_random_lists.dm

[REVIEW] Ports Modular Computers from Baystation

2019-04-28 22:06:40 -04:00

uplink.dm

…

violin.dm

Map Overhaul+instruments

2019-11-23 22:06:21 -05:00

whistle.dm

…