Merge pull request goonstation#3 from Shadowlight213/pushtest2

Pushtest2

code/WorkInProgress/OverlayManager.dm

@@ -65,6 +65,7 @@
 	var/d_alpha = 255
 	var/customization_third_color = "#ffffff"
 	var/d_blend_mode = 1
+	var/d_plane = 0
 	var/d_layer = HUD_LAYER_UNDER_2		//18 is just below the ui but above everything else.
 	var/d_mouse_opacity = 0 //In case you want it to block clicks. For blindness and such.
 
@@ -84,6 +85,7 @@
 			S.color = D.customization_third_color
 			S.blend_mode = D.d_blend_mode
 			S.layer = D.d_layer
+			S.plane = D.d_plane
 			S.mouse_opacity = D.d_mouse_opacity
 			instances.Add(S)
 		return ..()
@@ -333,6 +335,7 @@
 		warp.d_icon = 'icons/effects/overlays/warp.dmi'
 		warp.d_icon_state = src.warp_dir
 		warp.d_blend_mode = 1
+		warp.d_plane = -1
 		warp.d_layer = TURF_LAYER-1
 		definitions.Add(warp)
 

code/_build_config.dm

@@ -1,5 +1,8 @@
 // Compile-time config flags
 
+#define DEBUG
+
+
 // Enable if btime is installed
 //#define PRECISE_TIMER_AVAILABLE
 

code/admin/admin_verbs.dm

