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

..

apc_damage.dm

…

atmos_leak.dm

…

blob.dm

…

brand_intelligence.dm

…

camera_damage.dm

Merge pull request #6265 from Heroman3003/camerafix

2019-07-03 23:09:33 -04:00

canister_leak.dm

…

carp_migration.dm

…

comms_blackout.dm

…

communications_blackout.dm

…

drone_pod_vr.dm

Fixes the fix for drone pod announcement

2020-01-16 13:47:52 +10:00

dust.dm

…

electrical_storm.dm

…

electrified_door.dm

…

escaped_slimes.dm

…

event_container_vr.dm

Viral addition

2020-01-14 00:02:34 -05:00

event_container.dm

disables solar storm

2019-12-15 03:03:40 -05:00

event_dynamic.dm

…

event_manager.dm

…

event.dm

Merge pull request #6620 from Heroman3003/eventpause

2020-01-15 23:43:46 -05:00

gravity.dm

…

grid_check.dm

…

grubinfestation_vr.dm

Fixes grub event end announcement not functioning

2020-01-14 05:58:38 +10:00

ian_storm_vr.dm

Rarer events, more event variety

2019-10-21 22:53:59 -04:00

infestation.dm

…

ion_storm.dm

Update ion_storm.dm

2019-08-06 15:30:47 -04:00

meteor_strike_vr.dm

…

meteors.dm

…

money_hacker.dm

Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

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

money_lotto.dm

…

money_spam.dm

Also restricts spam

2019-09-04 04:27:07 +10:00

prison_break.dm

…

radiation_storm.dm

Typo fixes

2020-01-25 01:29:13 -05:00

random_antagonist.dm

…

rogue_drones.dm

Typo fixes

2020-01-25 01:29:13 -05:00

shipping_error.dm

…

solar_storm.dm

…

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

Rarer events, more event variety

2019-10-21 22:53:59 -04:00

spider_migration_yw.dm

fluffies events

2020-01-13 23:51:20 -05:00

spontaneous_appendicitis_vr.dm

…

spontaneous_appendicitis.dm

…

supply_demand.dm

…

viral_infection.dm

Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

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

viral_outbreak.dm

Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

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

wallrot.dm

…

window_break.dm

…

wormholes.dm

…