Merge branch 'master' into tweaklandia

code/modules/atmospherics/gasmixtures/auxgm.dm

@@ -186,6 +186,6 @@ GLOBAL_DATUM_INIT(gas_data, /datum/auxgm, new)
 	appearance_flags = TILE_BOUND
 	vis_flags = NONE
 
-/obj/effect/overlay/gas/Initialize(mapload, state)
+/obj/effect/overlay/gas/New(state)
 	. = ..()
-	icon_state = state
+	icon_state = state

code/modules/client/preferences.dm

@@ -328,6 +328,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		wl_rate = 0.5
 	if(isnull(stuckage))
 		stuckage = 0
+	if (stuckage_chance == null)
+		stuckage_chance = 0
 	if(isnull(max_weight))
 		max_weight = 0
 	if(isnull(chair_breakage))
@@ -1422,6 +1424,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat +="<td width='300px' height='300px' valign='top'>"
 					dat += "<h2>GS13 Gameplay Preferences</h2>"
 					dat += "<b>Stuckage (at what weight will you get stuck in doors?):</b><a href='?_src_=prefs;preference=stuckage'>[stuckage == FALSE ? "Disabled" : stuckage]</a><BR>"
+					if(stuckage)
+						dat += "<b>Stuckage Chance :</b> <a href='?_src_=prefs;preference=stuckage_chance;task=input'>[stuckage_chance]</a><br>"
 					dat += "<b>Chair Breakage (at what weight will you break chairs?):</b><a href='?_src_=prefs;preference=chair_breakage'>[chair_breakage == FALSE ? "Disabled" : chair_breakage]</a><BR>"
 					dat += "<br></br>"
 					dat += "This preference will allow items that work based on weight to work to you, <b>usually to your detriment.</b> <BR>"
@@ -3021,6 +3025,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					var/new_wl_rate = input(user, "Choose your weight loss rate from 0.1 (10%) to 2 (200%).\n Decimals such as 0.2 indicate 20% rate.\nDefault recommended rate is 0.5 (50%)", "Character Preference", wl_rate) as num|null
 					if (new_wl_rate)
 						wl_rate = max(min(round(text2num(new_wl_rate),0.01),2),0)
+				
+				if("stuckage_chance")
+					var/new_stuckage_chance = input(user, "Choose your chance to get stuck in doors from 0.1 (10%) to 1 (100%).\nDecimals such as 0.2 indicate 20% chance.\nSetting this to 0 restores default values.", "Character Preference", stuckage_chance) as num|null
+					if(new_stuckage_chance)
+						stuckage_chance = clamp(new_stuckage_chance, 0.1, 1)
+					else
+						stuckage_chance = 0
 
 				if("marking_down")
 					// move the specified marking down

code/modules/client/preferences_savefile.dm

@@ -952,6 +952,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["helplessness_clothing_back"] >> helplessness_clothing_back
 	S["helplessness_no_buckle"] >> helplessness_no_buckle
 	S["stuckage"] >> stuckage
+	S["stuckage_chance"] >> stuckage_chance
 	S["chair_breakage"] >> chair_breakage
 	S["fatness_vulnerable"] >> fatness_vulnerable
 	S["extreme_fatness_vulnerable"] >> extreme_fatness_vulnerable
@@ -1247,6 +1248,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["helplessness_clothing_back"], helplessness_clothing_back)
 	WRITE_FILE(S["helplessness_no_buckle"], helplessness_no_buckle)
 	WRITE_FILE(S["stuckage"], stuckage)
+	WRITE_FILE(S["stuckage_chance"], stuckage_chance)
 	WRITE_FILE(S["chair_breakage"], chair_breakage)
 	WRITE_FILE(S["fatness_vulnerable"], fatness_vulnerable)
 	WRITE_FILE(S["extreme_fatness_vulnerable"], extreme_fatness_vulnerable)

code/modules/surgery/organs/eyes.dm

@@ -240,6 +240,7 @@
 /obj/item/organ/eyes/robotic/glow
 	name = "High Luminosity Eyes"
 	desc = "Special glowing eyes, used by snowflakes who want to be special."
+	flash_protect = 2 // GS13 EDIT Non-organic eyes should be protected from welding flash.
 	left_eye_color = "000"
 	right_eye_color = "000"
 	actions_types = list(/datum/action/item_action/organ_action/use, /datum/action/item_action/organ_action/toggle)
@@ -429,6 +430,7 @@
 	name = "ipc eyes"
 	icon_state = "cybernetic_eyeballs"
 	organ_flags = ORGAN_SYNTHETIC // GS13 = Fixes IPC organs decaying, we hope.
+	flash_protect = 2 // GS13 EDIT Non-organic eyes should be protected from welding flash.
 
 /obj/item/organ/eyes/ipc/emp_act(severity)
 	. = ..()