Merge branch 'master' into Pre-awaking-equipment

code/__DEFINES/conflict.dm

@@ -141,8 +141,8 @@
 #define WIELD_DELAY_VERY_SLOW 10
 #define WIELD_DELAY_HORRIBLE 12
 
-///This is how long you must wait after throwing something to throw again
-#define THROW_DELAY (0.4 SECONDS)
+///This is how long you must wait to throw again after throwing two things
+#define THROW_DELAY (1.5 SECONDS)
 
 //Explosion level thresholds. Upper bounds
 #define EXPLOSION_THRESHOLD_VLOW 50

code/__DEFINES/mobs.dm

@@ -89,6 +89,8 @@
 #define DAZE "daze"
 #define SLOW "slow"
 #define SUPERSLOW "superslow"
+#define ROOT "root"
+
 //=================================================
 
 //I hate adding defines like this but I'd much rather deal with bitflags than lists and string searches
@@ -100,14 +102,15 @@
 
 //Bitflags defining which status effects could be or are inflicted on a mob
 
-#define STATUS_FLAGS_DEBILITATE (CANSTUN|CANKNOCKOUT|CANDAZE|CANSLOW)
+#define STATUS_FLAGS_DEBILITATE (CANSTUN|CANKNOCKOUT|CANDAZE|CANSLOW|CANROOT)
 
 #define CANSTUN (1<<0)
 #define CANKNOCKDOWN (1<<1)
 #define CANKNOCKOUT (1<<2)
 #define CANPUSH (1<<3)
 #define LEAPING (1<<4)
 #define PASSEMOTES (1<<5) //holders inside of mob that need to see emotes.
+#define CANROOT (1<<6)
 #define GODMODE (1<<12)
 #define FAKEDEATH (1<<13) //Replaces stuff like changeling.changeling_fakedeath
 #define DISFIGURED (1<<14) //I'll probably move this elsewhere if I ever get wround to writing a bitflag mob-damage system

code/__HELPERS/#maths.dm

@@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
 #define Lcm(a, b) (abs(a) / Gcd(a, b) * abs(b))
 
 // Returns the nth root of x.
-#define Root(n, x) (x ** (1 / n))
+#define NRoot(n, x) (x ** (1 / n))
 
 // secant
 #define Sec(x) (1 / cos(x))

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 = "#000000")
+icon/Opaque(background = COLOR_BLACK)
 	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("#ffffff", ICON_SUBTRACT)
+	M.Blend(COLOR_WHITE, ICON_SUBTRACT)
 	// apply mask
 	Blend(M, ICON_ADD)
 
@@ -544,7 +544,7 @@ world
 	return flat_icon
 
 /proc/adjust_brightness(color, value)
-	if (!color) return "#FFFFFF"
+	if (!color) return COLOR_WHITE
 	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 = "#00FF00") //used for warden and queen healing
+/mob/proc/flick_heal_overlay(time, color = COLOR_GREEN) //used for warden and queen healing
 	var/image/I = image('icons/mob/mob.dmi', src, "heal_overlay")
 	switch(icon_size)
 		if(48)

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 = "#000"
+	color = COLOR_BLACK
 	alpha = 60
 
 /atom/movable/screen/fullscreen/lighting_backdrop/backplane
 	invisibility = INVISIBILITY_LIGHTING
 	layer = LIGHTING_BACKPLANE_LAYER
-	color = "#000"
+	color = COLOR_BLACK
 	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 = "#ffffff", ui_alpha = 255)
+/datum/hud/human/New(mob/living/carbon/human/owner, datum/custom_hud/hud_type, ui_color = COLOR_WHITE, ui_alpha = 255)
 	..()
 	ui_datum = hud_type
 	if(!istype(ui_datum))

code/datums/_atmos_setup.dm

@@ -6,11 +6,11 @@
 //  atmospherics devices.
 //--------------------------------------------
 
-#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_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_YELLOW "#ffcc00"
 #define PIPE_COLOR_PURPLE "#5c1ec0"
 

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 = "#ffffff")
+/datum/custom_hud/proc/special_behaviour(datum/hud/element, ui_alpha = 255, ui_color = COLOR_WHITE)
 	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 = "#ffffff")
