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

..

cart.dm

Merge pull request #6133 from Heroman3003/cart-tweek

2019-05-01 14:08:33 -04:00

chatroom.dm

…

PDA_vr.dm

Custom PDAs for all roles

2018-10-26 18:04:16 -04:00

PDA.dm

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

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

radio.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00