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

..

processing

Merge pull request #6118 from Novacat/nova-alerts

2019-04-25 17:03:43 -04:00

ai.dm

Merges AI Branch into Master

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

air.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

airflow.dm

…

atoms.dm

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

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

bellies_vr.dm

…

character_setup.dm

Update character_setup.dm

2019-05-13 22:43:00 -04:00

circuits.dm

Yet Another Circuit Update (#5549)

2018-09-12 20:51:32 -05:00

events.dm

Merge pull request #6620 from Heroman3003/eventpause

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

garbage.dm

Minor Fixes Part two

2019-08-30 20:29:02 -04:00

holomaps.dm

Holomap Port

2018-08-02 15:52:56 -07:00

inactivity.dm

Rebases this correctly

2019-03-28 15:24:27 -04:00

lighting.dm

…

machines.dm

Merge branch 'master' into upstream-merge-5901

2019-03-28 14:37:02 -04:00

mapping_vr.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

mapping_yw.dm

More fixes for initializing Atmos Machines by the engine loader.

2018-07-12 17:37:55 -04:00

mapping.dm

Adds Various Sounds, Looping Sound System

2019-03-27 03:55:21 -04:00

mobs.dm

…

nanoui.dm

Update nanoui.dm

2019-05-05 14:17:36 -04:00

orbits.dm

…

overlays.dm

Makes math helpers defines for performance

2018-12-06 16:15:00 -05:00

persist_vr.dm

Removes Command from appearing for players who had it removed

2019-04-15 18:14:04 +10:00

planets.dm

Update planets.dm

2018-09-01 18:39:06 -04:00

radiation.dm

Buffs radiation so it isn't defeated by a thin sheet of lead.

2019-12-20 00:51:06 -05:00

shuttles.dm

…

sun.dm

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

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

time_track.dm

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

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

timer.dm

Add debugging logs in an effort to track down the Timer subsystem failure point.

2020-02-17 20:27:26 -05:00

transcore_vr.dm

Merge remote-tracking branch 'upstream/master'

2019-04-14 19:44:13 +01:00

vote.dm

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

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

xenoarch.dm

Update xenoarch.dm

2019-04-14 02:51:07 -04:00