Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/__HELPERS/icons.dm

@@ -1235,3 +1235,18 @@ GLOBAL_DATUM_INIT(dummySave, /savefile, new("tmp/dummySave.sav")) //Cache of ico
 	var/icon/I = getFlatIcon(thing)
 	return icon2html(I, target, sourceonly = sourceonly)
 
+/* Gives the result RGB of a RGB string after a matrix transformation. No alpha.
+ * Input: rr, rg, rb, gr, gg, gb, br, bg, bb, cr, cg, cb
+ * Output: RGB string
+ */
+/proc/RGBMatrixTransform(list/color, list/cm)
+	ASSERT(cm.len >= 9)
+	if(cm.len < 12)		// fill in the rest
+		for(var/i in 1 to (12 - cm.len))
+			cm += 0
+	if(!islist(color))
+		color = ReadRGB(color)
+	color[1] = color[1] * cm[1] + color[2] * cm[2] + color[3] * cm[3] + cm[10] * 255
+	color[2] = color[1] * cm[4] + color[2] * cm[5] + color[3] * cm[6] + cm[11] * 255
+	color[3] = color[1] * cm[7] + color[2] * cm[8] + color[3] * cm[9] + cm[12] * 255
+	return rgb(color[1], color[2], color[3])

code/__HELPERS/matrices.dm

@@ -177,3 +177,9 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro
 		for(x in 1 to 4)
 			output[offset+x] = round(A[offset+1]*B[x] + A[offset+2]*B[x+4] + A[offset+3]*B[x+8] + A[offset+4]*B[x+12]+(y==5?B[x+16]:0), 0.001)
 	return output
+
+/**
+ * Assembles a color matrix, defaulting to identity
+ */
+/proc/rgb_construct_color_matrix(rr = 1, rg, rb, gr, gg = 1, gb, br, bg, bb = 1, cr, cg, cb)
+	return list(rr, rg, rb, gr, gg, gb, br, bg, bb, cr, cg, cb)

code/datums/martial/sleeping_carp.dm

@@ -134,6 +134,28 @@
 		return BULLET_ACT_FORCE_PIERCE
 	return BULLET_ACT_HIT
 
+/datum/block_parry_data/sleeping_carp
+	parry_time_windup = 0
+	parry_time_active = 25
+	parry_time_spindown = 0
+	// we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing.
+	parry_time_windup_visual_override = 1
+	parry_time_active_visual_override = 3
+	parry_time_spindown_visual_override = 12
+	parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK		//can attack while
+	parry_time_perfect = 2.5		// first ds isn't perfect
+	parry_time_perfect_leeway = 1.5
+	parry_imperfect_falloff_percent = 5
+	parry_efficiency_to_counterattack = 100
+	parry_efficiency_considered_successful = 65		// VERY generous
+	parry_efficiency_perfect = 100
+	parry_failed_stagger_duration = 4 SECONDS
+	parry_cooldown = 0.5 SECONDS
+
+/mob/living/carbon/human/UseStaminaBuffer(amount, warn = FALSE, considered_action = TRUE)
+	amount *= physiology? physiology.stamina_buffer_mod : 1
+	return ..()
+
 /datum/martial_art/the_sleeping_carp/teach(mob/living/carbon/human/H, make_temporary = FALSE)
 	. = ..()
 	if(!.)
@@ -144,12 +166,12 @@
 	ADD_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT)
 	H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it
 	H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant
-	H.physiology.stamina_mod *= 0.5 //You take less stamina damage overall, but you do not reduce the damage from stun batons
+	H.physiology.stamina_mod *= 0.4 //You take less stamina damage overall, but you do not reduce the damage from stun batons as much
 	H.physiology.stun_mod *= 0.3 //for those rare stuns
 	H.physiology.pressure_mod *= 0.3 //go hang out with carp
 	H.physiology.cold_mod *= 0.3 //cold mods are different to burn mods, they do stack however
 	H.physiology.heat_mod *= 2 //this is mostly so sleeping carp has a viable weakness. Cooking them alive. Setting them on fire and heating them will be their biggest weakness. The reason for this is....filet jokes.
-
+	H.physiology.stamina_buffer_mod *= 0.75 //to help with some stamina
 	H.faction |= "carp" //:D
 
 /datum/martial_art/the_sleeping_carp/on_remove(mob/living/carbon/human/H)
@@ -165,7 +187,7 @@
 	H.physiology.pressure_mod = initial(H.physiology.pressure_mod) //no more carpies
 	H.physiology.cold_mod = initial(H.physiology.cold_mod)
 	H.physiology.heat_mod = initial(H.physiology.heat_mod)
-
+	H.physiology.stamina_buffer_mod = initial(H.physiology.stamina_buffer_mod)
 	H.faction -= "carp" //:(
 
 /mob/living/carbon/human/proc/sleeping_carp_help()

code/game/machinery/colormate.dm

