Repede 3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates ...

# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm

2020-05-18 20:30:52 -04:00

..

effects

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

2020-05-18 20:30:52 -04:00

items

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

2020-05-18 20:30:52 -04:00

random

Random item spawners qdel properly on init without using sleep (#7134)

2020-05-15 16:36:09 -04:00

structures

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

2020-05-18 20:30:52 -04:00

banners_vr.dm

Lore Overhaul (#7493)

2020-04-29 19:59:03 -04:00

banners.dm

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

2020-05-06 21:53:03 +02:00

buckling.dm

Ported /tg/ style screen alerts, replacing the hunger icon with them

2020-05-13 19:36:01 -07:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Deprecate the stream operator

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

items.dm

VS: Tweak some icon blending

2020-05-18 13:42:42 -04:00

mob_spawner_vr.dm

Fixes merge errors

2019-07-28 07:08:18 +10:00

objs.dm

New janicart sprites/features

2020-05-17 16:49:03 -04:00

structures.dm

Merge upstream PR

2020-05-18 09:31:51 -04:00

stumble_into_vr.dm

…

weapons.dm

Merges AI Branch into Master

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