Merge remote-tracking branch 'upstream/master' into cache2

code/__DEFINES/mobs.dm

@@ -252,7 +252,7 @@
 #define OFFSET_NECK "neck"
 
 //MINOR TWEAKS/MISC
-#define AGE_MIN				18	//youngest a character can be //CITADEL EDIT - 17 --> 18
+#define AGE_MIN				21	//youngest a character can be //Hyper edit - 21
 #define AGE_MAX				85	//oldest a character can be
 #define WIZARD_AGE_MIN		30	//youngest a wizard can be
 #define APPRENTICE_AGE_MIN	29	//youngest an apprentice can be

code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm

@@ -188,10 +188,10 @@
 	weight = 3
 	cost = 10
 	requirements = list(101,101,50,40,40,30,30,30,20,20)
-	minimum_players = 15
+	minimum_players = 30
 	high_population_requirement = 10
-	var/team_mode_probability = 30
-	chaos_min = 3.0
+	var/team_mode_probability = 0
+	chaos_min = 3.5
 
 /datum/dynamic_ruleset/roundstart/changeling/pre_execute()
 	var/num_changelings = min(round(mode.candidates.len / 10) + 1, candidates.len)
@@ -849,7 +849,7 @@
 	cost = 0
 	requirements = list(101,101,101,70,60,60,50,50,50,40)
 	high_population_requirement = 10
-	chaos_min = 4.0
+	chaos_min = 3.2
 
 
 /datum/dynamic_ruleset/roundstart/bloodsucker/pre_execute()

code/game/mecha/mecha_construction_paths.dm

@@ -256,7 +256,7 @@
 				user.visible_message("[user] unfastens the scanner module.", "<span class='notice'>You unfasten the scanner module.</span>")
 		if(12)
 			if(diff==FORWARD)
-				user.visible_message("[user] secures [I].", "<span class='notice'>You secure [I].</span>")
+				user.visible_message("[user] secures the capacitor.", "<span class='notice'>You secure the capacitor.</span>")
 			else
 				user.visible_message("[user] removes the capacitor from [parent].", "<span class='notice'>You remove the capacitor from [parent].</span>")
 		if(13)

code/modules/mob/dead/new_player/sprite_accessories/moth_wings.dm

@@ -79,6 +79,10 @@
 	name = "Witch Wing"
 	icon_state = "witchwing"
 
+/datum/sprite_accessory/moth_wings/bee
+	name = "Bee Wing"
+	icon_state = "bee"
+
 /datum/sprite_accessory/moth_markings // the markings that moths can have. finally something other than the boring tan
 	icon = 'icons/mob/moth_markings.dmi'
 	color_src = null
@@ -141,4 +145,4 @@
 
 /datum/sprite_accessory/moth_markings/witchwing
 	name = "Witch Wing"
-	icon_state = "witchwing"
+	icon_state = "witchwing"

code/modules/research/designs/medical_designs.dm

@@ -599,16 +599,22 @@
 	name = "Cybernetic Stomach"
 	desc = "A cybernetic stomach."
 	id = "cybernetic_stomach"
+	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 500, MAT_GLASS = 500)
 	build_path = /obj/item/organ/stomach/cybernetic
+	category = list("Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
 /datum/design/cybernetic_stomach_u
 	name = "Upgraded Cybernetic Stomach"
 	desc = "An upgraded cybernetic stomach."
 	id = "cybernetic_stomach_u"
+	build_type = PROTOLATHE
 	construction_time = 50
 	materials = list(MAT_METAL = 500, MAT_GLASS = 500, MAT_SILVER = 500)
 	build_path = /obj/item/organ/stomach/cybernetic/upgraded
+	category = list("Medical Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
 /datum/design/cybernetic_tongue
 	name = "Cybernetic tongue"