@@ -0,0 +1,223 @@
+/obj/machinery/gear_painter
+	name = "\improper Color Mate"
+	desc = "A machine to give your apparel a fresh new color! Recommended to use with white items for best results."
+	icon = 'icons/obj/vending.dmi'
+	icon_state = "colormate"
+	density = TRUE
+	anchored = TRUE
+	circuit = /obj/item/circuitboard/machine/colormate
+	var/obj/item/inserted
+	var/activecolor = "#FFFFFF"
+	var/list/color_matrix_last
+	var/matrix_mode = FALSE
+	/// Minimum lightness for normal mode
+	var/minimum_normal_lightness = 50
+	/// Minimum lightness for matrix mode, tested using 4 test colors of full red, green, blue, white.
+	var/minimum_matrix_lightness = 75
+	/// Minimum matrix tests that must pass for something to be considered a valid color (see above)
+	var/minimum_matrix_tests = 2
+	var/list/allowed_types = list(
+			/obj/item/clothing,
+			/obj/item/storage/backpack,
+			/obj/item/storage/belt
+			)
+
+/obj/machinery/gear_painter/Initialize(mapload)
+	. = ..()
+	color_matrix_last = list(
+		1, 0, 0,
+		0, 1, 0,
+		0, 0, 1,
+		0, 0, 0
+	)
+
+/obj/machinery/gear_painter/update_icon_state()
+	if(panel_open)
+		icon_state = "colormate_open"
+	else if(!is_operational())
+		icon_state = "colormate_off"
+	else if(inserted)
+		icon_state = "colormate_active"
+	else
+		icon_state = "colormate"
+
+/obj/machinery/gear_painter/Destroy()
+	inserted.forceMove(drop_location())
+	return ..()
+
+/obj/machinery/gear_painter/attackby(obj/item/I, mob/living/user)
+	if(inserted)
+		to_chat(user, "<span class='warning'>The machine is already loaded.</span>")
+		return
+	if(default_deconstruction_screwdriver(user, "colormate_open", "colormate", I))
+		return
+	if(default_deconstruction_crowbar(I))
+		return
+	if(default_unfasten_wrench(user, I, 40))
+		return
+	if(user.a_intent == INTENT_HARM)
+		return ..()
+
+	if(is_type_in_list(I, allowed_types) && is_operational())
+		if(!user.transferItemToLoc(I, src))
+			to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
+			return
+		user.visible_message("<span class='notice'>[user] inserts [I] into [src]'s receptable.</span>")
+
+		inserted = I
+		update_icon()
+	else
+		return ..()
+
+/obj/machinery/gear_painter/AllowDrop()
+	return FALSE
+
+/obj/machinery/gear_painter/AltClick(mob/user)
+	. = ..()
+	if(!user.CanReach(src))
+		return
+	if(!inserted)
+		return
+	to_chat(user, "<span class='notice'>You remove [inserted] from [src]")
+	inserted.forceMove(drop_location())
+	inserted = null
+	update_icon()
+	updateUsrDialog()
+
+/obj/machinery/gear_painter/ui_interact(mob/user)
+	if(!is_operational())
+		return
+	user.set_machine(src)
+	var/list/dat = list("<TITLE>Color Mate Control Panel</TITLE><BR>")
+	if(!inserted)
+		dat += "No item inserted."
+	else
+		dat += "Item inserted: [inserted]<HR>"
+		dat += "<a href='?src=[REF(src)];toggle_matrix_mode=1'>Matrix mode: [matrix_mode? "On" : "Off"]</a>"
+		if(!matrix_mode)
+			dat += "<A href='?src=\ref[src];select=1'>Select new color.</A><BR>"
+			dat += "Color: <font color='[activecolor]'>&#9899;</font>"
+			dat += "<A href='?src=\ref[src];paint=1'>Apply new color.</A><BR><BR>"
+		else
+			// POGGERS
+#define MATRIX_FIELD(field, default) "<b><label for='[##field]'>[##field]</label></b> <input type='number' step='0.001' name='[field]' value='[default]'>"
+			dat += "<br><form name='matrix paint' action='?src=[REF(src)]'>"
+			dat += "<input type='hidden' name='src' value='[REF(src)]'>"
+			dat += "<input type='hidden' name='matrix_paint' value='1'"
+			dat += "<br><br>"
+			dat += MATRIX_FIELD("rr", color_matrix_last[1])
+			dat += MATRIX_FIELD("rg", color_matrix_last[2])
+			dat += MATRIX_FIELD("rb", color_matrix_last[3])
+			dat += "<br><br>"
+			dat += MATRIX_FIELD("gr", color_matrix_last[4])
+			dat += MATRIX_FIELD("gg", color_matrix_last[5])
+			dat += MATRIX_FIELD("gb", color_matrix_last[6])
+			dat += "<br><br>"
+			dat += MATRIX_FIELD("br", color_matrix_last[7])
+			dat += MATRIX_FIELD("bg", color_matrix_last[8])
+			dat += MATRIX_FIELD("bb", color_matrix_last[9])
+			dat += "<br><br>"
+			dat += MATRIX_FIELD("cr", color_matrix_last[10])
+			dat += MATRIX_FIELD("cg", color_matrix_last[11])
+			dat += MATRIX_FIELD("cb", color_matrix_last[12])
+			dat += "<br><br>"
+			dat += "<input type='submit' value='Matrix Paint'>"
+			dat += "</form><br>"
+#undef MATRIX_FIELD
+		dat += "<A href='?src=\ref[src];clear=1'>Remove paintjob.</A><BR><BR>"
+		dat += "<A href='?src=\ref[src];eject=1'>Eject item.</A><BR><BR>"
+
+	var/datum/browser/menu = new(user, "colormate","Color Mate Control Panel", 800, 600, src)
+	menu.set_content(dat.Join(""))
+	menu.open()
+
+/obj/machinery/gear_painter/Topic(href, href_list)
+	if((. = ..()))
+		return
+
+	add_fingerprint(usr)
+
+	if(href_list["close"])
+		usr << browse(null, "window=colormate")
+		return
+
+	if(href_list["select"])
+		var/newcolor = input(usr, "Choose a color.", "", activecolor) as color|null
+		if(newcolor)
+			activecolor = newcolor
+		updateUsrDialog()
+
+	if(href_list["paint"])
+		if(!inserted)
+			return
+		if(!check_valid_color(activecolor, usr))
+			return
+		inserted.add_atom_colour(activecolor, FIXED_COLOUR_PRIORITY)
+		playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+		updateUsrDialog()
+
+	if(href_list["toggle_matrix_mode"])
+		matrix_mode = !matrix_mode
+		updateUsrDialog()
+
+	if(href_list["matrix_paint"])
+		if(!inserted)
+			return
+		// assemble matrix
+		var/list/cm = rgb_construct_color_matrix(
+			text2num(href_list["rr"]),
+			text2num(href_list["rg"]),
+			text2num(href_list["rb"]),
+			text2num(href_list["gr"]),
+			text2num(href_list["gg"]),
+			text2num(href_list["gb"]),
+			text2num(href_list["br"]),
+			text2num(href_list["bg"]),
+			text2num(href_list["bb"]),
+			text2num(href_list["cr"]),
+			text2num(href_list["cg"]),
+			text2num(href_list["cb"])
+		)
+		color_matrix_last = cm.Copy()
+		if(!check_valid_color(cm, usr))
+			return
+		inserted.add_atom_colour(cm, FIXED_COLOUR_PRIORITY)
+		playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+		updateUsrDialog()
+
+	if(href_list["clear"])
+		if(!inserted)
+			return
+		inserted.remove_atom_colour(FIXED_COLOUR_PRIORITY)
+		playsound(src, 'sound/effects/spray3.ogg', 50, 1)
+		updateUsrDialog()
+
+	if(href_list["eject"])
+		if(!inserted)
+			return
+		inserted.forceMove(drop_location())
+		inserted = null
+		update_icon()
+		updateUsrDialog()
+
+/obj/machinery/gear_painter/proc/check_valid_color(list/cm, mob/user)
+	if(!islist(cm))		// normal
+		var/list/HSV = ReadHSV(RGBtoHSV(cm))
+		if(HSV[3] < minimum_normal_lightness)
+			to_chat(user, "<span class='warning'>[cm] is far too dark (min lightness [minimum_normal_lightness]!</span>")
+			return FALSE
+		return TRUE
+	else	// matrix
+		// We test using full red, green, blue, and white
+		// A predefined number of them must pass to be considered valid
+		var/passed = 0
+#define COLORTEST(thestring, thematrix) passed += (ReadHSV(RGBtoHSV(RGBMatrixTransform(thestring, thematrix)))[3] >= minimum_matrix_lightness)
+		COLORTEST("FF0000", cm)
+		COLORTEST("00FF00", cm)
+		COLORTEST("0000FF", cm)
+		COLORTEST("FFFFFF", cm)
+#undef COLORTEST
+		if(passed < minimum_matrix_tests)
+			to_chat(user, "<span class='warning'>[english_list(color)] is not allowed (pased [passed] out of 4, minimum [minimum_matrix_tests], minimum lightness [minimum_matrix_lightness]).</span>")
+			return FALSE
+		return TRUE

