test

code/__DEFINES/DNA.dm

@@ -158,7 +158,7 @@
 #define EYE_COLOR_LIST list("#865900", "#06b400", "#312f27", "#008e83", "#002d8e", "#c16c00")
 
 #define MIN_PENIS_SIZE 1
-#define MAX_PENIS_SIZE 3
+#define MAX_PENIS_SIZE 5
 #define DEFAULT_PENIS_SIZE 2
 
 #define PENIS_TYPE_PLAIN 1
@@ -177,14 +177,15 @@
 
 #define ERECT_STATE_NONE 0
 #define ERECT_STATE_PARTIAL 1
-#define ERECT_STATE_HARD 2
+#define ERECT_STATE_STIFF 2
+#define ERECT_STATE_HARD 3
 
 #define MIN_TESTICLES_SIZE 1
-#define MAX_TESTICLES_SIZE 3
+#define MAX_TESTICLES_SIZE 5
 #define DEFAULT_TESTICLES_SIZE 2
 
 #define MIN_BREASTS_SIZE 0
-#define MAX_BREASTS_SIZE 10
+#define MAX_BREASTS_SIZE 16
 #define DEFAULT_BREASTS_SIZE 3
 
 #define DEFAULT_BELLY_SIZE 0

code/__DEFINES/misc.dm

@@ -77,7 +77,9 @@
 
 //AND -1 MEANS "ABOVE", OK?, OK!?!
 #define ABOVE_SHOES_LAYER			(SHOES_LAYER-1)
-#define ABOVE_BODY_FRONT_LAYER		(BODY_FRONT_LAYER-1)
+#define ABOVE_BODY_FRONT_LAYER		(BODY_FRONT_LAYER-3)
+#define BODY_FRONTER_LAYER			(BODY_FRONT_LAYER-1) // Put it on top of the top, silly!
+#define BODY_FRONTEST_LAYER			(BODY_FRONT_LAYER-2)
 
 //Security levels
 #define SEC_LEVEL_GREEN	0

code/__DEFINES/roguetown.dm

@@ -142,6 +142,7 @@
 //Antag / Special / Unique armor defines
 #define ARMOR_VAMP list("blunt" = 100, "slash" = 100, "stab" = 90, "piercing" = 0, "fire" = 0, "acid" = 0)
 #define ARMOR_WWOLF list("blunt" = 100, "slash" = 90, "stab" = 80, "piercing" = 70, "fire" = 40, "acid" = 0)
+#define ARMOR_NATURAL list("blunt" = 100, "slash" = 70, "stab" = 60, "piercing" = 40, "fire" = 0, "acid" = 0)
 #define ARMOR_DRAGONSCALE list("blunt" = 100, "slash" = 100, "stab" = 100, "fire" = 50, "acid" = 0)
 #define ARMOR_ASCENDANT list("blunt" = 50, "slash" = 100, "stab" = 80, "piercing" = 80, "fire" = 0, "acid" = 0)
 #define ARMOR_SPELLSINGER list("blunt" = 70, "slash" = 70, "stab" = 50, "piercing" = 30, "fire" = 0, "acid" = 0)
@@ -213,6 +214,7 @@
 	/datum/species/akula,\
 	/datum/species/anthromorph,\
 	/datum/species/demihuman,\
+	/datum/species/harpy,\
 
 
 #define RACES_SHUNNED \
@@ -255,6 +257,7 @@
 	/datum/species/kobold,\
 	/datum/species/goblinp,\
 	/datum/species/construct/metal,\
+	/datum/species/harpy,\
 )
 
 #define CLOTHED_RACES_TYPES list(\
@@ -279,6 +282,7 @@
 	/datum/species/kobold,\
 	/datum/species/goblinp,\
 	/datum/species/construct/metal,\
+	/datum/species/harpy,\
 )
 // Non-dwarf non-kobold non-goblin mostly
 #define NON_DWARVEN_RACE_TYPES list(\
@@ -299,6 +303,7 @@
 	/datum/species/demihuman,\
 	/datum/species/halforc,\
 	/datum/species/construct/metal,\
+	/datum/species/harpy,\
 )
 // Non-elf non-dwarf non-kobold non-goblin mostly
 #define HUMANLIKE_RACE_TYPES list(\
@@ -315,6 +320,7 @@
 	/datum/species/anthromorph,\
 	/datum/species/demihuman,\
 	/datum/species/construct/metal,\
