Merge branch 'master' into Piloting-Blues

.github/alternate_byond_versions.txt

@@ -6,4 +6,4 @@
 # Example:
 # 500.1337: runtimestation
 
-515.1610: lv624
+515.1630: lv624

code/__HELPERS/#maths.dm

@@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
 
 // MATH DEFINES
 
-#define Ceiling(x) (-round(-x))
+#define Ceiling(x) (-round(-(x)))
 #define CLAMP01(x) (clamp(x, 0, 1))
 
 // cotangent

code/__HELPERS/icons.dm

@@ -34,7 +34,7 @@ icon/MinColors(icon)
 icon/MaxColors(icon)
 	The icon is blended with a second icon where the maximum of each RGB pixel is the result.
 	Opacity may increase, as if the icons were blended with ICON_OR. You may supply a color in place of an icon.
-icon/Opaque(background = COLOR_BLACK)
+icon/Opaque(background = "#000000")
 	All alpha values are set to 255 throughout the icon. Transparent pixels become black, or whatever background color you specify.
 icon/BecomeAlphaMask()
 	You can convert a simple grayscale icon into an alpha mask to use with other icons very easily with this proc.
@@ -246,7 +246,7 @@ world
 
 /icon/proc/AddAlphaMask(mask)
 	var/icon/M = new(mask)
-	M.Blend(COLOR_WHITE, ICON_SUBTRACT)
+	M.Blend("#ffffff", ICON_SUBTRACT)
 	// apply mask
 	Blend(M, ICON_ADD)
 
@@ -544,7 +544,7 @@ world
 	return flat_icon
 
 /proc/adjust_brightness(color, value)
-	if (!color) return COLOR_WHITE
+	if (!color) return "#FFFFFF"
 	if (!value) return color
 
 	var/list/RGB = ReadRGB(color)
@@ -581,7 +581,7 @@ world
 	if(A)
 		A.overlays.Remove(src)
 
-/mob/proc/flick_heal_overlay(time, color = COLOR_GREEN) //used for warden and queen healing
+/mob/proc/flick_heal_overlay(time, color = "#00FF00") //used for warden and queen healing
 	var/image/I = image('icons/mob/mob.dmi', src, "heal_overlay")
 	switch(icon_size)
 		if(48)

code/_globalvars/global_lists.dm

@@ -3,6 +3,9 @@ GLOBAL_LIST_EMPTY(WYFaxes) //Departmental faxes
 GLOBAL_LIST_EMPTY(USCMFaxes)
 GLOBAL_LIST_EMPTY(ProvostFaxes)
 GLOBAL_LIST_EMPTY(CMBFaxes)
+GLOBAL_LIST_EMPTY(UPPFaxes)
+GLOBAL_LIST_EMPTY(TWEFaxes)
+GLOBAL_LIST_EMPTY(CLFFaxes)
 GLOBAL_LIST_EMPTY(GeneralFaxes) //Inter-machine faxes
 GLOBAL_LIST_EMPTY(fax_contents) //List of fax contents to maintain it even if source paper is deleted
 

code/_onclick/hud/fullscreen.dm

@@ -212,13 +212,13 @@
 /atom/movable/screen/fullscreen/lighting_backdrop/lit_secondary
 	invisibility = INVISIBILITY_LIGHTING
 	layer = BACKGROUND_LAYER + LIGHTING_PRIMARY_DIMMER_LAYER
-	color = COLOR_BLACK
+	color = "#000"
 	alpha = 60
 
 /atom/movable/screen/fullscreen/lighting_backdrop/backplane
 	invisibility = INVISIBILITY_LIGHTING
 	layer = LIGHTING_BACKPLANE_LAYER
-	color = COLOR_BLACK
+	color = "#000"
 	blend_mode = BLEND_ADD
 
 /atom/movable/screen/fullscreen/see_through_darkness

code/_onclick/hud/human.dm

@@ -1,7 +1,7 @@
 /datum/hud/human
 	var/list/gear = list()
 