code/game/machinery/limbgrower.dm

@@ -1,4 +1,3 @@
-/* moved to sandcode ;)
 #define LIMBGROWER_MAIN_MENU       1
 #define LIMBGROWER_CATEGORY_MENU   2
 #define LIMBGROWER_CHEMICAL_MENU   3
@@ -25,19 +24,24 @@
 	var/selected_category
 	var/screen = 1
 	var/list/categories = list(
-							"human",
-							"lizard",
-							"fly",
-							"insect",
-							"plasmaman",
-							"mammal",
-							"xeno",
-							"other"
+							"human" = /datum/species/human,
+							"lizard" = /datum/species/lizard,
+							"mammal" =  /datum/species/mammal,
+							"insect" =  /datum/species/insect,
+							"fly" =  /datum/species/fly,
+							"plasmaman" =  /datum/species/plasmaman,
+							"xeno" =  /datum/species/xeno,
+							"other" = /datum/species,
 							)
+	var/list/stored_species = list()
+	var/obj/item/disk/data/dna_disk
 
 /obj/machinery/limbgrower/Initialize()
 	create_reagents(100, OPENCONTAINER)
 	stored_research = new /datum/techweb/specialized/autounlocking/limbgrower
+	for(var/i in categories)
+		var/species = categories[i]
+		stored_species[i] = new species()
 	. = ..()
 
 /obj/machinery/limbgrower/ui_interact(mob/user)
@@ -65,8 +69,8 @@
 	..()
 
 /obj/machinery/limbgrower/attackby(obj/item/O, mob/user, params)
-	if (busy)
-		to_chat(user, "<span class=\"alert\">The Limb Grower is busy. Please wait for completion of previous operation.</span>")
+	if(busy)
+		to_chat(user, "<span class=\"alert\">\The [src] is busy. Please wait for completion of previous operation.</span>")
 		return
 
 	if(default_deconstruction_screwdriver(user, "limbgrower_panelopen", "limbgrower_idleoff", O))
@@ -79,6 +83,16 @@
 	if(user.a_intent == INTENT_HARM) //so we can hit the machine
 		return ..()
 
+	if(istype(O, /obj/item/disk))
+		if(dna_disk)
+			to_chat(user, "<span class='warning'>\The [src] already has a dna disk, take it out first!</span>")
+			return
+		else
+			O.forceMove(src)
+			dna_disk = O
+			to_chat(user, "<span class='notice'>You insert \the [O] into \the [src].</span>")
+			return
+
 /obj/machinery/limbgrower/Topic(href, href_list)
 	if(..())
 		return
@@ -111,8 +125,24 @@
 				icon_state = "limbgrower_idleon"
 				addtimer(CALLBACK(src, .proc/build_item),32*prod_coeff)
 
+		if(href_list["dna_disk"])
+			var/mob/living/carbon/user = usr
+			if(istype(user))
+				if(!dna_disk)
+					var/obj/item/disk/diskette = user.get_active_held_item()
+					if(istype(diskette))
+						diskette.forceMove(src)
+						dna_disk = diskette
+						to_chat(user, "<span class='notice'>You insert \the [diskette] into \the [src].</span>")
+				else
+					dna_disk.forceMove(src.loc)
+					user.put_in_active_hand(dna_disk)
+					to_chat(user, "<span class='notice'>You remove \the [dna_disk] from \the [src].</span>")
+					dna_disk = null
+			else
+				to_chat(user, "<span class='warning'>You are unable to grasp \the [dna_disk] disk from \the [src].</span>")
 	else
-		to_chat(usr, "<span class=\"alert\">The limb grower is busy. Please wait for completion of previous operation.</span>")
+		to_chat(usr, "<span class=\"alert\">\The [src] is busy. Please wait for completion of previous operation.</span>")
 
 	updateUsrDialog()
 	return
@@ -121,8 +151,10 @@
 	if(reagents.has_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff))	//sanity check, if this happens we are in big trouble
 		reagents.remove_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff)
 		var/buildpath = being_built.build_path
-		if(ispath(buildpath, /obj/item/bodypart))	//This feels like spatgheti code, but i need to initilise a limb somehow
+		if(ispath(buildpath, /obj/item/bodypart))	//This feels like spaghetti code, but i need to initiliaze a limb somehow
 			build_limb(buildpath)
+		else if(ispath(buildpath, /obj/item/organ/genital)) //genitals are uhh... customizable
+			build_genital(buildpath)
 		else
 			//Just build whatever it is
 			new buildpath(loc)
@@ -136,19 +168,65 @@
 /obj/machinery/limbgrower/proc/build_limb(buildpath)
 	//i need to create a body part manually using a set icon (otherwise it doesnt appear)
 	var/obj/item/bodypart/limb
+	var/datum/species/selected = stored_species[selected_category]
 	limb = new buildpath(loc)
-	if(selected_category=="human" || selected_category=="lizard") //Species with greyscale parts should be included here
-		limb.icon = 'icons/mob/human_parts_greyscale.dmi'
-		limb.base_bp_icon = DEFAULT_BODYPART_ICON_ORGANIC
-		limb.color_src = MUTCOLORS
-	else
-		limb.icon = 'icons/mob/human_parts.dmi'
-	// Set this limb up using the specias name and body zone
-	limb.icon_state = "[selected_category]_[limb.body_zone]"
-	limb.name = "\improper synthetic [selected_category] [parse_zone(limb.body_zone)]"
-	limb.desc = "A synthetic [selected_category] limb that will morph on its first use in surgery. This one is for the [parse_zone(limb.body_zone)]."
-	limb.species_id = selected_category
+	limb.base_bp_icon = selected.icon_limbs || DEFAULT_BODYPART_ICON_ORGANIC
+	limb.species_id = selected.limbs_id
+	limb.color_src = (MUTCOLORS in selected.species_traits ? MUTCOLORS : (selected.use_skintones ? SKINTONE : FALSE))
+	limb.should_draw_gender = (selected.sexes && (limb.body_zone in list(BODY_ZONE_HEAD, BODY_ZONE_CHEST)))
+	limb.update_limb(TRUE)
 	limb.update_icon_dropped()
+	limb.name = "\improper synthetic [lowertext(selected.name)] [limb.name]"
+	limb.desc = "A synthetic [selected_category] limb that will morph on its first use in surgery. This one is for the [parse_zone(limb.body_zone)]."
+	for(var/obj/item/bodypart/BP in limb)
+		BP.base_bp_icon = selected.icon_limbs || DEFAULT_BODYPART_ICON_ORGANIC
+		BP.species_id = selected.limbs_id
+		BP.color_src = (MUTCOLORS in selected.species_traits ? MUTCOLORS : (selected.use_skintones ? SKINTONE : FALSE))
+		BP.should_draw_gender = (selected.sexes && (limb.body_zone in list(BODY_ZONE_HEAD, BODY_ZONE_CHEST)))
+		BP.update_limb(TRUE)
+		BP.update_icon_dropped()
+		BP.name = "\improper synthetic [lowertext(selected.name)] [limb.name]"
+		BP.desc = "A synthetic [selected_category] limb that will morph on its first use in surgery. This one is for the [parse_zone(limb.body_zone)]."
+
+/obj/machinery/limbgrower/proc/build_genital(buildpath)
+	//i needed to create a way to customize gene tools using dna
+	var/list/features = dna_disk?.fields["features"]
+	if(length(features))
+		switch(buildpath)
+			if(/obj/item/organ/genital/penis)
+				var/obj/item/organ/genital/penis/penis = new(loc)
+				if(features["has_cock"])
+					penis.shape = features["cock_shape"]
+					penis.length = features["cock_shape"]
+					penis.diameter_ratio = features["cock_diameter_ratio"]
+					penis.color = sanitize_hexcolor(features["cock_color"], 6)
+					penis.update_icon()
+			if(/obj/item/organ/genital/testicles)
+				var/obj/item/organ/genital/testicles/balls = new(loc)
+				if(features["has_balls"])
+					balls.color = sanitize_hexcolor(features["balls_color"], 6)
+					balls.shape = features["balls_shape"]
+					balls.size = features["balls_size"]
+					balls.fluid_rate = features["balls_cum_rate"]
+					balls.fluid_mult = features["balls_cum_mult"]
+					balls.fluid_efficiency = features["balls_efficiency"]
+			if(/obj/item/organ/genital/vagina)
+				var/obj/item/organ/genital/vagina/vegana = new(loc)
+				if(features["has_vagina"])
+					vegana.color = sanitize_hexcolor(features["vag_color"], 6)
+					vegana.shape = features["vag_shape"]
+			if(/obj/item/organ/genital/breasts)
+				var/obj/item/organ/genital/breasts/boobs = new(loc)
+				if(features["has_breasts"])
+					boobs.color = sanitize_hexcolor(features["breasts_color"], 6)
+					boobs.size = features["breasts_size"]
+					boobs.shape = features["breasts_shape"]
+					if(!features["breasts_producing"])
+						boobs.genital_flags &= ~(GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH)
+			else
+				new buildpath(loc)
+	else
+		new buildpath(loc)
 
 /obj/machinery/limbgrower/RefreshParts()
 	reagents.maximum_volume = 0
@@ -166,7 +244,9 @@
 		. += "<span class='notice'>The status display reads: Storing up to <b>[reagents.maximum_volume]u</b> of synthflesh.<br>Synthflesh consumption at <b>[prod_coeff*100]%</b>.<span>"
 
 /obj/machinery/limbgrower/proc/main_win(mob/user)
-	var/dat = "<div class='statusDisplay'><h3>Limb Grower Menu:</h3><br>"
+	var/dat = "<div class='statusDisplay'><h3>[src] Menu:</h3><br>"
+	dat += "<A href='?src=[REF(src)];dna_disk=1'>[dna_disk ? "Remove" : "Insert"] cloning data disk</A>"
+	dat += "<hr>"
 	dat += "<A href='?src=[REF(src)];menu=[LIMBGROWER_CHEMICAL_MENU]'>Chemical Storage</A>"
 	dat += materials_printout()
 	dat += "<table style='width:100%' align='center'><tr>"
@@ -219,7 +299,7 @@
 
 /obj/machinery/limbgrower/proc/get_design_cost(datum/design/D)
 	var/dat
-	if(D.reagents_list["synthflesh"])
+	if(D.reagents_list[/datum/reagent/medicine/synthflesh])
 		dat += "[D.reagents_list[/datum/reagent/medicine/synthflesh] * prod_coeff] Synthetic flesh "
 	return dat
 
@@ -234,4 +314,47 @@
 	to_chat(user, "<span class='warning'>A warning flashes onto the screen, stating that safety overrides have been deactivated!</span>")
 	obj_flags |= EMAGGED
 	return TRUE
-*/
+
+/obj/machinery/limbgrower/AltClick(mob/living/user)
+	. = ..()
+	if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		if(busy)
+			to_chat(user, "<span class=\"alert\">\The [src] is busy. Please wait for completion of previous operation.</span>")
+		else
+			if(dna_disk)
+				dna_disk.forceMove(src.loc)
+				user.put_in_active_hand(dna_disk)
+				to_chat(user, "<span class='notice'>You remove \the [dna_disk] from \the [src].</span>")
+				dna_disk = null
+			else
+				to_chat(user, "<span class='warning'>\The [src] has doesn't have a disk on it!")
+
+//Defines some vars that makes limbs appears, TO-DO: define every single species.
+
+/datum/species/human
+	limbs_id = SPECIES_HUMAN
+	icon_limbs = 'icons/mob/human_parts_greyscale.dmi'
+
+/datum/species/lizard
+	limbs_id = SPECIES_LIZARD
+	icon_limbs = 'icons/mob/human_parts_greyscale.dmi'
+
+/datum/species/mammal
+	limbs_id = SPECIES_MAMMAL
+	icon_limbs = 'icons/mob/human_parts_greyscale.dmi'
+
+/datum/species/insect
+	limbs_id = SPECIES_INSECT
+	icon_limbs = 'icons/mob/human_parts_greyscale.dmi'
+
+/datum/species/fly
+	limbs_id = SPECIES_FLY
+	icon_limbs = 'icons/mob/human_parts.dmi'
+
+/datum/species/plasmaman
+	limbs_id = SPECIES_PLASMAMAN
+	icon_limbs = 'icons/mob/human_parts.dmi'
+
+/datum/species/xeno
+	limbs_id = SPECIES_XENOHYBRID
+	icon_limbs = 'icons/mob/human_parts_greyscale.dmi'

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -243,6 +243,12 @@
 		/obj/item/stack/sheet/glass = 1)
 	def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
 
