New gential; Anus

Ass cheeks next. and works with fleshlights and vibrators.

_maps/_basemap.dm

@@ -1,4 +1,4 @@
-//#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
+#define LOWMEMORYMODE //uncomment this to load centcom and runtime station and thats it.
 
 #include "map_files\generic\CentCom.dmm"
 

code/__HELPERS/mobs.dm

@@ -192,6 +192,7 @@
 		"inflatable_belly" 		= FALSE,
 		"belly_color" 		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		"has_balls" 		= FALSE,
+		"has_anus" 			= FALSE,
 		"balls_internal" 	= FALSE,
 		"balls_color" 		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		"balls_amount"		= 2,

code/modules/client/preferences.dm

@@ -142,6 +142,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		"hide_belly" = FALSE,
 		"inflatable_belly" = FALSE,
 		"belly_color" = "fff",
+		"has_anus" = FALSE,
 		"has_balls" = FALSE,
 		"balls_internal" = FALSE,
 		"balls_color" = "fff",
@@ -920,6 +921,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "<b>Inflation (Climax With):</b><a style='display:block;width:50px' href='?_src_=prefs;preference=inflatable_belly'>[features["inflatable_belly"] == 1 ? "Yes" : "No"]</a>"
 
 				dat += "</td>"
+
+				dat += APPEARANCE_CATEGORY_COLUMN
+				dat += "<h3>Anus</h3>"
+				dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=has_anus'>[features["has_anus"] == TRUE ? "Yes" : "No"]</a>"
+				dat += "</td>"
+
 			dat += "</td>"
 			dat += "</tr></table>"
 
@@ -2502,6 +2509,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(features["has_vag"] == FALSE)
 						features["has_womb"] = FALSE
 						features["can_get_preg"] = FALSE
+				if("has_anus")
+					features["has_anus"] = !features["has_anus"]
 				if("has_womb")
 					features["has_womb"] = !features["has_womb"]
 				if("can_get_preg")

code/modules/client/preferences_savefile.dm

@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	23
+#define SAVEFILE_VERSION_MAX	24
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -423,11 +423,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//womb features
 	S["feature_has_womb"]				>> features["has_womb"]
 	S["feature_can_get_preg"]			>> features["can_get_preg"] //hyperstation 13
-		//balls features
+		//belly features
 	S["feature_has_belly"]				>> features["has_belly"]
 	S["feature_belly_color"]			>> features["belly_color"]
 	S["feature_hide_belly"]				>> features["hide_belly"]
 	S["feature_inflatable_belly"]		>> features["inflatable_belly"]
+	//anus features
+	S["feature_has_anus"]				>> features["has_anus"]
 
 	//flavor text
 	//Let's make our players NOT cry desperately as we wipe their savefiles of their special snowflake texts:

hyperstation/code/modules/arousal/arousalhud.dm

@@ -9,8 +9,9 @@
 
 	var/mob/living/carbon/U = user
 	for(var/obj/item/organ/genital/G in U.internal_organs)
-		if(!G.dontlist)
-			dat	+= "<a href='byond://?src=[REF(src)];hide[G.name]=1'>[G.mode == "hidden" ? "[G.name] <font color='red'>(Hidden)</font>" : (G.mode == "clothes" ? "[G.name] <font color='yellow'>(Hidden by Clothes)</font>" : (G.mode == "visable" ? "[G.name] <font color='green'>(Visable)</font>" : "[G.name] <font color='green'>(Visable)</font>"))]</a><BR>"
+		if(!G.nochange)
+			if(!G.dontlist)
+				dat	+= "<a href='byond://?src=[REF(src)];hide[G.name]=1'>[G.mode == "hidden" ? "[G.name] <font color='red'>(Hidden)</font>" : (G.mode == "clothes" ? "[G.name] <font color='yellow'>(Hidden by Clothes)</font>" : (G.mode == "visable" ? "[G.name] <font color='green'>(Visable)</font>" : "[G.name] <font color='green'>(Visable)</font>"))]</a><BR>"
 
 	dat	+=	{"<BR><B>Contexual Options</B><BR><HR>"}
 	var/obj/item/organ/genital/penis/P = user.getorganslot("penis")

hyperstation/code/obj/fleshlight.dm

@@ -100,7 +100,7 @@
 /obj/item/portallight/examine(mob/user)
 	. = ..()
 	if(!portalunderwear)