-/datum/hud/human/New(mob/living/carbon/human/owner, datum/custom_hud/hud_type, ui_color = COLOR_WHITE, ui_alpha = 255)
+/datum/hud/human/New(mob/living/carbon/human/owner, datum/custom_hud/hud_type, ui_color = "#ffffff", ui_alpha = 255)
 	..()
 	ui_datum = hud_type
 	if(!istype(ui_datum))

code/controllers/mc/globals.dm

@@ -13,7 +13,11 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
 	GLOB = src
 
 	var/datum/controller/exclude_these = new
-	gvars_datum_in_built_vars = exclude_these.vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order))
+	// I know this is dumb but the nested vars list hangs a ref to the datum. This fixes that
+	var/list/controller_vars = exclude_these.vars.Copy()
+	controller_vars["vars"] = null
+	gvars_datum_in_built_vars = controller_vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order))
+
 	QDEL_IN(exclude_these, 0) //signal logging isn't ready
 
 	log_world("[vars.len - gvars_datum_in_built_vars.len] global variables")

code/datums/_atmos_setup.dm

@@ -6,11 +6,11 @@
 //  atmospherics devices.
 //--------------------------------------------
 
-#define PIPE_COLOR_GREY COLOR_WHITE //yes white is grey
-#define PIPE_COLOR_RED COLOR_RED
-#define PIPE_COLOR_BLUE COLOR_BLUE
-#define PIPE_COLOR_CYAN COLOR_CYAN
-#define PIPE_COLOR_GREEN COLOR_GREEN
+#define PIPE_COLOR_GREY "#ffffff" //yes white is grey
+#define PIPE_COLOR_RED "#ff0000"
+#define PIPE_COLOR_BLUE "#0000ff"
+#define PIPE_COLOR_CYAN "#00ffff"
+#define PIPE_COLOR_GREEN "#00ff00"
 #define PIPE_COLOR_YELLOW "#ffcc00"
 #define PIPE_COLOR_PURPLE "#5c1ec0"
 

code/datums/ammo/energy.dm

@@ -28,8 +28,7 @@
 	icon_state = "stun"
 	damage_type = OXY
 	flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST|AMMO_ALWAYS_FF //Not that ignoring will do much right now.
-	damage = 15 //excessive use COULD be lethal
-	stamina_damage = 40
+	stamina_damage = 45
 	accuracy = HIT_ACCURACY_TIER_8
 	shell_speed = AMMO_SPEED_TIER_1 // Slightly faster
 	hit_effect_color = "#FFFF00"

code/datums/ammo/misc.dm

@@ -113,7 +113,7 @@
 /datum/ammo/flare/set_bullet_traits()
 	. = ..()
 	LAZYADD(traits_to_give, list(
-		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary)
+		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary, stacks = 2.5)
 	))
 
 /datum/ammo/flare/on_hit_mob(mob/M,obj/projectile/P)
@@ -156,11 +156,13 @@
 	name = "starshell ash"
 	icon_state = "starshell_bullet"
 	max_range = 5
+	damage = 2.5
 	flare_type = /obj/item/device/flashlight/flare/on/starshell_ash
 
 /datum/ammo/flare/starshell/set_bullet_traits()
 	LAZYADD(traits_to_give, list(
-		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff, /datum/element/bullet_trait_incendiary)
+		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff),
+		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary, stacks = 1)
 	))
 
 /datum/ammo/souto

code/datums/custom_hud.dm

@@ -82,7 +82,7 @@
 	var/coords_x = splittext(coords[1], ":")
 	return "[coords_x[1]]:[text2num(coords_x[2])+A.hud_offset],[coords[2]]"
 
-/datum/custom_hud/proc/special_behaviour(datum/hud/element, ui_alpha = 255, ui_color = COLOR_WHITE)
+/datum/custom_hud/proc/special_behaviour(datum/hud/element, ui_alpha = 255, ui_color = "#ffffff")
 	return
 
 /datum/custom_hud/old
@@ -131,7 +131,7 @@
 	var/coord_row_offset = -8
 	return "EAST[coord_col]:[coord_col_offset],NORTH[coord_row]:[coord_row_offset]"
 
