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

..

calamity

…

changeling

Changeling Item Name/Desc Fixy (#6624)

2020-01-16 02:56:14 -05:00

cult

Security / PseudoCargo Expansion

2019-11-24 17:23:48 -05:00

endgame

[READY]Makes a bunch of processes subsystems instead

2019-03-27 16:03:51 -04:00

epidemic

[REVIEW] Ports Modular Computers from Baystation

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

events

Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

2019-05-13 22:57:23 -04:00

extended

…

heist

…

infiltrator

…

malfunction

Adds New Alert Levels (#6019)

2019-03-30 18:29:12 -04:00

meme

…

meteor

Blind port of Bay Radiation Subsystem

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

mixed

…

ninja

…

nuclear

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

revolution

…

sandbox

Vore Updates and merges

2018-10-03 18:25:39 +01:00

technomancer

Change various global species lists to GLOB versions, adds 2 more event subspecies.

2019-12-16 00:52:29 -05:00

traitor

…

wizard

…

events.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

game_mode_latespawn.dm

Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer

2019-03-26 23:58:26 -04:00

game_mode.dm

Merge pull request #6130 from Heroman3003/gamemode-fixes

2019-04-23 05:21:19 -04:00

gameticker.dm

Security / PseudoCargo Expansion

2019-11-24 17:23:48 -05:00

newobjective.dm

…

objective.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

setupgame.dm

…