+/obj/item/circuitboard/machine/colormate
+	name = "Colormate (Machine Board)"
+	build_path = /obj/machinery/gear_painter
+	req_components = list()
+	def_components = list()
+
 /obj/item/circuitboard/machine/vendor
 	name = "Custom Vendor (Machine Board)"
 	desc = "You can turn the \"brand selection\" dial using a screwdriver."

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

@@ -520,3 +520,9 @@
 	new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src)
 	new /obj/item/lighter(src)
 
+/obj/item/storage/box/syndie_kit/scarp
+
+/obj/item/storage/box/syndie_kit/scarp/PopulateContents()
+	new /obj/item/book/granter/martial/carp(src)
+	new /obj/item/clothing/suit/hooded/carp_costume(src)
+	new /obj/item/staff/bostaff(src)

code/modules/antagonists/traitor/classes/ai.dm

@@ -9,7 +9,7 @@
 		objective_count += forge_single_objective()
 
 	for(var/i = objective_count, i < CONFIG_GET(number/traitor_objectives_amount), i++)
-		var/datum/objective/assassinate/kill_objective = new
+		var/datum/objective/assassinate/once/kill_objective = new
 		kill_objective.owner = T.owner
 		kill_objective.find_target()
 		T.add_objective(kill_objective)

code/modules/antagonists/traitor/equipment/Malf_Modules.dm

