Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

modular_citadel/code/modules/admin/chat_commands.dm

@@ -6,7 +6,12 @@
 	var/saltresult = "The wheel of salt [pick("clatters","screams","vibrates","clanks","resonates","groans","moans","squeaks","emits a[pick(" god-forsaken"," lewd"," creepy"," generic","n orgasmic"," demonic")] [pick("airhorn","bike horn","trumpet","clown","latex","vore","dog","laughing")] noise")] as it spins violently... And it seems the salt of the day is the "
 	var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore","Medihound","sleeper","belly sleeper","door wires","flightsuit","coder privilege","Developer abuse","ban reason","github self merge","red panda","beret","male catgirl","powergame","hexacrocin","Discord server","Clitadel","Cargonia","Solarian Republic","Main and RP merger","bluespace","salt","chem dispenser theft","Botany","moth","BWOINK","anal vore","stamina","Mason Jakops","mining","noodle","milf","Lavaland","Necropolis","Ashwalker","Chase Redtail","Drew Mint","Pavel Marsk","Jecca Qua","Joker Amari","Durgit","chaplain","Antag","nanite","Syndicate","Nar-Sie","Ratvar","Cult","maint","Foam-Force","AI","cyborg","ghost","clockwork","cyberpunk","vaporwave","Clown","Leon Beech","Mime","security","research","Megafauna","Bubblegum","Ash Drake","Legion","Colossus","White Shuttle","Changeling","Cowboy","Space Ninja","Poly","Revolutionary","Skyrim","forbidden fruits","xenomorph","blob","Nuclear Operative","crossdressing")]"
 	var/saltsecondarysubject = "[pick("rework","changes","r34","ban","removal","addition","leak","proposal","fanart","introduction","tabling","ERP","bikeshedding","crossdressing","sprites","semen keg","argument","theft","nerf","screeching","salt","creampie","lewding","murder","kissing","marriage","replacement","fucking","ship","netflix adaptation","dance","remaster","system","voyeur","decoration","pre-order","bukkake","seduction","worship","gangbang","handholding")]"
-	saltresult += "[saltprimarysubject] [saltsecondarysubject]"
+	if(prob(10))
+		saltresult += "@here for your salt, all day every day"
+		if(prob(1))
+			saltresult += " @everyone gets some salt this time too"
+	else
+		saltresult += "[saltprimarysubject] [saltsecondarysubject]"
 	return "[saltresult]!"
 
 /datum/tgs_chat_command/despacito

modular_citadel/code/modules/arousal/arousal.dm

@@ -1,13 +1,13 @@
 //Mob vars
 /mob/living
-	var/arousalloss = 0			//How aroused the mob is.
-	var/min_arousal = 0			//The lowest this mobs arousal will get. default = 0
-	var/max_arousal = 100		//The highest this mobs arousal will get. default = 100
-	var/arousal_rate = 1		//The base rate that arousal will increase in this mob.
-	var/arousal_loss_rate = 1	//How easily arousal can be relieved for this mob.
-	var/canbearoused = FALSE	//Mob-level disabler for arousal. Starts off and can be enabled as features are added for different mob types.
-	var/mb_cd_length = 100		//5 second cooldown for masturbating because fuck spam.
-	var/mb_cd_timer = 0			//The timer itself
+	var/arousalloss = 0									//How aroused the mob is.
+	var/min_arousal = AROUSAL_MINIMUM_DEFAULT			//The lowest this mobs arousal will get. default = 0
+	var/max_arousal = AROUSAL_MAXIMUM_DEFAULT			//The highest this mobs arousal will get. default = 100
+	var/arousal_rate = AROUSAL_START_VALUE				//The base rate that arousal will increase in this mob.
+	var/arousal_loss_rate = AROUSAL_START_VALUE			//How easily arousal can be relieved for this mob.
+	var/canbearoused = FALSE					//Mob-level disabler for arousal. Starts off and can be enabled as features are added for different mob types.
+	var/mb_cd_length = 5 SECONDS						//5 second cooldown for masturbating because fuck spam.
+	var/mb_cd_timer = 0									//The timer itself
 
 /mob/living/carbon/human
 	canbearoused = TRUE