-/datum/custom_hud/dark/special_behaviour(datum/hud/element, ui_alpha = 255, ui_color = COLOR_WHITE)
+/datum/custom_hud/dark/special_behaviour(datum/hud/element, ui_alpha = 255, ui_color = "#ffffff")
 	element.frame_hud = new /atom/movable/screen()
 	element.frame_hud.icon = ui_frame_icon
 	element.frame_hud.icon_state = "dark"

code/datums/entities/clans.dm

@@ -27,7 +27,7 @@ BSQL_PROTECT_DATUM(/datum/entity/clan)
 	)
 
 /datum/entity_meta/clan/on_insert(datum/entity/clan/player_clan)
-	player_clan.color = COLOR_WHITE
+	player_clan.color = "#FFFFFF"
 
 	player_clan.save()
 

code/datums/entities/player_times.dm

@@ -5,7 +5,7 @@
 
 	// Untracked vars
 	var/bgcolor = "#4a4a4a"
-	var/textcolor = COLOR_WHITE
+	var/textcolor = "#ffffff"
 
 BSQL_PROTECT_DATUM(/datum/entity/player_time)
 
@@ -62,7 +62,7 @@ BSQL_PROTECT_DATUM(/datum/entity/player_time)
 		"job" = role_id,
 		"playtime" = round(total_minutes MINUTES_TO_HOURS, 0.1),
 		"bgcolor" = "rgb(0, [Floor(128 * playtime_percentage)], [Floor(255 * playtime_percentage)])",
-		"textcolor" = COLOR_WHITE,
+		"textcolor" = "#FFFFFF",
 		"icondisplay" = icon_display
 	)
 
@@ -103,14 +103,14 @@ BSQL_PROTECT_DATUM(/datum/entity/player_time)
 			"job" = "Xenomorph",
 			"playtime" = round(owning_client.get_total_xeno_playtime() DECISECONDS_TO_HOURS, 0.1),
 			"bgcolor" = "#3a3a3a",
-			"textcolor" = COLOR_WHITE
+			"textcolor" = "#FFFFFF"
 		)
 
 		var/list/marine_playtime = list(
 			"job" = "Human",
 			"playtime" = round(owning_client.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1),
 			"bgcolor" = "#3a3a3a",
-			"textcolor" = COLOR_WHITE
+			"textcolor" = "#FFFFFF"
 		)
 
 		LAZYADD(xeno_playtimes, list(xeno_playtime))

code/datums/langchat/langchat.dm

@@ -1,5 +1,5 @@
 /atom/var/langchat_height = 32 // abovetile usually
-/atom/var/langchat_color = COLOR_WHITE
+/atom/var/langchat_color = "#FFFFFF"
 /atom/var/langchat_styles = ""
 
 /mob/living/carbon/xenomorph/langchat_color = "#b491c8"

code/game/machinery/fax_machine.dm

@@ -6,7 +6,10 @@ GLOBAL_LIST_EMPTY(alldepartments)
 #define DEPARTMENT_CMB "CMB Incident Command Center, Local Operations"
 #define DEPARTMENT_PROVOST "USCM Provost Office"
 #define DEPARTMENT_PRESS "Various Press Organizations"
-#define HIGHCOM_DEPARTMENTS list(DEPARTMENT_WY, DEPARTMENT_HC, DEPARTMENT_CMB, DEPARTMENT_PROVOST, DEPARTMENT_PRESS)
+#define DEPARTMENT_TWE "Three World Empire"
+#define DEPARTMENT_UPP "Union of Progress Peoples"
+#define DEPARTMENT_CLF "Colonial Liberation Front"
+#define HIGHCOM_DEPARTMENTS list(DEPARTMENT_WY, DEPARTMENT_HC, DEPARTMENT_CMB, DEPARTMENT_PROVOST, DEPARTMENT_PRESS, DEPARTMENT_TWE, DEPARTMENT_UPP, DEPARTMENT_CLF)
 
 /obj/structure/machinery/faxmachine // why not fax_machine?
 	name = "\improper General Purpose Fax Machine"
@@ -138,6 +141,13 @@ GLOBAL_LIST_EMPTY(alldepartments)
 		GLOB.alldepartments += DEPARTMENT_CMB
 	if(!(DEPARTMENT_PRESS in GLOB.alldepartments))
 		GLOB.alldepartments += DEPARTMENT_PRESS