@@ -261,6 +261,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		return //prevent the AI from activating an already active doomsday
 	if (owner_AI.shunted)
 		return //prevent AI from activating doomsday while shunted.
+	if (istype(owner.loc, /obj/item/aicard))
+		return //prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then.
 	active = TRUE
 	set_us_up_the_bomb(owner)
 
@@ -327,6 +329,10 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	sleep(30)
 	if(QDELETED(owner) || owner.stat == DEAD)
 		return
+	if(istype(owner.loc, /obj/item/aicard))
+		to_chat(owner, "<span class='boldnotice'>Error: Signal transmission failed. Reason: Lost connection to network.</span>")
+		to_chat(owner, "<span class='warning'>You can't activate the doomsday device while inside an intelliCard!</span>")
+		return
 	priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", "aimalf")
 	set_security_level("delta")
 	var/obj/machinery/doomsday_device/DOOM = new(owner_AI)

code/modules/atmospherics/machinery/components/binary_devices/circulator.dm

@@ -88,6 +88,7 @@
 	if(!panel_open)
 		return
 	anchored = !anchored
+	move_resist = anchored? INFINITY : 100
 	I.play_tool_sound(src)
 	if(generator)
 		disconnectFromGenerator()

code/modules/clothing/suits/miscellaneous.dm

