cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 18:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS changes for telecomms

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 10:24:37 -04:00
parent eb6eb7bcd6
commit c2ca984d18
12 changed files with 0 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
-4
View File
@@ -377,11 +377,7 @@
var/turf/T = join_props["turf"]
var/join_message = join_props["msg"]
<<<<<<< HEAD
var/announce_channel = join_props["channel"] || "Common" // VOREStation Add
=======
var/announce_channel = join_props["channel"] || "Common"
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
if(!T || !join_message)
return 0