@@ -22,8 +22,8 @@
 
 //Species vars
 /datum/species
-	var/arousal_gain_rate = 1 //Rate at which this species becomes aroused
-	var/arousal_lose_rate = 1 //Multiplier for how easily arousal can be relieved
+	var/arousal_gain_rate = AROUSAL_START_VALUE //Rate at which this species becomes aroused
+	var/arousal_lose_rate = AROUSAL_START_VALUE //Multiplier for how easily arousal can be relieved
 	var/list/cum_fluids = list("semen")
 	var/list/milk_fluids = list("milk")
 	var/list/femcum_fluids = list("femcum")
@@ -77,7 +77,8 @@
 		updatearousal()
 
 /mob/living/proc/getPercentAroused()
-	return ((100 / max_arousal) * arousalloss)
+	var/percentage = ((100 / max_arousal) * arousalloss)
+	return percentage
 
 /mob/living/proc/isPercentAroused(percentage)//returns true if the mob's arousal (measured in a percent of 100) is greater than the arg percentage.
 	if(!isnum(percentage) || percentage > 100 || percentage < 0)
@@ -104,6 +105,8 @@
 					S = GLOB.breasts_shapes_list[G.shape]
 			if(S?.alt_aroused)
 				G.aroused_state = isPercentAroused(G.aroused_amount)
+			if(getArousalLoss() >= ((max_arousal / 100) * 33))
+				G.aroused_state = TRUE
 			else
 				G.aroused_state = FALSE
 			G.update_appearance()

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

@@ -36,8 +36,6 @@
 	reagents.add_reagent(fluid_id, (fluid_mult * fluid_rate))
 
 /obj/item/organ/genital/breasts/update_appearance()
-	var/string = "breasts_[lowertext(shape)]_[size]"
-	icon_state = sanitize_text(string)
 	var/lowershape = lowertext(shape)
 	switch(lowershape)
 		if("pair")
@@ -50,10 +48,19 @@
 		desc += " You wouldn't measure them in cup sizes."
 	if(producing && aroused_state)
 		desc += " They're leaking [fluid_id]."
+	var/string
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
 				color = "#[skintone2hex(H.skin_tone)]"
+				string = "breasts_[lowertext(shape)]_[size]-s"
 		else
 			color = "#[owner.dna.features["breasts_color"]]"
+			string = "breasts_[lowertext(shape)]_[size]"
+		if(ishuman(owner))
+			var/mob/living/carbon/human/H = owner
+			H.update_genitals()
+
+	icon_state = sanitize_text(string)
+

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

@@ -92,7 +92,7 @@
 
 	var/list/genital_list = list()
 	for(var/obj/item/organ/O in internal_organs)
-		if(istype(O, /obj/item/organ/genital))
+		if(isgenital(O))
 			var/obj/item/organ/genital/G = O
 			if(!G.internal)
 				genital_list += G
@@ -110,10 +110,13 @@
 
 
 /obj/item/organ/genital/proc/update_size()
+	return
 
 /obj/item/organ/genital/proc/update_appearance()
+	return
 
 /obj/item/organ/genital/proc/update_link()
+	return
 
 /obj/item/organ/genital/proc/remove_ref()
 	if(linked_organ)
@@ -211,7 +214,10 @@
 
 
 /mob/living/carbon/human/proc/give_ovipositor()
+	return
 /mob/living/carbon/human/proc/give_eggsack()
+	return
+
 /mob/living/carbon/human/proc/give_vagina()
 	if(!dna)
 		return FALSE
@@ -280,7 +286,8 @@
 	var/list/genitals_to_add = list()
 	var/list/relevant_layers = list(GENITALS_BEHIND_LAYER, GENITALS_ADJ_LAYER, GENITALS_FRONT_LAYER)
 	var/list/standing = list()
