WIP - Removes ERP verbs

_maps/map_files/PossumMap/PossumParadise.dmm

@@ -3308,7 +3308,7 @@
 "blF" = (/obj/effect/spawner/lootdrop/f13/armor/tier4,/turf/open/indestructible/ground/outside/dirt,/area/f13/underground/mountain)
 "blG" = (/turf/open/indestructible/ground/outside/sidewalk{icon_state = "verticalrightborderright0"; tag = "icon-verticalrightborderright0"},/area/f13/tunnel)
 "blH" = (/turf/open/indestructible/ground/outside/road{icon_state = "verticalleftborderright0"},/area/f13/tunnel)
-"blI" = (/mob/living/simple_animal/hostile/deathclaw/funclaw,/turf/closed/mineral/snowmountain,/area/f13/underground/mountain)
+"blI" = (/mob/living/simple_animal/hostile/deathclaw,/turf/closed/mineral/snowmountain,/area/f13/underground/mountain)
 "blJ" = (/turf/closed/mineral/snowmountain,/area/f13/tunnel)
 "blK" = (/obj/effect/landmark/start/f13/vexillarius,/turf/open/indestructible/ground/inside/subway,/area/f13/tunnel)
 "blL" = (/obj/machinery/light/small{dir = 8; light_color = "#d8b1b1"},/turf/open/indestructible/ground/inside/subway,/area/f13/tunnel)

code/modules/client/preferences.dm

@@ -619,7 +619,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Play Mojave Radio:</b> <a href='?_src_=prefs;preference=hear_radio'>[(wasteland_toggles & SOUND_RADIO) ? "Enabled":"Disabled"]</a><br>"
 			dat += "<b>Play Lobby Music:</b> <a href='?_src_=prefs;preference=lobby_music'>[(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"]</a><br>"
 			dat += "<b>See Pull Requests:</b> <a href='?_src_=prefs;preference=pull_requests'>[(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"]</a><br>"
-			dat += "<b>Allow Lewd Verbs:</b> <a href='?_src_=prefs;preference=verb_consent'>[(wasteland_toggles & VERB_CONSENT) ? "Yes":"No"]</a><br>"
+			//dat += "<b>Allow Lewd Verbs:</b> <a href='?_src_=prefs;preference=verb_consent'>[(wasteland_toggles & VERB_CONSENT) ? "Yes":"No"]</a><br>" LEWD VERBS - commented out for reference during WIP erp verb removal. pending removal
 
 			dat += "<br>"
 
@@ -1704,8 +1704,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if("hear_radio")
 					wasteland_toggles ^= SOUND_RADIO
 
-				if("verb_consent")
-					wasteland_toggles ^= VERB_CONSENT
+				/*if("verb_consent") LEWD VERBS - commented out for reference during WIP erp verb removal. pending removal
+					wasteland_toggles ^= VERB_CONSENT*/
 
 				if("lobby_music")
 					toggles ^= SOUND_LOBBY

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	20
+#define SAVEFILE_VERSION_MAX	21
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -42,6 +42,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 //if your savefile is 3 months out of date, then 'tough shit'.
 
 /datum/preferences/proc/update_preferences(current_version, savefile/S)
+	if(current_version < 21)
+		if(wasteland_toggles & VERB_CONSENT)
+			wasteland_toggles &= ~VERB_CONSENT
 	return
 
 /datum/preferences/proc/update_character(current_version, savefile/S)

code/modules/client/preferences_toggles.dm

@@ -267,7 +267,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)()
 /datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C)
 	return C.prefs.chat_toggles & CHAT_OOC
 
-TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, verb_consent)()
+/*TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, verb_consent)() LEWD VERBS - commented out for reference during WIP erp verb removal. pending removal
 	set name = "Toggle Lewd Verbs"
 	set category = "Preferences"
 	set desc = "Allow Lewd Verbs"
@@ -284,7 +284,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, verb_consent)()
 	SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Allow Lewd Verbs", "[usr.client.prefs.wasteland_toggles & VERB_CONSENT ? "Yes" : "No"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /datum/verbs/menu/Settings/verb_consent/Get_checked(client/C)
-	return C.prefs.wasteland_toggles & VERB_CONSENT
+	return C.prefs.wasteland_toggles & VERB_CONSENT*/
 
 
 TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_looc)()

code/modules/mob/living/carbon/human/examine.dm

@@ -119,11 +119,11 @@
 		if(100 to 200)
 			msg += "<span class='warning'>[t_He] [t_is] twitching ever so slightly.</span>\n"
 