@@ -280,7 +280,7 @@
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET
 	cold_protection = CHEST|GROIN|ARMS
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT	//Space carp like space, so you should too
-	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/automatic/speargun)
+	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/automatic/speargun, /obj/item/staff/bostaff)
 	hoodtype = /obj/item/clothing/head/hooded/carp_hood
 
 /obj/item/clothing/head/hooded/carp_hood

code/modules/clothing/under/miscellaneous.dm

@@ -168,7 +168,15 @@
 	desc = "A simple, inconspicuous harness replacement for a jumpsuit."
 	icon_state = "gear_harness"
 	item_state = "gear_harness"
-	can_adjust = FALSE
+	can_adjust = TRUE
+	body_parts_covered = CHEST|GROIN
+
+/obj/item/clothing/under/misc/gear_harness/toggle_jumpsuit_adjust()
+	adjusted = !adjusted
+	if(adjusted)
+		body_parts_covered = NONE
+	else
+		body_parts_covered = CHEST|GROIN
 
 /obj/item/clothing/under/misc/durathread
 	name = "durathread jumpsuit"
@@ -324,7 +332,7 @@
 	desc = "A blue bathrobe."
 	icon_state = "bathrobe"
 	item_state = "bathrobe"
-	
+
 /obj/item/clothing/under/misc/mechsuitred
 	name = "red mech suit"
 	desc = "What are you, stupid?"
@@ -336,10 +344,10 @@
 	desc = "...Mom?"
 	icon_state = "white_mech_suit"
 	item_state = "white_mech_suit"
-	
+
 /obj/item/clothing/under/misc/mechsuitblue
 	name = "blue mech suit"
 	desc = "Get in the damn robot already!"
 	icon_state = "blue_mech_suit"
 	item_state = "blue_mech_suit"
-	
+

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

@@ -7,6 +7,7 @@
 	var/oxy_mod = 1     	// % of oxygen damage taken from all sources
 	var/clone_mod = 1   	// % of clone damage taken from all sources
 	var/stamina_mod = 1 	// % of stamina damage taken from all sources
+	var/stamina_buffer_mod = 1 // % of stamina buffer
 	var/brain_mod = 1   	// % of brain damage taken from all sources
 
 	var/pressure_mod = 1	// % of brute damage taken from low or high pressure (stacks with brute_mod)

code/modules/ninja/suit/ninjaDrainAct.dm

@@ -254,16 +254,16 @@ They *could* go in their appropriate files, but this is supposed to be modular
 	. = DRAIN_MOB_SHOCK_FAILED
 
 	//Default cell = 10,000 charge, 10,000/1000 = 10 uses without charging/upgrading
-	if(S.cell && S.cell.charge && S.cell.use(1000))
+	if(S.cell && S.cell.charge && S.cell.use(500))
 		. = DRAIN_MOB_SHOCK
 		//Got that electric touch
 		var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
 		spark_system.set_up(5, 0, loc)
 		playsound(src, "sparks", 50, 1)
 		visible_message("<span class='danger'>[H] electrocutes [src] with [H.p_their()] touch!</span>", "<span class='userdanger'>[H] electrocutes you with [H.p_their()] touch!</span>")
-		electrocute_act(15, H)
+		electrocute_act(15, H, flags = SHOCK_NOSTUN)
 
-		DefaultCombatKnockdown(G.stunforce)
+		DefaultCombatKnockdown(G.stunforce, override_hardstun = 0)
 		apply_effect(EFFECT_STUTTER, G.stunforce)
 		SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK)
 

code/modules/reagents/reagent_containers/borghypo.dm

@@ -102,6 +102,12 @@ Borg Hypospray
 	if(!istype(M))
 		return
 	if(R.total_volume && M.can_inject(user, 1, user.zone_selected,bypass_protection))
+		if(user.a_intent == INTENT_HELP) //Prevents mediborgs from OD'ing people unless on harm intent
+			for(var/datum/reagent/RG in R.reagent_list)
+				if(M.reagents.has_reagent(RG.type) && !RG.overdose_threshold == 0)
+					if(((M.reagents.get_reagent_amount(RG.type)) + amount_per_transfer_from_this > RG.overdose_threshold))
+						to_chat(user, "<span class='warning'>Injecting [M] with more [RG] would overdose them.</span>")
+						return
 		to_chat(M, "<span class='warning'>You feel a tiny prick!</span>")
 		to_chat(user, "<span class='notice'>You inject [M] with the injector.</span>")
 		var/fraction = min(amount_per_transfer_from_this/R.total_volume, 1)

code/modules/research/designs/limbgrower_designs.dm

@@ -41,3 +41,162 @@
 	reagents_list = list(/datum/reagent/medicine/synthflesh = 75)
 	build_path = /obj/item/melee/synthetic_arm_blade
 	category = list("other","emagged")