+	/datum/species/harpy,\
 )
 #define ALL_CLERIC_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/dendor, /datum/patron/divine/necra, /datum/patron/divine/pestra, /datum/patron/divine/ravox, /datum/patron/divine/malum, /datum/patron/divine/eora) // Currently unused.
 
@@ -397,6 +403,7 @@ GLOBAL_LIST_EMPTY(round_join_times)
 #define CTAG_PILGRIM 		"CAT_PILGRIM"  		// Pilgrim classes
 #define CTAG_ADVENTURER 	"CAT_ADVENTURER"  	// Adventurer classes
 #define CTAG_TOWNER 		"CAT_TOWNER"  		// Villager class - Villagers can use it
+#define CTAG_SHOPHAND		"CAT_SHOPHAND"		// Shophand classes
 #define CTAG_ANTAG 			"CAT_ANTAG"  		// Antag class - results in an antag
 #define CTAG_BANDIT			"CAT_BANDIT"		// Bandit class - Tied to the bandit antag really
 #define CTAG_CHALLENGE 		"CAT_CHALLENGE"  	// Challenge class - Meant to be free for everyone

code/__DEFINES/traits.dm

@@ -64,6 +64,8 @@
 #define TRAIT_INFINITE_ENERGY "Boundless Energy" //infinite fatigue (blue bar) but not infinite stamina
 #define TRAIT_PERMAMUTE "Permanent Mute"
 #define TRAIT_HERESIARCH "Forbidden Knowledge" //allows entry to ascendant church
+#define TRAIT_FERAL "Feral Natured" //likes being in the woods, hates being in the city
+#define TRAIT_NECRAS_ABATEMENT "Necra's Abatement" //keeps deadites from doing much of anything in town
 
 
 //Hearthstone port (Tracking)
@@ -164,6 +166,7 @@
 #define TRAIT_NECRAS_VOW "Necra's Vow"
 // ARMOR / CLOTHING GIVEN TRAITS (GIVEN BY WEARING CLOTHES/ARMOR PIECES)
 #define TRAIT_MONK_ROBE	"Holy Vestatures"