+/datum/custom_hud/dark/special_behaviour(datum/hud/element, ui_alpha = 255, ui_color = COLOR_WHITE)
 	element.frame_hud = new /atom/movable/screen()
 	element.frame_hud.icon = ui_frame_icon
 	element.frame_hud.icon_state = "dark"

code/datums/emergency_calls/upp.dm

@@ -35,13 +35,16 @@
 	else
 		to_chat(M, SPAN_BOLD("You were brought online in a UPP engineering facility, knowing only your engineers for the first few weeks for your pseudo-life."))
 		to_chat(M, SPAN_BOLD("You were programmed with all of the medical and combat experience a military fighting force support asset required."))
-		to_chat(M, SPAN_BOLD("Throughout your career, your engineers, and later, your UPP compatriots, treated you like a tool, and only that."))
+		to_chat(M, SPAN_BOLD("Throughout your career, your engineers, and later, your UPP compatriots, treated you like [pick(75;"a tool, and only that.", 25;"a person, despite your purpose.")]"))
 		to_chat(M, SPAN_BOLD("Some weeks after your unit integration, you were assigned to the 17th 'Smoldering Sons' battalion (six hundred strong) under the command of Colonel Ganbaatar."))
 	to_chat(M, SPAN_BOLD("You were shipped off with the battalion to one of the UPP's most remote territories, a gas giant designated MV-35 in the Anglo-Japanese Arm, in the Neroid Sector."))
 	to_chat(M, SPAN_BOLD("For the past 14 months, you and the rest of the Smoldering Sons have been stationed at MV-35's only facility, the helium refinery, Altai Station."))
 	to_chat(M, SPAN_BOLD("As MV-35 and Altai Station are the only UPP-held zones in the Neroid Sector for many lightyears, you have spent most of your military career holed up in crammed quarters in near darkness, waiting for supply shipments and transport escort deployments."))
-	to_chat(M, SPAN_BOLD("With the recent arrival of the enemy USCM battalion the 'Falling Falcons' and their flagship, the [MAIN_SHIP_NAME], the UPP has felt threatened in the sector."))
-	to_chat(M, SPAN_BOLD("In an effort to protect the vulnerable MV-35 from the encroaching UA/USCM imperialists, the leadership of your battalion has opted this to be the best opportunity to strike at the Falling Falcons to catch them off guard."))
+	to_chat(M, SPAN_BOLD("With the recent arrival of the USCM battalion the 'Falling Falcons' and their flagship, the [MAIN_SHIP_NAME], the UPP has felt threatened in the sector."))
+	if(hostility)
+		to_chat(M, SPAN_BOLD("In an effort to protect the vulnerable MV-35 from the encroaching UA/USCM imperialists, the leadership of your battalion has opted this to be the best opportunity to strike at the Falling Falcons to catch them off guard."))
+	else
+		to_chat(M, SPAN_BOLD("Despite this, the leadership of your battalion questions what may have prompted the distress signal from their rivals. Your squad is to find out why and to render aid to the beleaguered UA forces."))
 	to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to Colonel Ganbaatar.")))
 	to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to the Smoldering Sons.")))
 	to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to the UPP.")))

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 = "#FFFFFF"
+	player_clan.color = COLOR_WHITE
 
 	player_clan.save()
 

code/datums/entities/player_times.dm

@@ -5,7 +5,7 @@
 
 	// Untracked vars
 	var/bgcolor = "#4a4a4a"
-	var/textcolor = "#ffffff"
+	var/textcolor = COLOR_WHITE
 
 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" = "#FFFFFF",
+		"textcolor" = COLOR_WHITE,
 		"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" = "#FFFFFF"
+			"textcolor" = COLOR_WHITE
 		)
 
 		var/list/marine_playtime = list(
 			"job" = "Human",
 			"playtime" = round(owning_client.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1),
 			"bgcolor" = "#3a3a3a",
-			"textcolor" = "#FFFFFF"
+			"textcolor" = COLOR_WHITE
 		)
 
 		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 = "#FFFFFF"
