cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor telecomms and consoles to operate on logical zlevels

Browse Source
This commit is contained in:
Atermonera
2020-04-28 14:55:04 -07:00
committed by VirgoBot
parent c66c3cec86
commit eb6eb7bcd6
13 changed files with 736 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/new_player/new_player.dm
View File

@@ -377,7 +377,11 @@
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