-	var/size = null
+	var/size
+	var/aroused_state
 
 	for(var/L in relevant_layers) //Less hardcode
 		H.remove_overlay(L)
@@ -288,7 +295,7 @@
 	//start scanning for genitals
 	//var/list/worn_stuff = H.get_equipped_items()//cache this list so it's not built again
 	for(var/obj/item/organ/O in H.internal_organs)
-		if(istype(O, /obj/item/organ/genital))
+		if(isgenital(O))
 			var/obj/item/organ/genital/G = O
 			if(G.is_exposed()) //Checks appropriate clothing slot and if it's through_clothes
 				genitals_to_add += H.getorganslot(G.slot)
@@ -300,6 +307,7 @@
 		for(var/obj/item/organ/genital/G in genitals_to_add)
 			var/datum/sprite_accessory/S
 			size = G.size
+			aroused_state = G.aroused_state
 			switch(G.type)
 				if(/obj/item/organ/genital/penis)
 					S = GLOB.cock_shapes_list[G.shape]
@@ -311,13 +319,14 @@
 			if(!S || S.icon_state == "none")
 				continue
 			var/mutable_appearance/genital_overlay = mutable_appearance(S.icon, layer = -layer)
-			genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[G.aroused_state]_[layertext]"
+			genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[aroused_state]_[layertext]"
 
 			if(S.center)
 				genital_overlay = center_image(genital_overlay, S.dimension_x, S.dimension_y)
 
 			if(use_skintones && H.dna.features["genitals_use_skintone"])
 				genital_overlay.color = "#[skintone2hex(H.skin_tone)]"
+				genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]-s_[aroused_state]_[layertext]"
 			else
 				switch(S.color_src)
 					if("cock_color")
@@ -326,21 +335,7 @@
 						genital_overlay.color = "#[H.dna.features["breasts_color"]]"
 					if("vag_color")
 						genital_overlay.color = "#[H.dna.features["vag_color"]]"
-					if(MUTCOLORS)
-						if(fixed_mut_color)
-							genital_overlay.color = "#[fixed_mut_color]"
-						else
-							genital_overlay.color = "#[H.dna.features["mcolor"]]"
-					if(MUTCOLORS2)
-						if(fixed_mut_color2)
-							genital_overlay.color = "#[fixed_mut_color2]"
-						else
-							genital_overlay.color = "#[H.dna.features["mcolor2"]]"
-					if(MUTCOLORS3)
-						if(fixed_mut_color3)
-							genital_overlay.color = "#[fixed_mut_color3]"
-						else
-							genital_overlay.color = "#[H.dna.features["mcolor3"]]"
+
 			standing += genital_overlay
 		if(LAZYLEN(standing))
 			H.overlays_standing[layer] = standing.Copy()

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

@@ -87,6 +87,13 @@
 	icon_state = "hairy"
 	name = "Hairy"
 
+/datum/sprite_accessory/vagina/spade
+	icon_state = "spade"
+	name = "Spade"
+
+/datum/sprite_accessory/vagina/furred
+	icon_state = "furred"
+	name = "Furred"
 
 //BREASTS BE HERE
 /datum/sprite_accessory/breasts

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

@@ -27,7 +27,7 @@
 			size = 1
 		if(5 to 9)
 			size = 2