-	if(client && client.prefs)
+	/*if(client && client.prefs) LEWD VERBS - commented out for reference during WIP erp verb removal. pending removal
 		if(client.prefs.wasteland_toggles & VERB_CONSENT)
 			msg += "[t_His] player has allowed lewd verbs.\n"
 		else
-			msg += "[t_His] player has not allowed lewd verbs.\n"
+			msg += "[t_His] player has not allowed lewd verbs.\n"*/
 
 	var/appears_dead = 0
 	if(stat == DEAD || (has_trait(TRAIT_FAKEDEATH)))

code/modules/mob/living/silicon/robot/robot.dm

@@ -216,9 +216,7 @@
 	"Medical" = /obj/item/robot_module/medical, \
 	"Miner" = /obj/item/robot_module/miner, \
 	"Janitor" = /obj/item/robot_module/janitor, \
-	"Service" = /obj/item/robot_module/butler, \
-	"Handy Fisto" = /obj/item/robot_module/sexy_handy, \
-	"Fisto" = /obj/item/robot_module/fisto_protectron)
+	"Service" = /obj/item/robot_module/butler)
 	if(!CONFIG_GET(flag/disable_peaceborg))
 		modulelist["Peacekeeper"] = /obj/item/robot_module/peacekeeper
 	if(!CONFIG_GET(flag/disable_secborg))
@@ -801,12 +799,6 @@
 /mob/living/silicon/robot/modules/janitor
 	set_module = /obj/item/robot_module/janitor
 
-/mob/living/silicon/robot/modules/sexyhandy
-	set_module = /obj/item/robot_module/sexy_handy
-
-/mob/living/silicon/robot/modules/fistobot
-	set_module = /obj/item/robot_module/fisto_protectron
-
 /mob/living/silicon/robot/modules/syndicate
 	icon_state = "synd_sec"
 	faction = list(ROLE_SYNDICATE)

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -605,37 +605,6 @@
 	can_be_pushed = FALSE
 	hat_offset = 3
 
-//SexBot module begin
-/obj/item/robot_module/fisto_protectron
-	name = "Fisto"
-	basic_modules = list(
-		/obj/item/dildo/cyborg,
-		/obj/item/reagent_containers/spray/sexborg_oil)
-	emag_modules = list(/obj/item/reagent_containers/spray/cyborg_lube)
-	ratvar_modules = list(/obj/item/clockwork/weapon/ratvarian_spear)
-	cyborg_base_icon = "protectron"
-	moduleselect_icon = "brobot"
-	can_be_pushed = FALSE
-	hat_offset = 3
-
-/obj/item/robot_module/sexy_handy
-	name = "Hans"
-	basic_modules = list(
-		/obj/item/dildo/cyborg,
-		/obj/item/reagent_containers/spray/sexborg_oil)
-	emag_modules = list(/obj/item/reagent_containers/spray/cyborg_lube)
-	ratvar_modules = list(/obj/item/clockwork/weapon/ratvarian_spear)
-	cyborg_base_icon = "pleasure"
-	moduleselect_icon = "brobot"
-	can_be_pushed = TRUE
-	hat_offset = 3
-
-/obj/item/reagent_containers/spray/sexborg_oil
-	name = "oil spray"
-	list_reagents = list("cooking_oil" = 250)
-
-//module end
-
 
 /datum/robot_energy_storage
 	var/name = "Generic energy storage"

interactions/lewd/lewd_interactions.dm

@@ -71,11 +71,7 @@
 			return FALSE
 
 		if(require_ooc_consent)
-			if(user.client && user.client.prefs)
-				if(user.client.prefs.wasteland_toggles & VERB_CONSENT)
-					return TRUE
-				else
-					return FALSE
+			return FALSE
 		return TRUE
 	return FALSE
 
@@ -122,11 +118,7 @@
 			return FALSE
 
 		if(require_ooc_consent)
-			if(target.client && target.client.prefs)
-				if(target.client.prefs.wasteland_toggles & VERB_CONSENT)
-					return TRUE
-				else
-					return FALSE
+			return FALSE
 		return TRUE
 	return FALSE
 

tgstation.dme

@@ -2182,7 +2182,6 @@
 #include "code\modules\mob\living\simple_animal\hostile\wumborian_fugu.dm"
 #include "code\modules\mob\living\simple_animal\hostile\bosses\boss.dm"
 #include "code\modules\mob\living\simple_animal\hostile\bosses\paperwizard.dm"
-#include "code\modules\mob\living\simple_animal\hostile\deathclaw\funclaw.dm"
 #include "code\modules\mob\living\simple_animal\hostile\gorilla\emotes.dm"
 #include "code\modules\mob\living\simple_animal\hostile\gorilla\gorilla.dm"
 #include "code\modules\mob\living\simple_animal\hostile\gorilla\visuals_icons.dm"