cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes conflicts

Browse Source
This commit is contained in:
Heroman
2021-05-09 10:48:54 +10:00
parent d83a84c4e3
commit a26faab5a7
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgui/packages/tgui/public/tgui.bundle.js
+7 -7
View File
File diff suppressed because one or more lines are too long
vorestation.dme
+5 -5
View File
@@ -2078,29 +2078,29 @@
#include "code\modules\economy\TradeDestinations.dm"
#include "code\modules\economy\vending.dm"
#include "code\modules\economy\vending_machines.dm"
#include "code\modules\emotes\definitions\audible_furry_vr.dm"
#include "code\modules\emotes\definitions\helpers_vr.dm"
#include "code\modules\emotes\definitions\visible_vr.dm"
#include "code\modules\entopics_vr\alternate_appearance.dm"
#include "code\modules\entopics_vr\entopics.dm"
#include "code\modules\emotes\emote_define.dm"
#include "code\modules\emotes\emote_mob.dm"
#include "code\modules\emotes\definitions\_mob.dm"
#include "code\modules\emotes\definitions\_species.dm"
#include "code\modules\emotes\definitions\audible.dm"
#include "code\modules\emotes\definitions\audible_cough.dm"
#include "code\modules\emotes\definitions\audible_furry_vr.dm"
#include "code\modules\emotes\definitions\audible_scream.dm"
#include "code\modules\emotes\definitions\audible_slap.dm"
#include "code\modules\emotes\definitions\audible_snap.dm"
#include "code\modules\emotes\definitions\audible_sneeze.dm"
#include "code\modules\emotes\definitions\audible_whistle.dm"
#include "code\modules\emotes\definitions\exertion.dm"
#include "code\modules\emotes\definitions\helpers_vr.dm"
#include "code\modules\emotes\definitions\human.dm"
#include "code\modules\emotes\definitions\slimes.dm"
#include "code\modules\emotes\definitions\synthetics.dm"
#include "code\modules\emotes\definitions\visible.dm"
#include "code\modules\emotes\definitions\visible_animated.dm"
#include "code\modules\emotes\definitions\visible_vomit.dm"
#include "code\modules\emotes\definitions\visible_vr.dm"
#include "code\modules\entopics_vr\alternate_appearance.dm"
#include "code\modules\entopics_vr\entopics.dm"
#include "code\modules\error_handler\_defines.dm"
#include "code\modules\error_handler\error_handler.dm"
#include "code\modules\error_handler\error_viewer.dm"