-		if(9 to INFINITY)
+		if(15 to INFINITY)
 			size = 3//no new sprites for anything larger yet
 /*		if(9 to 15)
 			size = 3
@@ -37,8 +37,7 @@
 	cached_length = length
 
 /obj/item/organ/genital/penis/update_appearance()
-	var/string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
-	icon_state = sanitize_text(string)
+	var/string
 	var/lowershape = lowertext(shape)
 	desc = "You see [aroused_state ? "an erect" : "a flaccid"] [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[round(length, 0.25) != 1 ? "es" : ""] long and [round(girth, 0.25)] inch[round(girth, 0.25) != 1 ? "es" : ""] in girth."
 
@@ -47,8 +46,15 @@
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
 				color = "#[skintone2hex(H.skin_tone)]"
+				string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]-s"
 		else
 			color = "#[owner.dna.features["cock_color"]]"
+			string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
+		if(ishuman(owner))
+			var/mob/living/carbon/human/H = owner
+			H.update_genitals()
+
+	icon_state = sanitize_text(string)
 
 /obj/item/organ/genital/penis/update_link()
 	if(owner)

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

@@ -17,12 +17,11 @@
 	var/clits				= 1
 	var/clit_diam 			= 0.25
 	var/clit_len			= 0.25
-	var/list/vag_types = list("tentacle", "dentata", "hairy")
+	var/list/vag_types = list("tentacle", "dentata", "hairy", "spade", "furred")
 
 
 /obj/item/organ/genital/vagina/update_appearance()
-	var/string = "vagina" //Keeping this code here, so making multiple sprites for the different kinds is easier.
-	icon_state = sanitize_text(string)
+	var/string //Keeping this code here, so making multiple sprites for the different kinds is easier.
 	var/lowershape = lowertext(shape)
 	var/details
 
@@ -37,6 +36,10 @@
 			details = "It is taut with smooth skin, though without much hair and "
 		if("gaping")
 			details = "It is gaping slightly open, though without much hair and "
+		if("spade")
+			details = "It is a plush canine spade, it "
+		if("furred")
+			details = "It has neatly groomed fur around the outer folds, it "
 		else
 			details = "It has an exotic shape and "
 	if(aroused_state)
@@ -51,9 +54,15 @@
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
 				var/mob/living/carbon/human/H = owner // only human mobs have skin_tone, which we need.
 				color = "#[skintone2hex(H.skin_tone)]"
+				string = "vagina-s"
 		else
 			color = "#[owner.dna.features["vag_color"]]"
+			string  = "vagina"
+		if(ishuman(owner))
+			var/mob/living/carbon/human/H = owner
+			H.update_genitals()
 
+	icon_state = sanitize_text(string)
 
 /obj/item/organ/genital/vagina/update_link()
 	if(owner)

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

@@ -18,6 +18,16 @@
 	category = SLOT_NECK
 	path = /obj/item/clothing/neck/petcollar
 
+/datum/gear/leathercollar
+	name = "Leather collar"
+	category = SLOT_NECK
+	path = /obj/item/clothing/neck/petcollar/leather
+
+/datum/gear/choker
+	name = "Choker"
+	category = SLOT_NECK
+	path = /obj/item/clothing/neck/petcollar/choker
+
 /datum/gear/scarf
 	name = "White scarf"
 	category = SLOT_NECK

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -49,6 +49,66 @@
 	item_color = "steele"
 	medaltype = "medal-silver"
 
+/obj/item/toy/sword/darksabre
+	name = "Kiara's Sabre"
+	desc = "This blade looks as dangerous as its owner."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darksabre"
+	item_state = "darksabre"
+	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("attacked", "struck", "hit")
+
+
+/obj/item/storage/belt/sabre/darksabre
+	name = "Ornate Sheathe"
+	desc = "An ornate and rather sinister looking sabre sheathe."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darksheath"
+	item_state = "darksheath"
+	w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/belt/sabre/darksabre/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_items = 1
+	STR.rustle_sound = FALSE
+	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.can_hold = typecacheof(list(
+		/obj/item/toy/sword/darksabre
+		))
+
+/obj/item/storage/belt/sabre/darksabre/update_icon()
+	icon_state = "darksheath"
+	item_state = "darksheath"
+	if(contents.len)
+		icon_state += "-darksabre"
+		item_state += "-darksabre"
+	if(loc && isliving(loc))
+		var/mob/living/L = loc
+		L.regenerate_icons()
+	..()
+
+/obj/item/storage/belt/sabre/darksabre/PopulateContents()
+	new /obj/item/toy/sword/darksabre(src)
+	update_icon()
+
+/obj/item/clothing/suit/armor/vest/darkcarapace
+	name = "Dark Armor"
+	desc = "A dark, non-functional piece of armor sporting a red and black finish."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darkcarapace"
+	item_state = "darkcarapace"
+	blood_overlay_type = "armor"
+	dog_fashion = /datum/dog_fashion/back
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
+
 /obj/item/lighter/gold
 	name = "\improper Engraved Zippo"
 	desc = "A shiny and relatively expensive zippo lighter. There's a small etched in verse on the bottom that reads, 'No Gods, No Masters, Only Man.'"
@@ -307,51 +367,6 @@
 		if(prob(5) && H.hallucination < 15)
 			H.hallucination += 10
 
-/obj/item/toy/sword/darksabre
-	name = "Kiara's Sabre"
-	desc = "This blade looks as dangerous as its owner."
-	icon = 'icons/obj/custom.dmi'
-	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	icon_state = "darksabre"
-	item_state = "darksabre"
-	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
-	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
-	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("attacked", "struck", "hit")
-
-
-/obj/item/storage/belt/sabre/darksabre
-	name = "Ornate Sheathe"
-	desc = "An ornate and rather sinister looking sabre sheathe."
-	icon = 'icons/obj/custom.dmi'
-	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	icon_state = "darksheath"
-	item_state = "darksheath"
-	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/darksabre/ComponentInitialize()
-	. = ..()
-	GET_COMPONENT(STR, /datum/component/storage)
-	STR.max_items = 1
-	STR.rustle_sound = FALSE
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.can_hold = typecacheof(list(
-		/obj/item/toy/sword/darksabre
-		))
-
-/obj/item/clothing/suit/armor/vest/darkcarapace
-	name = "Dark Armor"
-	desc = "A dark, non-functional piece of armor sporting a red and black finish."
-	icon = 'icons/obj/custom.dmi'
-	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	icon_state = "darkcarapace"
-	item_state = "darkcarapace"
-	blood_overlay_type = "armor"
-	dog_fashion = /datum/dog_fashion/back
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-
-
 /obj/item/clothing/neck/cloak/green
 	name = "Generic Green Cloak"
 	desc = "This cloak doesn't seem too special."

modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm

@@ -14,7 +14,6 @@
 	ext_cooldown = 25
 
 /obj/item/integrated_circuit/manipulation/electric_stimulator/do_work()
-	..()
 	set_pin_data(IC_OUTPUT, 1, 0)
 	var/mob/living/M = get_pin_data_as_type(IC_INPUT, 1, /mob/living)
 	if(!check_target(M))

modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm

@@ -91,7 +91,7 @@
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
-	vore_default_mode = DM_HOLD
+	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/bear
 	devourable = TRUE
@@ -99,14 +99,14 @@
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
-	vore_default_mode = DM_HOLD
+	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/poison/giant_spider
 	devourable = TRUE
 	digestable = TRUE
 	feeding = TRUE
 	vore_active = TRUE
-	vore_default_mode = DM_HOLD
+	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/retaliate/poison/snake
 	devourable = TRUE
@@ -114,7 +114,7 @@
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
-	vore_default_mode = DM_HOLD
+	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/gorilla
 	devourable = TRUE
@@ -122,7 +122,7 @@
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
-	vore_default_mode = DM_HOLD
+	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/asteroid/goliath
 	devourable = TRUE
@@ -130,7 +130,7 @@
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
-	vore_default_mode = DM_HOLD
+	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/carp
 	devourable = TRUE
@@ -138,4 +138,4 @@
 	feeding = TRUE
 	vore_active = TRUE
 	isPredator = TRUE
-	vore_default_mode = DM_HOLD
+	vore_default_mode = DM_DIGEST

modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm

@@ -74,10 +74,12 @@
 /obj/item/stock_parts/cell/magrifle_e
 	name = "magrifle power supply"
 	maxcharge = 14400
+	chargerate = 3520
 
 /obj/item/stock_parts/cell/magpistol_e
 	name = "magpistol power supply"
 	maxcharge = 6000
+	chargerate = 1000
 
 ///sci designs///