+	if(!(DEPARTMENT_TWE in GLOB.alldepartments))
+		GLOB.alldepartments += DEPARTMENT_TWE
+	if(!(DEPARTMENT_UPP in GLOB.alldepartments))
+		GLOB.alldepartments += DEPARTMENT_UPP
+	if(!(DEPARTMENT_CLF in GLOB.alldepartments))
+		GLOB.alldepartments += DEPARTMENT_CLF
+
 // TGUI SHIT \\
 
 /obj/structure/machinery/faxmachine/tgui_interact(mob/user, datum/tgui/ui)
@@ -277,9 +287,12 @@ GLOBAL_LIST_EMPTY(alldepartments)
 	. = ..()
 	. += "<option value>-----FAX-----</option>"
 	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[usr];originfax=\ref[src]'>Send USCM fax message</option>"
-	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[usr];originfax=\ref[src]'>Send CL fax message</option>"
+	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];WYFaxReply=\ref[usr];originfax=\ref[src]'>Send CL fax message</option>"
 	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[usr];originfax=\ref[src]'>Send CMB fax message</option>"
 	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[usr];originfax=\ref[src]'>Send Press fax message</option>"
+	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];UPPFaxReply=\ref[usr];originfax=\ref[src]'>Send UPP fax message</option>"
+	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFFaxReply=\ref[usr];originfax=\ref[src]'>Send CLF fax message</option>"
+	. += "<option value='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];TWEFaxReply=\ref[usr];originfax=\ref[src]'>Send TWE fax message</option>"
 
 // converting whatever type the fax is into a single paper with all the information on it.
 /obj/structure/machinery/faxmachine/proc/copy_fax_paper(mob/living/user)
@@ -339,13 +352,22 @@ GLOBAL_LIST_EMPTY(alldepartments)
 			GLOB.CMBFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CMBFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_WY)
-			GLOB.WYFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
-			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
+			GLOB.WYFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];WYFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];WYFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		if(DEPARTMENT_PRESS)
 			GLOB.PressFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];PressFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
+		if(DEPARTMENT_TWE)
+			GLOB.TWEFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];TWEFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];TWEFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
+		if(DEPARTMENT_UPP)
+			GLOB.UPPFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];UPPFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];UPPFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
+		if(DEPARTMENT_CLF)
+			GLOB.CLFFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 		else
-			GLOB.GeneralFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CLFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
+			GLOB.GeneralFaxes.Add("<a href='?FaxView=\ref[faxcontents]'>\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\]</a> <a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];WYFaxReply=\ref[user];originfax=\ref[src]'>REPLY</a>")
 			msg_admin += "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];USCMFaxReply=\ref[user];originfax=\ref[src]'>RPLY</a>)</b>: "
 
 	msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... <a href='?FaxView=\ref[faxcontents]'>view message</a>")
@@ -416,6 +438,30 @@ GLOBAL_LIST_EMPTY(alldepartments)
 							P.stamped += /obj/item/tool/stamp
 							P.overlays += stampoverlay
 							P.stamps += "<HR><i>This paper has been stamped and encrypted by the Weyland-Yutani Quantum Relay (tm).</i>"
+						if("TWE Royal Marines Commando Quantum Relay")
+							var/image/stampoverlay = image('icons/obj/items/paper.dmi')
+							stampoverlay.icon_state = "paper_stamp-twe"
+							if(!P.stamped)
+								P.stamped = new
+							P.stamped += /obj/item/tool/stamp
+							P.overlays += stampoverlay
+							P.stamps += "<HR><i>This paper has been stamped by the TWE Royal Marines Commando Quantum Relay.</i>"
+						if("UPP High Kommand Quantum Relay")
+							var/image/stampoverlay = image('icons/obj/items/paper.dmi')
+							stampoverlay.icon_state = "paper_stamp-upp"
+							if(!P.stamped)
+								P.stamped = new
+							P.stamped += /obj/item/tool/stamp
+							P.overlays += stampoverlay
+							P.stamps += "<HR><i>This paper has been stamped by the UPP High Kommand Quantum Relay.</i>"
+						if("CLF Gureilla Command Quantum Relay")
+							var/image/stampoverlay = image('icons/obj/items/paper.dmi')
+							stampoverlay.icon_state = "paper_stamp-clf"
+							if(!P.stamped)
+								P.stamped = new
+							P.stamped += /obj/item/tool/stamp
+							P.overlays += stampoverlay
+							P.stamps += "<HR><i>This paper has been stamped and encrypted by the CLF Gureilla Command Quantum Relay.</i>"
 
 					playsound(F.loc, "sound/items/polaroid1.ogg", 15, 1)
 		qdel(faxcontents)