+
+//Extra limbs
+
+/datum/design/chest
+	name = "Chest"
+	id = "chest"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 50)
+	build_path = /obj/item/bodypart/chest
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/head
+	name = "Head"
+	id = "head"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 75)
+	build_path = /obj/item/bodypart/head
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+//Organs
+/datum/design/brain
+	name = "Brain"
+	id = "brain"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 50)
+	build_path = /obj/item/organ/brain
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/heart
+	name = "Heart"
+	id = "heart"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/heart
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/lungs
+	name = "Lungs"
+	id = "lungs"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/lungs
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/liver
+	name = "Liver"
+	id = "liver"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/liver
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/stomach
+	name = "Stomach"
+	id = "stomach"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/stomach
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/appendix
+	name = "Appendix"
+	id = "appendix"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 10)
+	build_path = /obj/item/organ/appendix
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/tail
+	name = "Tail"
+	id = "tail"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/tail
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/ears
+	name = "Ears"
+	id = "ears"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/ears
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/eyes
+	name = "Eyes"
+	id = "eyes"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 30)
+	build_path = /obj/item/organ/eyes
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/tongue
+	name = "Tongue"
+	id = "tongue"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/tongue
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/vocal_cords
+	name = "Vocal cords"
+	id = "vocal_cords"
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/vocal_cords
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+//genitals
+
+/datum/design/penis
+	name = "Penis"
+	id = "penis"
+	build_type = LIMBGROWER
+	research_icon_state = "penis_human_3_s"
+	research_icon = 'icons/obj/genitals/penis.dmi'
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/genital/penis
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/vagina
+	name = "Vagina"
+	id = "vagina"
+	research_icon_state = "vagina-s"
+	research_icon = 'icons/obj/genitals/vagina.dmi'
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/genital/vagina
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/womb
+	name = "Womb"
+	id = "womb"
+	research_icon_state = "womb"
+	research_icon = 'icons/obj/genitals/vagina.dmi'
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/genital/womb
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/testicles
+	name = "Testicles"
+	id = "testicles"
+	research_icon_state = "testicles_single_3_s"
+	research_icon = 'icons/obj/genitals/testicles.dmi'
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/genital/testicles
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
+
+/datum/design/breasts
+	name = "Breasts"
+	id = "breasts"
+	research_icon_state = "breasts_pair_e_s"
+	research_icon = 'icons/obj/genitals/breasts.dmi'
+	build_type = LIMBGROWER
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
+	build_path = /obj/item/organ/genital/breasts
+	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")

code/modules/research/designs/machine_desings/machine_designs_all_misc.dm

@@ -163,3 +163,10 @@
 	category = list ("Misc. Machinery")
 	departmental_flags = DEPARTMENTAL_FLAG_ALL
 
+/datum/design/board/colormate
+	name = "ColorMate"
+	desc = "This machine lets you paint your gear."
+	id = "colormate"
+	build_path = /obj/item/circuitboard/machine/colormate
+	category = list ("Misc. Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ALL

code/modules/research/techweb/nodes/engineering_nodes.dm

@@ -8,7 +8,7 @@
 	design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin",
 	"atmosalerts", "atmos_control", "recycler", "autolathe", "autolathe_secure", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod",
 	"apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo","oxygen_tank",
-	 "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt")
+	 "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt", "colormate")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000)
 
 /datum/techweb_node/adv_engi

code/modules/uplink/uplink_items/uplink_bundles.dm

@@ -52,6 +52,15 @@
 	cost = 20
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
 
+/datum/uplink_item/bundles_TC/scarp_bundle
+	name = "Sleeping Carp Bundle"
+	desc = "Become one with your inner carp!  Your ancient fish masters leave behind their legacy, and bestow to you their teachings, sacred uniform, and staff. \
+	Please be aware that you will not be able to use dishonerable ranged weapons."
+	item = /obj/item/storage/box/syndie_kit/scarp
+	cost = 20
+	player_minimum = 20
+	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
+
 /datum/uplink_item/suits/infiltrator_bundle
 	name = "Insidious Infiltration Gear Case"
 	desc = "Developed by Roseus Galactic in conjunction with the Gorlex Marauders to produce a functional suit for urban operations, \

code/modules/uplink/uplink_items/uplink_roles.dm

@@ -60,7 +60,6 @@
 	cost = 15
 	restricted_roles = list("Clown")
 
-/*
 /datum/uplink_item/role_restricted/clowncar
 	name = "Clown Car"
 	desc = "The Clown Car is the ultimate transportation method for any worthy clown! \
@@ -69,9 +68,8 @@
 			someone saves them or they manage to crawl out. Be sure not to ram into any walls or vending machines, as the springloaded seats \
 			are very sensetive. Now with our included lube defense mechanism which will protect you against any angry shitcurity!"
 	item = /obj/vehicle/sealed/car/clowncar
-	cost = 15
+	cost = 16
 	restricted_roles = list("Clown")
-*/
 
 /datum/uplink_item/role_restricted/haunted_magic_eightball
 	name = "Haunted Magic Eightball"

code/modules/vehicles/cars/clowncar.dm

@@ -18,6 +18,14 @@
 	. = ..()
 	initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE)
 
+
+/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space
+	if(isspaceturf(get_step(src, direction)))
+		return FALSE
+	else
+		return ..()
+
+
 /obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
@@ -56,7 +64,7 @@
 		L.visible_message("<span class='warning'>[src] rams into [L] and sucks him up!</span>") //fuck off shezza this isn't ERP.
 		mob_forced_enter(L)
 		playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75)
