Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hubshite

# Conflicts:
#	code/hub.dm

code/__defines/math_physics.dm

@@ -15,9 +15,10 @@
 #define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04 // (3 cm + 100 cm * sin(3deg))/(2*(3+100 cm)). Unitless ratio.
 #define HUMAN_EXPOSED_SURFACE_AREA          5.2 //m^2, surface area of 1.7m (H) x 0.46m (D) cylinder
 
-#define T0C  273.15 //    0.0 degrees celcius
+#define T0C  273.15  //    0.0 degrees celcius
-#define T20C 293.15 //   20.0 degrees celcius
+#define T20C 293.15  //   20.0 degrees celcius
-#define TCMB 2.7    // -270.3 degrees celcius
+#define TCMB 2.7     // -270.3 degrees celcius
+#define TN60C 213.15 //    -60 degrees celcius
 
 #define CLAMP01(x) max(0, min(1, x))
 #define QUANTIZE(variable) (round(variable,0.0001))

code/controllers/configuration.dm

@@ -4,8 +4,6 @@ var/list/gamemode_cache = list()
 	var/server_name = null				// server name (for world name / status)
 	var/server_suffix = 0				// generate numeric suffix based on server port
 
-	var/start_hub_visible = 0			// world.visibility to set on world start
-
 	var/nudge_script_path = "nudge.py"  // where the nudge.py script is located
 
 	var/log_ooc = 0						// log OOC channel
@@ -270,9 +268,6 @@ var/list/gamemode_cache = list()
 				if ("resource_urls")
 					config.resource_urls = splittext(value, " ")
 
-				if ("start_hub_visible")
-					config.start_hub_visible = 1
-
 				if ("admin_legacy_system")
 					config.admin_legacy_system = 1
 

code/controllers/master_controller.dm

@@ -32,7 +32,6 @@ datum/controller/game_controller/New()
 
 datum/controller/game_controller/proc/setup()
 	world.tick_lag = config.Ticklag
-	world.visibility = config.start_hub_visible
 
 	spawn(20)
 		createRandomZlevel()

code/game/turfs/flooring/flooring.dm

@@ -57,6 +57,12 @@ var/list/flooring_types
 	build_type = null
 
 /decl/flooring/snow
+	name = "snow"
+	desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
+	icon = 'icons/turf/snow_new.dmi'
+	icon_base = "snow"
+
+/decl/flooring/snow/snow2
 	name = "snow"
 	desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
 	icon = 'icons/turf/snow.dmi'

code/game/turfs/flooring/flooring_premade.dm

@@ -45,27 +45,6 @@
 	icon_state = "reinforced"
 	initial_flooring = /decl/flooring/reinforced
 
-/turf/simulated/floor/snow
-	name = "snow"
-	icon = 'icons/turf/snow.dmi'
-	icon_state = "snow"
-	initial_flooring = /decl/flooring/snow
-
-/turf/simulated/floor/snow/gravsnow
-	name = "snow"
-	icon_state = "gravsnow"
-	initial_flooring = /decl/flooring/snow/gravsnow
-
-/turf/simulated/floor/snow/plating
-	name = "snowy playing"
-	icon_state = "snowyplating"
-	initial_flooring = /decl/flooring/snow/plating
-
-/turf/simulated/floor/snow/plating/drift
-	name = "snowy plating"
-	icon_state = "snowyplayingdrift"
-	initial_flooring = /decl/flooring/snow/plating/drift
-
 /turf/simulated/floor/reinforced/airless
 	oxygen = 0
 	nitrogen = 0
@@ -225,4 +204,57 @@
 /turf/simulated/floor/beach/water/ocean
 */
 /turf/simulated/floor/airless/ceiling
-/turf/simulated/floor/plating
+/turf/simulated/floor/plating
+
+
+//**** Here lives snow ****
+/turf/simulated/floor/snow
+	name = "snow"
+	icon = 'icons/turf/snow_new.dmi'
+	icon_state = "snow"
+	var/list/crossed_dirs = list()
+
+/turf/simulated/floor/snow/snow2
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
+	initial_flooring = /decl/flooring/snow
+
+/turf/simulated/floor/snow/gravsnow
+	name = "snow"
+	icon_state = "gravsnow"
+	initial_flooring = /decl/flooring/snow/gravsnow
+
+/turf/simulated/floor/snow/plating
+	name = "snowy playing"
+	icon_state = "snowyplating"
+	initial_flooring = /decl/flooring/snow/plating
+
+/turf/simulated/floor/snow/plating/drift
+	name = "snowy plating"
+	icon_state = "snowyplayingdrift"
+	initial_flooring = /decl/flooring/snow/plating/drift
+
+#define FOOTSTEP_SPRITE_AMT 2
+
+/turf/snow/Entered(atom/A)
+    if(ismob(A))
+        var/mdir = "[A.dir]"
+        if(crossed_dirs[mdir])
+            crossed_dirs[mdir] = min(crossed_dirs[mdir] + 1, FOOTSTEP_SPRITE_AMT)
+        else
+            crossed_dirs[mdir] = 1
+
+        update_icon()
+
+    . = ..()
+
+/turf/snow/update_icon()
+    overlays.Cut()
+    for(var/d in crossed_dirs)
+        var/amt = crossed_dirs[d]
+
+        for(var/i in 1 to amt)
+            overlays += icon(icon, "footprint[i]", text2num(d))
+
+//**** Here ends snow ****