-		. += "<span class='notice'>The device is unpaired, to pair, swipe against a pair of portal panties(TM). </span>"
+		. += "<span class='notice'>The device is unpaired, to pair, swipe against a pair of portal panties. </span>"
 	else
 		. += "<span class='notice'>The device is paired, and awaiting input. </span>"
 
@@ -117,12 +117,12 @@
 	else
 		option = "Fuck"
 
-	var/obj/item/organ/genital/vagina/V
-	if(istype(portalunderwear.loc, /obj/item/organ/genital/vagina)) //Sanity check. Without this it will runtime.
-		V = portalunderwear.loc
-	if(!V)
+	var/obj/item/organ/genital/G
+	if(istype(portalunderwear.loc, /obj/item/organ/genital)) //Sanity check. Without this it will runtime error.
+		G = portalunderwear.loc
+	if(!G)
 		return
-	var/mob/living/carbon/human/M = V.owner
+	var/mob/living/carbon/human/M = G.owner
 
 	if(option == "Fuck"&&!P.is_exposed()) //we are trying to fuck with no penis!
 		to_chat(user, "<span class='notice'>You don't see anywhere to use this on.</span>")
@@ -156,7 +156,7 @@
 			M.emote("moan")
 
 		if(option == "Fuck")// normal fuck
-			to_chat(M, "<span class='love'>You feel a [P.shape] shaped penis pumping through the portal into your vagina.</span>")//message your partner and kinky!
+			to_chat(M, "<span class='love'>You feel a [P.length] inch, [P.shape] shaped penis pumping through the portal into your [G.name].</span>")//message your partner, and kinky!
 			if(prob(30)) //30% chance to make them moan.
 				C.emote("moan")
 			if(prob(30)) //30% chance to make your partner moan.
@@ -166,10 +166,10 @@
 			M.do_jitter_animation() //make your partner shake too!
 
 			if (M.getArousalLoss() >= 100 && ishuman(M) && prob(5))//Why not have a probability to cum when someone's getting nailed with max arousal?~
-				if(V.is_exposed())	//Oh yea, if vagina is not exposed, the climax will not cause a spill
-					M.mob_climax_outside(V, spillage = TRUE) 
+				if(G.is_exposed())	//Oh yea, if vagina is not exposed, the climax will not cause a spill
+					M.mob_climax_outside(G, spillage = TRUE)
 				else
-					M.mob_climax_outside(V, spillage = FALSE)
+					M.mob_climax_outside(G, spillage = FALSE)
 
 			if (C.getArousalLoss() >= 100 && ishuman(C) && C.has_dna())
 				var/mob/living/carbon/human/O = C
@@ -180,10 +180,10 @@
 					O.mob_climax_partner(P, M, FALSE, TRUE, FALSE, TRUE) //climax with their partner remotely, and impreg because people keep asking!
 
 		if(option == "Lick")
-			to_chat(M, "<span class='love'>You feel a tongue lick you through the portal against your vagina.</span>")
+			to_chat(M, "<span class='love'>You feel a tongue lick you through the portal against your [G.name].</span>")
 			M.adjustArousalLoss(10)
 		if(option == "Touch")
-			to_chat(M, "<span class='love'>You feel someone touching your vagina through the portal.</span>")
+			to_chat(M, "<span class='love'>You feel someone touching your [G.name] through the portal.</span>")
 			M.adjustArousalLoss(5)
 
 		return
@@ -193,13 +193,14 @@
 	//get their looks and vagina colour!
 	cut_overlays()//remove current overlays
 
-	var/obj/item/organ/genital/vagina/V
-	if(istype(portalunderwear.loc, /obj/item/organ/genital/vagina)) //Sanity check. Without this it will runtime.
-		V = portalunderwear.loc
-	if(!V)
+	var/obj/item/organ/genital/G
+	if(istype(portalunderwear.loc, /obj/item/organ/genital)) //Sanity check. Without this it will runtime.
+		G = portalunderwear.loc
+	if(!G)
 		useable = FALSE
 		return
-	var/mob/living/carbon/human/H = V.owner
+
+	var/mob/living/carbon/human/H = G.owner
 
 	if(H) //if the portal panties are on someone.
 		sleeve = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_sleeve_normal")
@@ -215,8 +216,12 @@
 		sleeve.color = "#" + H.dna.features["mcolor"]
 		add_overlay(sleeve)
 