@@ -63,6 +63,7 @@ var/list/admin_verbs = list(
 
 3 = list(\
 // LEVEL_SA, secondary administrator
+/client/proc/getserverlog,\
 /client/proc/stealth,\
 /datum/admins/proc/pixelexplosion,\
 /client/proc/alt_key,\
@@ -282,6 +283,7 @@ var/list/admin_verbs = list(
 
 7 = list(\
 // LEVEL_CODER, coder
+/client/proc/getruntimelog,\
 /client/proc/debug_genetics_research,\
 /client/proc/reestablish_db_connection,\
 /client/proc/cmd_job_controls,\

code/hub.dm

@@ -8,4 +8,4 @@
 world
 	hub = "Exadv1.SpaceStation13"
 	hub_password = "kMZy3U5jJHSiBQjr"
-	name = "Goon Station 13"
+	name = "T/G/oonstation 13"

code/world.dm

@@ -1,3 +1,4 @@
+var/map_name = "Unknown"
 world
 	mob = /mob/new_player
 	turf = /turf/space
@@ -341,7 +342,6 @@ var/f_color_selector_handler/F_Color_Selector
 		if (time2text(world.realtime,"DDD") == "Fri")
 			NT |= mentors
 
-
 
 	spawn(world.tick_lag*30)
 		Optimize()
@@ -391,6 +391,13 @@ var/f_color_selector_handler/F_Color_Selector
 	else
 		world.log << "DB connect fail"
 
+
+	#ifdef MAP_NAME
+	map_name = "[MAP_NAME]"
+	#else
+	map_name = "Unknown"
+	#endif
+
 	return
 
 
@@ -571,6 +578,10 @@ var/f_color_selector_handler/F_Color_Selector
 			else shuttle = emergency_shuttle.timeleft()
 		else shuttle = "welp"
 		s["shuttle_time"] = shuttle
+		s["gamestate"] = 1
+		if(ticker)
+			s["gamestate"] = ticker.current_state
+		s["map_name"] = map_name ? map_name : "Unknown"
 		var/elapsed
 		if (ticker && ticker.current_state < GAME_STATE_FINISHED)
 			if (ticker.current_state == GAME_STATE_PREGAME) elapsed = "pre"

goonstation.dme

@@ -1191,7 +1191,8 @@ var/datum/preMapLoad/preMapLoad = new
 #include "libs\Base64\binary.dm"
 #include "libs\Base64\hexadecimal.dm"
 #include "libs\Base64\text.dm"
-#include "maps\config\destiny.dm"
+#include "maps\config\cog1.dm"
 #include "tgstationcode\dbcore.dm"
+#include "tgstationcode\files.dm"
 #include "tgstationcode\IsBanned.dm"
 // END_INCLUDE

maps/config/cog1.dm

@@ -0,0 +1,5 @@
+#include "..\cogmap.dmm"
+#include "..\z2_cog1.dmm"
+#include "..\z3.dmm"
+#define MAP_MODE "standard"
+#define MAP_NAME "Cogmap1"

maps/config/destiny.dm

@@ -1,4 +1,5 @@
 #include "..\destiny.dmm"
 #include "..\z2_destiny.dmm"
 #include "..\z3.dmm"
-#define MAP_MODE "standard"
+#define MAP_MODE "standard"
+#define MAP_NAME "Destiny"

maps/config/standard.dm

@@ -3,3 +3,4 @@
 #include "..\z2.dmm"
 #include "..\z3.dmm"
 #define MAP_MODE "standard"
+#define MAP_NAME "CogMap2"

strings/nt.txt

@@ -1,234 +1,5 @@
-kevvvv
-slowtax
-notjaykay
-rathensa
-varinn
-feminition
-sailordave
-stevebrule
-spedupbeatz
-chairchair
-minorkos
-granbonanza
-ucshellmaker
-anubcake
-9ball
-jeebusSez
-itsstalin
-mizkif
-supergodjesus1
-fury1671
-metatheguy
-kunaii
-savelius
-burgin
-michymech
-evoq
-commoners
-davidthomas
-statussurge
-malanth
-silentoboborachi
-thatguywiththeface
-silentoboborachi
-boaty
-domino
-rednakamura
-wonkmin
-blinkdog01
-batarang
-proogles
-mail2345
-orphanpower
-sparky78223
-jeebussez
-crushercrunch
-pleroma
-ruixon
-gamerofthegame
-kitafra
-repelex
-giantmoth
-seizon
-alehkhs
-saberwulf
-matthew951
-aphtonites
-boyofcheese
-9lives
-rearadmiral
-primelaw
-linkdawolf
-slurm
-gibbed
-stuntwaffle
-pantaloons
-nannek
-keelin
-exadv1
-0staf
-sniperchance
-angriestibm
-showtime100
-hobnob
-brianoblivion
-laserstrike
-isaidno
-mport2004
-burntcornmuffin
-ishallriseagain
-arthurmuggins
-mrfishstick
-enallyniv
-salmanbashi
-rolandtdapperman
-tellaris
-uryvichk
-housekeep
-sledra
-bunmo
-mattrawr
-tinyturtle
-biggsmclargehuge
-nicknerdface
-wingsswmud
-synthorange
-pacra
-lithiumnitrate
-hullcrushdepth
-halerina
-noreaus
-dementedghost
-rangerfour
-saorangesoda
-lljkmosheninkov
-amandyke
-kingofnopants
-baronvonpigeon
-lison
-slizer
-dropsy
-jakeytweet
-procitizensa
-impyness
-streakyhaddock
-drmelon
-elswyyr
-lallander
-neojuliban
-insanoblan
-matt935
-zeltaen
-droidblaster12
-deniedexistence
-ygorthenasty
-infinitemonkeys
-firepower01
-sitoutumaton
-imuzzaa
-jasmine87
-tteckk
-nieks
-smalltown
-gorillamydreams
-telltale
-litoxdrgnx
-24volunteers
-mwaser
-radikewl
-wbjohnston
-dauntasa
-rahky
-greenacidrage
-secretagentcow
-draconis13
-mokoman123
-mybluecorners
-shrelock
-adenabrafo
-lainge
-alienlab
-sord213
-melenkurio
-marquesas
-jorici
-mofleaker
-broodlines
-heiraphont
-billym
-johnfkennedy
-hiddendinosaurs
-siaru
-blackphoenix0928
-davidddavidson
-sundance420
-zorafm
-crumplehat
-nitrouspg
-frontlineacrobat4
-okimin
-kyle2143
-kinkyhobo
-jerkface00
-nameredacted
-wingedchiller
-funktechoperative1
-sameme
-charlesq
-conor12
-zeronine
-wabash
-bbonkers
-beeatingyou
-darkchis
-readster
-daeren
-ursulamajor
-unknownlife
-shoddyunl
-chike101
-david2222121
-arikie
-kikimofo
-ali0en
-hokie
-hipbee
-wirewraith
-rifles
-raemuz
-xenonia
-badasswafflez
-morphingdwarf
-fishdance
-heckenshutze
-edventure
-triggerhappypilot
-nautilus42
-affablegiraffe
-zafh
-spacenaba
-foxpmccloud
-spacemarine9
-wirewraith
-weavel
-megapaco
-admiraljimbob
-powmonkey
-hephasto
-bobsedgws
-leadrobot
-omjenkins
-hufflaw
-sgtbriar
-thetrixrabitt
-drnipples
-cgrn10
-grayshift
-bolognaprime
-maximusrex
-houka
-gannets
-baneofgiygas
-xavieri
-divinesoldier
-mask2697
+iamgoofball
+FreakyM
+Torsion
+Francinum
+isratosh