code/game/turfs/snow/snow.dm

@@ -0,0 +1,51 @@
+/turf/snow
+    name = "snow"
+
+    dynamic_lighting = 0
+    icon = 'icons/turf/snow_new.dmi'
+    icon_state = "snow"
+
+    oxygen = MOLES_O2STANDARD * 1.15
+    nitrogen = MOLES_N2STANDARD * 1.15
+
+    temperature = TN60C
+    var/list/crossed_dirs = list()
+
+#define FOOTSTEP_SPRITE_AMT 2
+
+/turf/snow/Entered(atom/A)
+    if(ismob(A))
+        var/mdir = "[A.dir]"
+        if(crossed_dirs[mdir])
+            crossed_dirs[mdir] = min(crossed_dirs[mdir] + 1, FOOTSTEP_SPRITE_AMT)
+        else
+            crossed_dirs[mdir] = 1
+
+        update_icon()
+
+    . = ..()
+
+/turf/snow/update_icon()
+    overlays.Cut()
+    for(var/d in crossed_dirs)
+        var/amt = crossed_dirs[d]
+
+        for(var/i in 1 to amt)
+            overlays += icon(icon, "footprint[i]", text2num(d))
+
+/turf/snow/snow2
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
+
+/turf/snow/gravsnow
+	name = "snow"
+	icon_state = "gravsnow"
+
+/turf/snow/plating
+	name = "snowy playing"
+	icon_state = "snowyplating"
+
+/turf/snow/drift
+	name = "snowy plating"
+	icon_state = "snowyplayingdrift"

code/hub.dm

@@ -4,7 +4,6 @@
 	hub_password = "kMZy3U5jJHSiBQjr"
 	//hub_password = "SORRYNOPASSWORD"
 	name = "Space Station 13"
-	visibility = 0
 
 /* This is for any host that would like their server to appear on the main SS13 hub.
 To use it, simply replace the password above, with the password found below, and it should work.
@@ -13,4 +12,4 @@ If not, let us know on the main tgstation IRC channel of irc.rizon.net #tgstatio
 	hub = "Exadv1.spacestation13"
 	hub_password = "kMZy3U5jJHSiBQjr"
 	name = "Space Station 13"
-*/
+*/

code/modules/mob/living/carbon/human/life.dm

@@ -619,11 +619,11 @@
 		if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
 			var/burn_dam = 0
 			switch(bodytemperature)
-				if(-INFINITY to species.cold_level_3)
+				if(species.cold_level_1 to species.cold_level_2)
 					burn_dam = COLD_DAMAGE_LEVEL_1
-				if(species.cold_level_3 to species.cold_level_2)
+				if(species.cold_level_2 to species.cold_level_3)
 					burn_dam = COLD_DAMAGE_LEVEL_2
-				if(species.cold_level_2 to species.cold_level_1)
+				if(species.cold_level_3 to -INFINITY)
 					burn_dam = COLD_DAMAGE_LEVEL_3
 			take_overall_damage(burn=burn_dam, used_weapon = "Low Body Temperature")
 			fire_alert = max(fire_alert, 1)
@@ -847,9 +847,9 @@
 	if(!isSynthetic() && (species.flags & IS_PLANT) && (!light_organ || light_organ.is_broken()))
 		if(nutrition < 200)
 			take_overall_damage(2,0)
-			
+
-			//traumatic_shock is updated every tick, incrementing that is pointless - shock_stage is the counter. 
+			//traumatic_shock is updated every tick, incrementing that is pointless - shock_stage is the counter.
-			//Not that it matters much for diona, who have NO_PAIN. 
+			//Not that it matters much for diona, who have NO_PAIN.
 			shock_stage++
 
 	// TODO: stomach and bloodstream organ.

config/example/config.txt

@@ -1,9 +1,6 @@
 ## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
 # SERVERNAME spacestation13
 
-## Uncomment START_HUB_VISIBLE to cause the server to default to VISIBLE on the hub. Admins with appropriate access levels can toggle this at run time via server -> toggle hub visbility.
-# START_HUB_VISIBLE
-
 ## Alert levels
 ALERT_GREEN All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
 ALERT_BLUE_UPTO The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.

html/changelogs/Spookerton_hub-visibility.yml

@@ -1,36 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#################################
-
-# Your name.  
-author: Spookerton
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - tweak: "Changes hub visibility to be controlled by a config option."

polaris.dme

@@ -900,6 +900,7 @@
 #include "code\game\turfs\simulated\wall_icon.dm"
 #include "code\game\turfs\simulated\wall_types.dm"
 #include "code\game\turfs\simulated\walls.dm"
+#include "code\game\turfs\snow\snow.dm"
 #include "code\game\turfs\space\space.dm"
 #include "code\game\turfs\space\transit.dm"
 #include "code\game\turfs\unsimulated\beach.dm"