-		organ = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_vag")
-		organ.color = portalunderwear.loc.color
+		if(G.name == "vagina")
+			organ = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_vag")
+			organ.color = portalunderwear.loc.color
+		if(G.name == "anus")
+			organ = mutable_appearance('hyperstation/icons/obj/fleshlight.dmi', "portal_anus")
+			organ.color = "#" + H.dna.features["mcolor"]
 
 		useable = TRUE
 		add_overlay(organ)
@@ -224,7 +229,7 @@
 		useable = FALSE
 
 //Hyperstation 13 portal underwear
-//can be attached to vagina, just like the vibrator, still requires pairing with the portallight
+//can be attached to vagina or anus, just like the vibrator, still requires pairing with the portallight
 
 /obj/item/portalpanties
 	name = "portal panties"
@@ -235,6 +240,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	var/obj/item/portallight
 	var/attached = FALSE
+	var/shapetype = "vagina"
 
 /obj/item/portalpanties/examine(mob/user)
 	. = ..()
@@ -267,33 +273,34 @@
 	var/obj/item/organ/genital/picked_organ
 	var/mob/living/carbon/human/S = user
 	var/mob/living/carbon/human/T = C
-	picked_organ = S.target_genitals(T) //allowing to pick organ for anus down the line
+	picked_organ = S.target_genitals(T)
 	if(picked_organ)
 		C.visible_message("<span class='warning'>[user] is trying to attach [src] to [T]!</span>",\
 						"<span class='warning'>[user] is trying to put [src] on you!</span>")
-		if(!do_mob(user, C, 5 SECONDS))//warn them and have a delay of 5 seconds to apply.
+		if(!do_mob(user, C, 3 SECONDS))//warn them and have a delay of 5 seconds to apply.
 			return
 
-		if(!(picked_organ.name == "vagina")) //only fits on a vagina
-			to_chat(user, "<span class='warning'>[src] can only be attached to a vagina.</span>")
-			return
+		if((picked_organ.name == "vagina")||(picked_organ.name == "anus")) //only fits on a vagina or anus
 
-		if(!picked_organ.equipment)
-			to_chat(user, "<span class='love'>You wrap [src] around [T]'s [picked_organ.name].</span>")
+			src.shapetype = picked_organ.name
+			if(!picked_organ.equipment)
+				to_chat(user, "<span class='love'>You wrap [src] around [T]'s [picked_organ.name].</span>")
+			else
+				to_chat(user, "<span class='notice'>They already have [picked_organ.equipment.name] there.</span>")
+				return
+
+			if(!user.transferItemToLoc(src, picked_organ)) //check if you can put it in
+				return
+			src.attached = TRUE
+			picked_organ.equipment = src
+
+			var/obj/item/portallight/P = portallight
+			//now we need to send what they look like, but saddly if the person changes colour for what ever reason, it wont update. but dont tell people shh.
+			if(P) //just to make sure
+				P.updatesleeve()
 		else
-			to_chat(user, "<span class='notice'>They already have a [picked_organ.equipment.name] there.</span>")
+			to_chat(user, "<span class='warning'>[src] can only be attached to a vagina or anus.</span>")
 			return
-
-		if(!user.transferItemToLoc(src, picked_organ)) //check if you can put it in
-			return
-		src.attached = TRUE
-		picked_organ.equipment = src
-
-		var/obj/item/portallight/P = portallight
-		//now we need to send what they look like, but saddly if the person changes colour for what ever reason, it wont update. but dont tell people shh.
-		if(P) //just to make sure
-			P.updatesleeve()
-
 	else
 		to_chat(user, "<span class='notice'>You don't see anywhere to attach this.</span>")
 

hyperstation/code/obj/vibrator.dm

@@ -115,12 +115,10 @@ Code:
 
 		if(G)
 			switch(G.name) //just being fancy
-				if("penis")
-					to_chat(U, "<span class='love'>[src] vibrates against your [G.name]!</span>")
 				if("breasts")
 					to_chat(U, "<span class='love'>[src] vibrates against your nipples!</span>")
-				if("vagina")
-					to_chat(U, "<span class='love'>[src] vibrates inside you!</span>")
+				else
+					to_chat(U, "<span class='love'>[src] vibrates against your [G.name]!</span>")
 
 			var/intencity = 6*mode
 			U.adjustArousalLoss(intencity) //give pleasure

modular_citadel/code/modules/arousal/arousal.dm