+/atom/var/langchat_color = COLOR_WHITE
 /atom/var/langchat_styles = ""
 
 /mob/living/carbon/xenomorph/langchat_color = "#b491c8"

code/datums/supply_packs/explosives.dm

@@ -1,7 +1,7 @@
 // Group to populate with all the explosives exept OB and mortar shell
 
 /datum/supply_packs/explosives
-	name = "surplus explosives crate (claymore mine x5, M40 HIDP x2, M40 HEDP x2, M15 Frag x2, M12 Blast x2)"
+	name = "surplus explosives crate (claymore mine x5, M40 HIDP x2, M40 HEDP x2, M15 Frag x2, M12 Blast x2, M40 MFHS x2)"
 	contains = list(
 		/obj/item/storage/box/explosive_mines,
 		/obj/item/explosive/grenade/high_explosive,
@@ -12,6 +12,8 @@
 		/obj/item/explosive/grenade/high_explosive/m15,
 		/obj/item/explosive/grenade/high_explosive/pmc,
 		/obj/item/explosive/grenade/high_explosive/pmc,
+		/obj/item/explosive/grenade/metal_foam,
+		/obj/item/explosive/grenade/metal_foam,
 	)
 	cost = 40
 	containertype = /obj/structure/closet/crate/explosives

code/game/machinery/vending/vendor_types/requisitions.dm

@@ -55,7 +55,7 @@
 		list("M74 AGM-Star Shell", round(scale * 2), /obj/item/explosive/grenade/high_explosive/airburst/starshell, VENDOR_ITEM_REGULAR),
 		list("M74 AGM-Hornet Shell", round(scale * 4), /obj/item/explosive/grenade/high_explosive/airburst/hornet_shell, VENDOR_ITEM_REGULAR),
 		list("M40 HIRR Baton Slug", round(scale * 8), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR),
-		list("M40 MFHS Metal Foam Grenade", round(scale * 3), /obj/item/explosive/grenade/metal_foam, VENDOR_ITEM_REGULAR),
+		list("M40 MFHS Metal Foam Grenade", round(scale * 6), /obj/item/explosive/grenade/metal_foam, VENDOR_ITEM_REGULAR),
 		list("Plastic Explosives", round(scale * 3), /obj/item/explosive/plastic, VENDOR_ITEM_REGULAR),
 		list("Breaching Charge", round(scale * 2), /obj/item/explosive/plastic/breaching_charge, VENDOR_ITEM_REGULAR),
 

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 = "#FFFFFF"
+	color = COLOR_WHITE
 
 /obj/effect/decal/cleanable/blood/gibs/xeno/up
 	random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6","xgibup1","xgibup1","xgibup1")

code/game/objects/effects/effect_system/foam.dm

@@ -156,7 +156,7 @@
 // dense and opaque, but easy to break
 
 #define FOAMED_METAL_FIRE_ACT_DMG 50
-#define FOAMED_METAL_XENO_SLASH 0.8
+#define FOAMED_METAL_XENO_SLASH 1.75
 #define FOAMED_METAL_ITEM_MELEE 2
 #define FOAMED_METAL_BULLET_DMG 2
 #define FOAMED_METAL_EXPLOSION_DMG 1
@@ -173,7 +173,7 @@
 
 /obj/structure/foamed_metal/iron
 	icon_state = "ironfoam"
-	health = 85
+	health = 70
 	name = "foamed iron"
 	desc = "A slightly stronger lightweight foamed iron wall."
 
@@ -211,7 +211,7 @@
 	return FALSE
 
 /obj/structure/foamed_metal/attack_alien(mob/living/carbon/xenomorph/X, dam_bonus)
-	var/damage = (rand(X.melee_damage_lower, X.melee_damage_upper) + dam_bonus)
+	var/damage = ((round((X.melee_damage_lower+X.melee_damage_upper)/2)) + dam_bonus)
 
 	//Frenzy bonus
 	if(X.frenzy_aura > 0)

code/game/objects/items/explosives/grenades/marines.dm

@@ -705,11 +705,11 @@
 	det_time = 20
 	underslug_launchable = TRUE
 	harmful = FALSE