-	else if(istype(M, /turf/closed))
+	else if(istype(M, /turf/closed) || istype(M, /obj/machinery/door/airlock/external))
 		visible_message("<span class='warning'>[src] rams into [M] and crashes!</span>")
 		playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75)
 		playsound(src, 'sound/vehicles/clowncar_crashpins.ogg', 75)

html/changelogs/AutoChangeLog-pr-13755.yml

@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - rscadd: "colormates"

html/changelogs/AutoChangeLog-pr-13774.yml

@@ -0,0 +1,6 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - rscadd: "Re-adds the Clown Car to the clown uplink"
+  - balance: "15 >16 TC cost"
+  - balance: "bonks on external airlocks"

html/changelogs/AutoChangeLog-pr-13776.yml

@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes: 
+  - tweak: "AIs now only have to kill people once instead of permanently."

html/changelogs/AutoChangeLog-pr-13796.yml

@@ -0,0 +1,9 @@
+author: "keronshb"
+delete-after: True
+changes: 
+  - rscadd: "Adds a reduced stamina buffer for SCarp users"
+  - rscadd: "Gives SCarp users a better parry"
+  - rscadd: "Adds the SCarp bundle which includes a bo staff"
+  - rscadd: "Lets Carp costumes carry Bo Staffs"
+  - balance: "reduces the stamina damage of scarp slightly"
+  - balance: "reduced the blockchance of the bo staff"

html/changelogs/AutoChangeLog-pr-13799.yml

@@ -0,0 +1,5 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - bugfix: "ninja gloves no longer hardstun"
+  - balance: "ninja gloves now cost half as much to use to compensate"

html/changelogs/AutoChangeLog-pr-13801.yml

@@ -0,0 +1,5 @@
+author: "SandPoot"
+delete-after: True
+changes: 
+  - refactor: "Changes the limb grower a lot."
+  - bugfix: "\"Limb\" costs on limbgrower are actually displayed like it was meant to all along."

html/changelogs/AutoChangeLog-pr-13803.yml

@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes: 
+  - balance: "The traitor AI can no longer activate the doomsday device while carded."

html/changelogs/AutoChangeLog-pr-13809.yml

@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes: 
+  - tweak: "Gear harness now covers nothing."

html/changelogs/AutoChangeLog-pr-13811.yml

@@ -0,0 +1,4 @@
+author: "BlackMajor"
+delete-after: True
+changes: 
+  - tweak: "Cyborg hypospray no longer injects if it means OD'ing while on help intent."

html/changelogs/AutoChangeLog-pr-13813.yml

@@ -0,0 +1,5 @@
+author: "silicons"
+delete-after: True
+changes: 
+  - tweak: "command headsets are 120% instead of 160%"
+  - bugfix: "no more emote italics"

interface/stylesheet.dm

@@ -64,7 +64,7 @@ em						{font-style: normal;	font-weight: bold;}
 .alert					{color: #ff0000;}
 h1.alert, h2.alert		{color: #000000;}
 
-.emote					{					font-style: italic;}
+.emote					{				}
 .selecteddna			{color: #ffffff; 	background-color: #001B1B}
 
 .attack					{color: #ff0000;}

tgstation.dme

@@ -796,6 +796,7 @@
 #include "code\game\machinery\buttons.dm"
 #include "code\game\machinery\cell_charger.dm"
 #include "code\game\machinery\cloning.dm"
+#include "code\game\machinery\colormate.dm"
 #include "code\game\machinery\constructable_frame.dm"
 #include "code\game\machinery\cryopod.dm"
 #include "code\game\machinery\dance_machine.dm"
@@ -3143,7 +3144,7 @@
 #include "code\modules\reagents\chemistry\recipes\special.dm"
 #include "code\modules\reagents\chemistry\recipes\toxins.dm"
 #include "code\modules\reagents\reagent_containers\blood_pack.dm"
-#include "code\modules\reagents\reagent_containers\borghydro.dm"
+#include "code\modules\reagents\reagent_containers\borghypo.dm"
 #include "code\modules\reagents\reagent_containers\bottle.dm"
 #include "code\modules\reagents\reagent_containers\chem_pack.dm"
 #include "code\modules\reagents\reagent_containers\dropper.dm"

tgui/packages/common/storage.js

@@ -11,7 +11,7 @@ export const IMPL_LOCAL_STORAGE = 1;
 export const IMPL_INDEXED_DB = 2;
 
 const INDEXED_DB_VERSION = 1;
-const INDEXED_DB_NAME = 'tgui';
+const INDEXED_DB_NAME = 'tgui-citadel-main';
 const INDEXED_DB_STORE_NAME = 'storage-v1';
 
 const READ_ONLY = 'readonly';

tgui/packages/tgui-panel/styles/goon/chat-dark.scss

@@ -418,7 +418,7 @@ em {
 }
 
 .emote {
-  font-style: italic;
+
 }
 
 .userdanger {
@@ -840,7 +840,7 @@ em {
 
 .command_headset {
   font-weight: bold;
-  font-size: 160%;
+  font-size: 125%;
 }
 
 .small {
@@ -876,7 +876,7 @@ em {
 
 .clown {
   color: #ff70c1;
-  font-size: 160%;
+  font-size: 125%;
   font-family: "Comic Sans MS", cursive, sans-serif;
   font-weight: bold;
 }

tgui/packages/tgui-panel/styles/goon/chat-light.scss

@@ -881,7 +881,7 @@ h1.alert, h2.alert {
 
 .command_headset {
   font-weight: bold;
-  font-size: 160%;
+  font-size: 125%;
 }
 
 .small {
@@ -917,7 +917,7 @@ h1.alert, h2.alert {
 
 .clown {
   color: #FF69Bf;
-  font-size: 160%;
+  font-size: 125%;
   font-family: "Comic Sans MS", cursive, sans-serif;
   font-weight: bold;
 }