@@ -321,7 +321,7 @@
 				src.visible_message("<span class='love'>[src] orgasms with [p_their()] [G.name]!</span>", \
 									"<span class='userlove'>You climax with your [G.name].</span>", \
 									"<span class='userlove'>You climax using your [G.name].</span>")
-								
+
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
 			if(G.can_climax)
 				setArousalLoss(min_arousal)
@@ -522,10 +522,9 @@
 	var/list/worn_stuff = get_equipped_items()
 
 	for(var/obj/item/organ/genital/G in T.internal_organs)
-		if(G.can_climax) //filter out what you can't masturbate with
-			if(G.is_exposed(worn_stuff)) //Nude or through_clothing
-				if(!G.dontlist)
-					genitals_list += G
+		if(G.is_exposed(worn_stuff)) //Nude or through_clothing
+			if(!G.dontlist)
+				genitals_list += G
 	if(genitals_list.len)
 		ret_organ = input(src, "", "Genitals", null)  as null|obj in genitals_list
 		return ret_organ

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

@@ -0,0 +1,25 @@
+/obj/item/organ/genital/anus
+	name 					= "anus"
+	desc 					= ""
+	zone 					= "groin"
+	slot 					= "anus"
+	w_class 				= 3
+	size 					= 0
+	var/statuscheck			= FALSE
+	masturbation_verb 		= "massage"
+	can_climax				= FALSE //no poo poo 4 u
+	nochange				= TRUE
+
+
+/obj/item/organ/genital/anus/Initialize()
+	. = ..()
+
+/obj/item/organ/genital/anus/on_life()
+	if(QDELETED(src))
+		return
+	if(!owner)
+		return
+
+
+
+

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

@@ -25,6 +25,7 @@
 	var/mode					= "clothes"
 	var/obj/item/equipment 		//for fun stuff that goes on the gentials/maybe rings down the line
 	var/dontlist				= FALSE
+	var/nochange				= FALSE //stops people changing visablity.
 
 /obj/item/organ/genital/Initialize()
 	. = ..()
@@ -67,6 +68,8 @@
 			return owner.is_chest_exposed()
 		if("groin")
 			return owner.is_groin_exposed()
+		if("anus")
+			return owner.is_groin_exposed()
 
 	return FALSE
 
@@ -150,6 +153,8 @@
 	if (NOGENITALS in dna.species.species_traits)
 		return
 	//Order should be very important. FIRST vagina, THEN testicles, THEN penis, as this affects the order they are rendered in.
+	if(dna.features["has_anus"])
+		give_anus()
 	if(dna.features["has_vag"])
 		give_vagina()
 	if(dna.features["has_womb"])
@@ -239,6 +244,18 @@
 		if(dna.features["inflatable_belly"]) //autohide bellies if they have the option ticked.
 			B.inflatable = TRUE
 
+/mob/living/carbon/human/proc/give_anus()
+	if(!dna)
+		return FALSE
+	if(NOGENITALS in dna.species.species_traits)
+		return FALSE
+	if(!getorganslot("anus"))
+		var/obj/item/organ/genital/anus/A = new
+		A.Insert(src)
+		if(A)
+			A.color = "#[skintone2hex(skin_tone)]"
+			A.update()
+
 
 
 /mob/living/carbon/human/proc/give_breasts()

modular_citadel/code/modules/client/preferences_savefile.dm

@@ -96,6 +96,8 @@
 	WRITE_FILE(S["feature_belly_color"], features["belly_color"])
 	WRITE_FILE(S["feature_hide_belly"], features["hide_belly"])
 	WRITE_FILE(S["feature_inflatable_belly"], features["inflatable_belly"])
+	//anus
+	WRITE_FILE(S["feature_has_anus"], features["has_anus"])
 
 	//gear loadout
 	if(islist(chosen_gear))

tgstation.dme

@@ -3240,6 +3240,7 @@
 #include "modular_citadel\code\modules\admin\holder2.dm"
 #include "modular_citadel\code\modules\admin\secrets.dm"
 #include "modular_citadel\code\modules\arousal\arousal.dm"
+#include "modular_citadel\code\modules\arousal\organs\anus.dm"
 #include "modular_citadel\code\modules\arousal\organs\belly.dm"
 #include "modular_citadel\code\modules\arousal\organs\breasts.dm"
 #include "modular_citadel\code\modules\arousal\organs\eggsack.dm"