-	var/foam_metal_type = FOAM_METAL_TYPE_ALUMINIUM
+	var/foam_metal_type = FOAM_METAL_TYPE_IRON
 
 /obj/item/explosive/grenade/metal_foam/prime()
 	var/datum/effect_system/foam_spread/s = new()
-	s.set_up(12, get_turf(src), metal_foam = foam_metal_type) //Metalfoam 1 for aluminum foam, 2 for iron foam (Stronger), 12 amt = 2 tiles radius (5 tile length diamond)
+	s.set_up(12, get_turf(src), metal_foam = foam_metal_type) //12 amt = 2 tiles radius (5 tile length diamond)
 	s.start()
 	qdel(src)
 

code/game/objects/items/handcuffs.dm

@@ -116,7 +116,7 @@
 	color = "#00DDDD"
 
 /obj/item/handcuffs/cable/white
-	color = "#FFFFFF"
+	color = COLOR_WHITE
 
 /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 = "#ffffff"
+	filling_color = COLOR_WHITE
 
 /obj/item/reagent_container/food/snacks/meat/synthmeat/synthetic/Initialize()
 	. = ..()

code/game/objects/structures/tables_racks.dm

@@ -353,7 +353,12 @@
 	set category = "Object"
 	set src in oview(1)
 
-	if(!can_touch(usr) || ismouse(usr))
+	if(!can_touch(usr))
+		return
+
+	// Small regular mob, or very small xeno.
+	if(usr.mob_size == MOB_SIZE_SMALL || usr.mob_size == MOB_SIZE_XENO_VERY_SMALL)
+		to_chat(usr, SPAN_WARNING("[isxeno(usr) ? "We are" : "You're"] too small to flip [src]."))
 		return
 
 	if(usr.a_intent != INTENT_HARM)

code/modules/asset_cache/asset_list_items.dm

@@ -323,7 +323,7 @@
 		if(icon_state in icon_states(icon_file))
 			I = icon(icon_file, icon_state, SOUTH)
 			var/c = initial(item.color)
-			if (!isnull(c) && c != "#FFFFFF")
+			if (!isnull(c) && c != COLOR_WHITE)
 				I.Blend(c, ICON_MULTIPLY)
 		else
 			if (ispath(k, /obj/effect/essentials_set))

code/modules/asset_cache/assets/vending.dm

@@ -34,7 +34,7 @@
 
 		var/icon/I = icon(icon_file, icon_state, SOUTH)
 		var/c = initial(item.color)
-		if (!isnull(c) && c != "#FFFFFF")
+		if (!isnull(c) && c != COLOR_WHITE)
 			I.Blend(c, ICON_MULTIPLY)
 
 		var/imgid = replacetext(replacetext("[item]", "/obj/item/", ""), "/", "-")

code/modules/client/preferences.dm

@@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(bgstate_options, list(
 	var/chat_display_preferences = CHAT_TYPE_ALL
 	var/item_animation_pref_level = SHOW_ITEM_ANIMATIONS_ALL
 	var/pain_overlay_pref_level = PAIN_OVERLAY_BLURRY
-	var/UI_style_color = "#ffffff"
+	var/UI_style_color = COLOR_WHITE
 	var/UI_style_alpha = 255
 	var/View_MC = FALSE
 	var/window_skin = 0

code/modules/cm_preds/yaut_bracers.dm

@@ -1061,7 +1061,7 @@
 	var/span_class = "yautja_translator"
 	if(translator_type != "Modern")
 		if(translator_type == "Retro")
-			overhead_color = "#FFFFFF"
+			overhead_color = COLOR_WHITE
 			span_class = "retro_translator"
 		msg = replacetext(msg, "a", "@")
 		msg = replacetext(msg, "e", "3")

code/modules/lighting/lighting_mask/lighting_mask.dm

@@ -105,7 +105,7 @@
 	current_angle = angle
 
 ///Setter proc for colors
-/atom/movable/lighting_mask/proc/set_color(colour = "#ffffff")
+/atom/movable/lighting_mask/proc/set_color(colour = COLOR_WHITE)
 	color = colour
 
 ///Setter proc for the intensity of the mask