+#define TRAIT_NATURAL_ARMOR "Natural Armor"
 
 GLOBAL_LIST_INIT(roguetraits, list(
 	TRAIT_LEPROSY = span_necrosis("I'm a disgusting leper..."),
@@ -296,6 +299,9 @@ GLOBAL_LIST_INIT(roguetraits, list(
 	TRAIT_PERMAMUTE = span_notice("I am a mute. I cannot speak."),
 	TRAIT_STRENGTH_UNCAPPED = span_warning("MY STRENGTH IS UNBOUND!"),
 	TRAIT_MONK_ROBE = span_notice("I feel closer to the gods in my meager robes.. I feel vigorous, empowered by their light!"),
+	TRAIT_NATURAL_ARMOR = span_notice("My hide is thick and resilient. It will regenerate so long as I keep it fed..."),
+	TRAIT_FERAL = span_info("The wilds is where I am meant to be. Civilized realms are no place for the likes of me."),
+	TRAIT_NECRAS_ABATEMENT = span_info("The Undermaiden's gaze lingers upon me, and intensifies as I draw closer to hallowed ground."),
 	TRAIT_EORAN_CALM = span_notice("Eora has touched me, granting me some calm. She protects me from the peaks of my stress."),
 	TRAIT_EORAN_SERENE = span_greentext("Eora has blessed me with all-encompassing serenity. I feel no more stress."),
 	TRAIT_NECRAS_VOW = span_warning("I've pledged myself to Necra. If I fall, I am Hers."),

code/__HELPERS/global_lists.dm

@@ -63,6 +63,10 @@
 		var/datum/virtue/virtue = new path()
 		GLOB.virtues[path] = virtue
 
+	for (var/path in subtypesof(/datum/sizecat))
+		var/datum/sizecat/sc = new path()
+		GLOB.sizecats[path] = sc
+
 	// Loadout items
 	for (var/path in subtypesof(/datum/loadout_item))
 		var/datum/loadout_item/loadout_item = new path()

code/__HELPERS/roundend.dm

@@ -132,7 +132,7 @@
 	log_game("The round has ended.")
 
 	to_chat(world, "<BR><BR><BR><span class='reallybig'>So ends this tale on Azure Peak.</span>")
-	get_end_reason()
+	//get_end_reason()
 
 	var/list/key_list = list()
 	for(var/client/C in GLOB.clients)
@@ -214,7 +214,7 @@
 	ready_for_reboot = TRUE
 	standard_reboot()
 
-/datum/controller/subsystem/ticker/proc/get_end_reason()
+/*/datum/controller/subsystem/ticker/proc/get_end_reason()
 	var/end_reason
 
 	if(!check_for_lord())
@@ -238,7 +238,7 @@
 	if(end_reason)
 		to_chat(world, span_bigbold("[end_reason]."))
 	else
-		to_chat(world, span_bigbold("The town has managed to survive another week."))
+		to_chat(world, span_bigbold("The town has managed to survive another week."))*/
 
 /datum/controller/subsystem/ticker/proc/gamemode_report()
 	var/list/all_teams = list()

code/_globalvars/customization/organ_customization.dm

@@ -27,6 +27,12 @@ GLOBAL_LIST_INIT(named_breast_sizes, list(
 	"gargantuan" = 8,
 	"colossal" = 9,
 	"ungodly big" = 10,
+	"gigantic" = 11,
+	"titanic" = 12,
+	"obscenely large" = 13,
+	"over-endowed" = 14,
+	"unholy" = 15,
+	"baothan-sized" = 16,
 ))
 
 GLOBAL_LIST_INIT(named_belly_sizes, list(
@@ -70,12 +76,13 @@ GLOBAL_LIST_INIT(customizers, build_customizers())
 		.[type] = new type()
 	return .
 
-/proc/color_pick_sanitized(mob/user, description, title, default_value, min_tag = 0.07, max_tag = 0.80)
+/proc/color_pick_sanitized(mob/user, description, title, default_value)
 	var/color = input(user, description, title, default_value) as color|null
-	var/good = TRUE
+	//var/good = TRUE
 	if(!color)
 		return
 	color = sanitize_hexcolor(color)
+	/*
 	var/list/hsl = rgb2hsl(hex2num(copytext(color,1,3)),hex2num(copytext(color,3,5)),hex2num(copytext(color,5,7)))
 	if(hsl[3] < min_tag)
 		to_chat(user, span_warning("The picked color is too dark! Raising Luminosity to minimum 20%."))
@@ -87,6 +94,7 @@ GLOBAL_LIST_INIT(customizers, build_customizers())
 		good = FALSE
 	if(!good)
 		var/list/rgb = hsl2rgb(arglist(hsl))
-		color = sanitize_hexcolor("[num2hex(rgb[1])][num2hex(rgb[2])][num2hex(rgb[3])]")
+		color = sanitize_hexcolor("[num2hex(rgb[1])][num2hex(rgb[2])][num2hex(rgb[3])]") 
+	*/
 
 	return color

code/_globalvars/special_traits.dm

@@ -37,12 +37,17 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits())
 	apply_charflaw_equipment(character, player)
 	apply_prefs_special(character, player)
 	apply_prefs_virtue(character, player)
+	apply_prefs_sizecat(character,player)
 	if(player.prefs.loadout)
 		character.mind.special_items[player.prefs.loadout::name] += player.prefs.loadout.path
 	if(player.prefs.loadout2)
 		character.mind.special_items[player.prefs.loadout2::name] += player.prefs.loadout2.path
 	if(player.prefs.loadout3)
 		character.mind.special_items[player.prefs.loadout3::name] += player.prefs.loadout3.path
+	if(player.prefs.loadout4)
+		character.mind.special_items[player.prefs.loadout4::name] += player.prefs.loadout4.path
+	if(player.prefs.loadout5)
+		character.mind.special_items[player.prefs.loadout5::name] += player.prefs.loadout5.path
 
 /proc/apply_prefs_virtue(mob/living/carbon/human/character, client/player)
 	if (!player)
@@ -62,6 +67,7 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits())
 
 	var/datum/virtue/virtue_type = player.prefs.virtue
 	var/datum/virtue/virtuetwo_type = player.prefs.virtuetwo
+	var/datum/virtue/extravirtue_type = player.prefs.extravirtue
 	if(virtue_type)
 		if(virtue_check(virtue_type, heretic))
 			apply_virtue(character, virtue_type)
@@ -72,6 +78,12 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits())
 			apply_virtue(character, virtuetwo_type)
 		else
 			to_chat(character, "Incorrect Second Virtue parameters! (Heretic virtue on a non-heretic) It will not be applied.")
+	if(extravirtue_type)
+		if(virtue_check(extravirtue_type, heretic))
+			apply_virtue(character, extravirtue_type)
+		else
+			to_chat(character, "Incorrect Second Virtue parameters! (Heretic virtue on a non-heretic) It will not be applied.")
+
 
 /proc/virtue_check(var/datum/virtue/V, heretic = FALSE)
 	if(V)

code/_globalvars/traits.dm

@@ -127,6 +127,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		TRAIT_BLACKLEG,
 		TRAIT_PERMAMUTE,
 		TRAIT_MONK_ROBE,
+		TRAIT_NATURAL_ARMOR,
+		TRAIT_FERAL,
+		TRAIT_NECRAS_ABATEMENT,
 	),
 	/obj/item/bodypart = list(
 		"TRAIT_PARALYSIS" = TRAIT_PARALYSIS

code/_onclick/hud/screen_objects.dm

@@ -136,7 +136,10 @@
 			if(H.craftingthing)
 				last_craft = world.time
 				var/datum/component/personal_crafting/C = H.craftingthing
-				C.roguecraft(location, control, params, H)
+				if(H.client.legacycraft)
+					C.roguecraft(location, control, params, H)
+				else
+					C.ui_interact(H)
 			else
 				testing("what")
 

code/controllers/subsystem/job.dm

@@ -141,7 +141,7 @@ SUBSYSTEM_DEF(job)
 		if(length(job.allowed_patrons) && !(player.client.prefs.selected_patron.type in job.allowed_patrons))
 			JobDebug("FOC incompatible with patron, Player: [player], Job: [job.title], Race: [player.client.prefs.pref_species.name]")
 			continue
-		if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions)))
+		if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions) || (player.client.prefs.extravirtue?.type in job.virtue_restrictions)))
 			JobDebug("FOC incompatible with virtues, Player: [player], Job: [job.title], Virtue 1: [player.client.prefs.virtue.name]")
 			continue
 		if(length(job.vice_restrictions) && (player.client.prefs.charflaw.type in job.vice_restrictions))
