Repede 4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm

2020-02-22 12:38:04 -05:00

..

apc_damage.dm

…

atmos_leak.dm

…

blob.dm

…

brand_intelligence.dm

[5654] Makes this PR Compile

2019-02-23 12:30:16 -05:00

camera_damage.dm

Merge pull request #6265 from Heroman3003/camerafix

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

canister_leak.dm

…

carp_migration.dm

Merges AI Branch into Master

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

comms_blackout.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

communications_blackout.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

drone_pod_vr.dm

Limites the locations at which drone pod can drop

2020-01-28 10:20:59 +10:00

dust.dm

…

electrical_storm.dm

…

electrified_door.dm

…

escaped_slimes.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

event_container_vr.dm

Merge branch 'release' of https://github.com/VOREStation/VOREStation

2020-02-22 12:38:04 -05:00

event_container.dm

disables solar storm

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

event_dynamic.dm

…

event_manager.dm

Conflict Resolution

2019-03-27 16:36:41 -04:00

event.dm

Merge pull request #6620 from Heroman3003/eventpause

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

gravity.dm

Move planets to SSplanets

2018-06-15 19:05:38 -04:00

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

Merges AI Branch into Master

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

ion_storm.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

meteor_strike_vr.dm

Fix merge conflict, update virgo planet things

2018-06-16 10:43:45 -04:00

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

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

morph_spawn_vr.dm

Fixes morph spawn event bugs

2020-02-12 12:36:22 +10:00

prison_break.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00

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

Refactors supply controller.

2018-07-31 19:11:02 -07:00

solar_storm.dm

Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed

2018-12-03 20:21:17 -05:00

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

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

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

…