Merge remote-tracking branch 'origin/master' into semi-sync

2020-12-21 21:19:06 +08:00
parent 2966f985a3 ce3cfca619
commit abd94d1c03
189 changed files with 10453 additions and 8486 deletions
@@ -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
@@ -24,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)
@@ -64,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))
@@ -78,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
@@ -110,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
@@ -120,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)
@@ -135,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
@@ -165,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>"
@@ -218,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

@@ -233,3 +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'