Merge branch 'master' into master

modular_citadel/code/modules/arousal/organs/testicles.dm

@@ -11,7 +11,7 @@
 	var/sack_size			= BALLS_SACK_SIZE_DEF
 	fluid_id 				= "semen"
 	producing				= TRUE
-	can_masturbate_with		= TRUE
+	can_masturbate_with		= FALSE
 	masturbation_verb 		= "massage"
 	can_climax				= TRUE
 	var/sent_full_message	= TRUE //defaults to 1 since they're full to start

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -404,3 +404,9 @@ datum/gear/darksabresheath
 	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/commjacket
 	ckeywhitelist = list("sadisticbatter")
+
+/datum/gear/longblackgloves
+	name = "Luna's Gauntlets"
+	category = SLOT_GLOVES
+	path = /obj/item/clothing/gloves/longblackgloves
+	ckeywhitelist = list("bigmanclancy")

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -309,8 +309,8 @@
 	restricted_desc = "Engineering and Security"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
-//memes
-/datum/gear/nudepermit
-	name = "Nudity Permit"
+//Memes
+/datum/gear/gear_harnesses
+	name = "Gear Harness"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/permit
+	path = /obj/item/clothing/under/gear_harness

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -504,4 +504,10 @@
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
-
+/obj/item/clothing/gloves/longblackgloves
+	name = "Luna's Gauntlets"
+	desc = "These gloves seem to have a coating of slime fluid on them, you should possibly return them to their rightful owner."
+	icon_state = "longblackgloves"
+	item_state = "longblackgloves"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'

modular_citadel/code/modules/reagents/reagent container/hypovial.dm

@@ -17,6 +17,7 @@
 						"black hypovial" = "hypovial-t",
 						"pink hypovial" = "hypovial-pink"
 						)
+	always_reskinnable = TRUE
 
 /obj/item/reagent_containers/glass/bottle/vial/Initialize()
 	. = ..()
@@ -30,17 +31,6 @@
 /obj/item/reagent_containers/glass/bottle/vial/on_reagent_change()
 	update_icon()
 
-/obj/item/reagent_containers/glass/bottle/vial/reskin_obj(mob/M) //Makes the vials completely reskinnable, and renames them - overrides /obj/proc/reskin_obj
-	if(!LAZYLEN(unique_reskin))
-		return
-	var/choice = input(M,"Do you wish to recolour your [src]?","Vial Recolour") as null|anything in unique_reskin
-	if(!QDELETED(src) && choice && !current_skin && !M.incapacitated() && in_range(M,src))
-		if(!unique_reskin[choice])
-			return
-		icon_state = unique_reskin[choice]
-		name = choice
-		to_chat(M, "[src] is now skinned as '[choice].'")
-
 /obj/item/reagent_containers/glass/bottle/vial/update_icon()
 	cut_overlays()
 	if(reagents.total_volume)

modular_citadel/code/modules/research/techweb/all_nodes.dm

@@ -19,7 +19,7 @@
 	display_name = "Games and Toys"
 	description = "For the slackers on the station."
 	prereq_ids = list("comptech")
-	design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe")
+	design_ids = list("arcade_battle", "arcade_orion", "arcade_minesweeper", "slotmachine", "autoylathe")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
 	export_price = 5000