follow-up

I HOPE this doesn't break stuff

code/__SPLURTCODE/DEFINES/spans.dm

@@ -1,2 +0,0 @@
-#define span_userlove(str) ("<span class='userlove'>" + str + "</span>")
-#define span_lewd(str) ("<span class='lewd'>" + str + "</span>")

html/changelogs/archive/2023-01.yml

@@ -74,7 +74,7 @@
   - spellcheck: fixed a few typos.
   - refactor: refactored skirt peeking.
   - tweak: examine someone twice to actually peek their panties.
-2023-01-15:
+2023-01-16:
   SandPoot:
   - rscadd: You can now allow interacting with your genitals through clothes.
   - tweak: Modified sandstorm's spans (`<span class='x'>"...`) with the defines (`span_x("...`)

modular_sand/code/datums/interactions/interaction_datums/lewd/feet.dm

@@ -135,7 +135,7 @@
 						'modular_sand/sound/interactions/foot_dry3.ogg',
 						'modular_sand/sound/interactions/foot_wet1.ogg',
 						'modular_sand/sound/interactions/foot_wet2.ogg'), 70, 1, -1)
-	user.visible_message(message = span_lewd("<b>\The [user]</b> [message]"), ignored_mobs = user.get_unconsenting()))
+	user.visible_message(message = span_lewd("<b>\The [user]</b> [message]"), ignored_mobs = user.get_unconsenting())
 	if(partner.can_penetrating_genital_cum())
 		partner.handle_post_sex(NORMAL_LUST, CUM_TARGET_FEET, user)
 

modular_sand/code/datums/interactions/interaction_interface.dm

@@ -268,7 +268,7 @@
 					human.update_genitals()
 				return
 			if("set_accessibility" in params)
-				if(params["genital"] == "anus")
+				if(!self.getorganslot(ORGAN_SLOT_ANUS) && params["genital"] == "anus")
 					self.toggle_anus_always_accessible()
 					return TRUE
 				var/obj/item/organ/genital/genital = locate(params["genital"], self.internal_organs)

modular_sand/code/datums/interactions/lewd_definitions.dm

@@ -21,9 +21,9 @@
 	var/has_balls = FALSE
 	var/has_vagina = FALSE
 	var/has_anus = TRUE
+	var/has_butt = FALSE
 	var/anus_always_accessible = FALSE
 	var/has_breasts = FALSE
-	var/has_butt = FALSE
 	var/anus_exposed = FALSE
 	var/last_partner
 	var/last_orifice
@@ -86,6 +86,9 @@
 	lust = num
 	lastlusttime = world.time
 
+/mob/living/proc/toggle_anus_always_accessible()
+	anus_always_accessible = !anus_always_accessible
+
 /mob/living/proc/has_genital(slot, visibility = REQUIRE_ANY)
 	var/mob/living/carbon/C = src
 	if(istype(C))
@@ -95,7 +98,7 @@
 				if(REQUIRE_ANY)
 					return TRUE
 				if(REQUIRE_EXPOSED)
-					return genital.is_exposed()
+					return genital.is_exposed() || genital.always_accessible
 				if(REQUIRE_UNEXPOSED)
 					return !genital.is_exposed()
 				else
@@ -343,29 +346,11 @@
 					return TRUE
 	return FALSE
 
-/mob/living/proc/has_butt(var/nintendo = REQUIRE_ANY)
+/mob/living/proc/has_butt(visibility = REQUIRE_ANY)
 	var/mob/living/carbon/C = src
 	if(has_butt && !istype(C))
 		return TRUE
-	if(istype(C))
+	return has_genital(ORGAN_SLOT_BUTT, visibility)
-		var/obj/item/organ/genital/peepee = C.getorganslot(ORGAN_SLOT_BUTT)
-		if(peepee)
-			switch(nintendo)
-				if(REQUIRE_ANY)
-					return TRUE
-				if(REQUIRE_EXPOSED)
-					if(peepee.is_exposed())
-						return TRUE
-					else
-						return FALSE
-				if(REQUIRE_UNEXPOSED)
-					if(!peepee.is_exposed())
-						return TRUE
-					else
-						return FALSE
-				else
-					return TRUE
-	return FALSE
 
 ///Are we wearing something that covers our chest?
 /mob/living/proc/is_topless()

modular_sand/code/datums/traits/negative.dm

@@ -3,7 +3,7 @@
 	desc = "For one reason or another, you either can't or haven't learned the common tongue."
 	value = 0
 	mob_trait = TRAIT_SHELTERED
-	gain_text = span_dagner("The words of others begin to blur together...")
+	gain_text = span_danger("The words of others begin to blur together...")
 	lose_text = span_notice("You start putting together what people are saying!")
 	medical_record_text = "Patient has shown an inability to use common speaking languages."
 

tgstation.dme

@@ -267,7 +267,6 @@
 #include "code\__SPLURTCODE\DEFINES\rope.dm"
 #include "code\__SPLURTCODE\DEFINES\say.dm"
 #include "code\__SPLURTCODE\DEFINES\signals.dm"
-#include "code\__SPLURTCODE\DEFINES\spans.dm"
 #include "code\__SPLURTCODE\DEFINES\species.dm"
 #include "code\__SPLURTCODE\DEFINES\subsystems.dm"
 #include "code\__SPLURTCODE\DEFINES\traits.dm"