@@ -221,7 +221,7 @@ SUBSYSTEM_DEF(job)
 			JobDebug("GRJ incompatible with patron, Player: [player], Job: [job.title], Race: [player.client.prefs.pref_species.name]")
 			continue
 
-		if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions)))
+		if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions) || (player.client.prefs.extravirtue?.type in job.virtue_restrictions)))
 			JobDebug("GRJ incompatible with virtues, Player: [player], Job: [job.title], Virtue 1: [player.client.prefs.virtue.name]")
 			continue
 
@@ -463,7 +463,7 @@ SUBSYSTEM_DEF(job)
 					JobDebug("DO incompatible with patron, Player: [player], Job: [job.title], Race: [player.client.prefs.pref_species.name]")
 					continue
 
-				if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions)))
+				if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions) || (player.client.prefs.extravirtue?.type in job.virtue_restrictions)))
 					JobDebug("DO incompatible with virtues, Player: [player], Job: [job.title], Virtue 1: [player.client.prefs.virtue.name]")
 					continue
 
@@ -564,7 +564,7 @@ SUBSYSTEM_DEF(job)
 				if(length(job.allowed_patrons) && !(player.client.prefs.selected_patron.type in job.allowed_patrons))
 					continue
 
-				if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions)))
+				if(length(job.virtue_restrictions) && ((player.client.prefs.virtue.type in job.virtue_restrictions) || (player.client.prefs.virtuetwo?.type in job.virtue_restrictions) || (player.client.prefs.extravirtue?.type in job.virtue_restrictions)))
 					continue
 
 				if(length(job.vice_restrictions) && (player.client.prefs.charflaw.type in job.vice_restrictions))

code/datums/components/caltrop.dm

@@ -24,7 +24,8 @@
 
 	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
-		if(HAS_TRAIT(H, TRAIT_PIERCEIMMUNE))
+		var/is_taur = !!H.get_taur_tail()
+		if(HAS_TRAIT(H, TRAIT_PIERCEIMMUNE) || is_taur)
 			return
 
 		if((flags & CALTROP_IGNORE_WALKERS) && H.m_intent == MOVE_INTENT_WALK)