code/game/objects/effects/decals/cleanable/blood/xeno.dm

@@ -17,7 +17,7 @@
 	basecolor = BLOOD_COLOR_XENO
 
 /obj/effect/decal/cleanable/blood/gibs/xeno/update_icon()
-	color = COLOR_WHITE
+	color = "#FFFFFF"
 
 /obj/effect/decal/cleanable/blood/gibs/xeno/up
 	random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibup1","xgibup1","xgibup1")

code/game/objects/items/explosives/mine.dm

@@ -266,6 +266,8 @@
 
 /obj/effect/mine_tripwire/Destroy()
 	if(linked_claymore)
+		if(linked_claymore.tripwire == src)
+			linked_claymore.tripwire = null
 		linked_claymore = null
 	. = ..()
 

code/game/objects/items/handcuffs.dm

@@ -116,7 +116,7 @@
 	color = "#00DDDD"
 
 /obj/item/handcuffs/cable/white
-	color = COLOR_WHITE
+	color = "#FFFFFF"
 
 /obj/item/handcuffs/cable/attackby(obj/item/I, mob/user as mob)
 	..()

code/game/objects/items/reagent_containers/food/snacks/meat.dm

@@ -32,7 +32,7 @@
 	name = "synthetic flesh"
 	desc = "A slab of artificial, inorganic 'flesh' that resembles human meat. Probably came from a synth."
 	icon_state = "synthmeat"
-	filling_color = COLOR_WHITE
+	filling_color = "#ffffff"
 
 /obj/item/reagent_container/food/snacks/meat/synthmeat/synthetic/Initialize()
 	. = ..()

code/game/objects/items/stacks/stack.dm

@@ -144,15 +144,21 @@ Also change the icon to reflect the amount of sheets, if possible.*/
 		list_recipes(usr, text2num(href_list["sublist"]))
 
 	if(href_list["make"])
-		if(amount < 1) qdel(src) //Never should happen
+		if(amount < 1)
+			qdel(src) //Never should happen
+			return
 
 		var/list/recipes_list = recipes
 		if(href_list["sublist"])
 			var/datum/stack_recipe_list/srl = recipes_list[text2num(href_list["sublist"])]
 			recipes_list = srl.recipes
 		var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])]
 		var/multiplier = text2num(href_list["multiplier"])
-		if(!isnum(multiplier))
+		if(multiplier != multiplier) // isnan
+			message_admins("[key_name_admin(usr)] has attempted to multiply [src] with NaN")
+			return
+		if(!isnum(multiplier)) // this used to block nan...
+			message_admins("[key_name_admin(usr)] has attempted to multiply [src] with !isnum")
 			return
 		multiplier = round(multiplier)
 		if(multiplier < 1)

code/game/objects/items/storage/pouch.dm

@@ -1107,8 +1107,8 @@
 	name = "flare pouch"
 	desc = "A pouch designed to hold flares. Refillable with an M94 flare pack."
 	max_w_class = SIZE_SMALL
-	storage_slots = 8
-	max_storage_space = 8
+	storage_slots = 16
+	max_storage_space = 16
 	storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD
 	icon_state = "flare"
 	can_hold = list(/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare/signal)

code/game/objects/items/weapons/stunbaton.dm

@@ -4,10 +4,10 @@
 	icon_state = "stunbaton"
 	item_state = "baton"
 	flags_equip_slot = SLOT_WAIST
-	force = 20
+	force = 15
+	throwforce = 7
 	sharp = FALSE
 	edge = FALSE
-	throwforce = 10
 	w_class = SIZE_MEDIUM
 
 	attack_verb = list("beaten")