From d9edb4a1b304ad8c3ad782fe91b4c1259ec2a21f Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 13 Jun 2020 13:49:06 -0400 Subject: [PATCH 1/5] WIP - rudimentary lewd verb removal. somewhat hacky atm but this should work --- code/modules/client/preferences.dm | 6 +++--- code/modules/client/preferences_savefile.dm | 5 ++++- code/modules/client/preferences_toggles.dm | 4 ++-- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- interactions/lewd/lewd_interactions.dm | 12 ++---------- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index eb0eef0f..987a9a84 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -619,7 +619,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Play Mojave Radio: [(wasteland_toggles & SOUND_RADIO) ? "Enabled":"Disabled"]
" dat += "Play Lobby Music: [(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"]
" dat += "See Pull Requests: [(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"]
" - dat += "Allow Lewd Verbs: [(wasteland_toggles & VERB_CONSENT) ? "Yes":"No"]
" + //dat += "Allow Lewd Verbs: [(wasteland_toggles & VERB_CONSENT) ? "Yes":"No"]
" LEWD VERBS - commented out for reference during WIP erp verb removal. pending removal dat += "
" @@ -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 diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index c4488fa7..d0832d0e 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/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) diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index e259862d..c305739f 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/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)() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 16160654..7ccb764f 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -119,11 +119,11 @@ if(100 to 200) msg += "[t_He] [t_is] twitching ever so slightly.\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))) diff --git a/interactions/lewd/lewd_interactions.dm b/interactions/lewd/lewd_interactions.dm index 11fe4328..9fb7b917 100644 --- a/interactions/lewd/lewd_interactions.dm +++ b/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 From 0db7d039e8b470d04b6960e2358c80a5970b6cc6 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 14 Jun 2020 16:12:26 -0400 Subject: [PATCH 2/5] disables hans and fisto --- code/modules/mob/living/silicon/robot/robot.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index cb3760c6..49614d61 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -216,9 +216,9 @@ "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) + //"Handy Fisto" = /obj/item/robot_module/sexy_handy, \ + //"Fisto" = /obj/item/robot_module/fisto_protectron) if(!CONFIG_GET(flag/disable_peaceborg)) modulelist["Peacekeeper"] = /obj/item/robot_module/peacekeeper if(!CONFIG_GET(flag/disable_secborg)) From ea6e094ed58e5441e9c3bd3fb8e2f4136f3e7d1b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 15 Jun 2020 18:46:43 -0400 Subject: [PATCH 3/5] Removes funclaws entirely --- _maps/map_files/PossumMap/PossumParadise.dmm | 2 +- .../hostile/deathclaw/funclaw.dm | 138 ------------------ tgstation.dme | 1 - 3 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm diff --git a/_maps/map_files/PossumMap/PossumParadise.dmm b/_maps/map_files/PossumMap/PossumParadise.dmm index 3aab6e7e..7e000381 100644 --- a/_maps/map_files/PossumMap/PossumParadise.dmm +++ b/_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) diff --git a/code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm b/code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm deleted file mode 100644 index 52feff56..00000000 --- a/code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm +++ /dev/null @@ -1,138 +0,0 @@ -#define CUM_TARGET_THROAT_FUNCLAW "throat" -#define CUM_TARGET_VAGINA_FUNCLAW "vagina" -#define CUM_TARGET_ANUS_FUNCLAW "anus" - -/mob/living/simple_animal/hostile/deathclaw/funclaw - name = "Deathclaw" - desc = "A massive, reptilian creature with powerful muscles, razor-sharp claws, and aggression to match. This one seems to have a strange look in its eyes.." - var/pound_cooldown = 0 - var/chosen_hole - -/mob/living/simple_animal/hostile/deathclaw/funclaw/AttackingTarget() - var/mob/living/M = target - if(!ishuman(M) || M.health > 60) - ..() - return - - if(get_dist(src, M) > 0) - a_intent = INTENT_GRAB - grab_state = GRAB_NECK - - start_pulling(M, 1) - M.grabbedby(src) - M.drop_all_held_items() - M.stop_pulling() - - else if(get_dist(src, M) == 0) - if(refactory_period > 0) - ..() - return - - if(pound_cooldown < world.time) - chosen_hole = null - while (chosen_hole == null) - pickNewHole(M) - pound_cooldown = world.time + 2000 - - if(M.client && M.client.prefs) - if(M.client.prefs.wasteland_toggles & VERB_CONSENT) - pound(M) - sleep(rand(1, 3)) - pound(M) - sleep(rand(1, 3)) - pound(M) - else - ..() - -/mob/living/simple_animal/hostile/deathclaw/funclaw/proc/pickNewHole(mob/living/M) - switch(rand(2)) - if(0) - chosen_hole = CUM_TARGET_ANUS_FUNCLAW - if(1) - if(M.has_vagina()) - chosen_hole = CUM_TARGET_VAGINA_FUNCLAW - if(2) - chosen_hole = CUM_TARGET_THROAT_FUNCLAW - -/mob/living/simple_animal/hostile/deathclaw/funclaw/proc/pound(mob/living/M) - if(refactory_period > 0) - return - - switch(chosen_hole) - if(CUM_TARGET_ANUS_FUNCLAW) - if(tearSlot(M, SLOT_WEAR_SUIT)) - return - if(tearSlot(M, SLOT_W_UNIFORM)) - return - do_anal(M) - - if(CUM_TARGET_VAGINA_FUNCLAW) - if(tearSlot(M, SLOT_WEAR_SUIT)) - return - if(tearSlot(M, SLOT_W_UNIFORM)) - return - do_vaginal(M) - - if(CUM_TARGET_THROAT_FUNCLAW) - if(tearSlot(M, SLOT_HEAD)) - return - if(tearSlot(M, SLOT_WEAR_MASK)) - return - do_throatfuck(M) - -/mob/living/simple_animal/hostile/deathclaw/funclaw/cum(mob/living/M) - - if(refactory_period > 0) - return - - var/message - - if(!istype(M)) - chosen_hole = null - - switch(chosen_hole) - if(CUM_TARGET_THROAT_FUNCLAW) - if(M.has_mouth() && M.mouth_is_free()) - message = "shoves their fat reptillian cock deep down \the [M]'s throat and cums." - M.reagents.add_reagent("cum", rand(9,15)) - else - message = "cums on \the [M]'s face." - if(CUM_TARGET_VAGINA_FUNCLAW) - if(M.is_bottomless() && M.has_vagina()) - message = "rams its meaty cock into \the [M]'s pussy and fills it with sperm." - M.reagents.add_reagent("cum", rand(8,12)) - else - message = "cums on \the [M]'s belly." - if(CUM_TARGET_ANUS_FUNCLAW) - if(M.is_bottomless() && M.has_anus()) - message = "hilts its knot into \the [M]'s ass and floods it with Deathclaw jizz." - M.reagents.add_reagent("cum", rand(8,12)) - else - message = "cums on \the [M]'s backside." - else - message = "cums on the floor!" - - playsound(loc, "honk/sound/interactions/clawcum[rand(1, 2)].ogg", 70, 1, -1) - visible_message("\The [src] [message]") - shake_camera(M, 3, 1) - set_is_fucking(null ,null) - - refactory_period = 5 - lust = 5 - lust_tolerance += 50 - - sleep(20) - playsound(loc, "honk/sound/interactions/slap.ogg", 70, 1, -1) - visible_message("\The [src] slaps \the [M] right on the ass!", \ - "\The [src] slaps \the [M] right on the ass!", null, COMBAT_MESSAGE_RANGE) - -/mob/living/simple_animal/hostile/deathclaw/funclaw/proc/tearSlot(mob/living/M, slot) - var/obj/item/W = M.get_item_by_slot(slot) - if(W) - M.dropItemToGround(W) - playsound(loc, "sound/items/poster_ripped.ogg", 70, 1, -1) - visible_message("\The [src] tears off \the [M]'s clothes!", \ - "\The [src] tears off \the [M]'s clothes!", null, COMBAT_MESSAGE_RANGE) - return TRUE - return FALSE - diff --git a/tgstation.dme b/tgstation.dme index 3119412e..9ad125b9 100644 --- a/tgstation.dme +++ b/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" From 202753beee19b4345af3e1053ae97ce4ea2c5c54 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 16 Jun 2020 20:45:50 -0400 Subject: [PATCH 4/5] removes hans and fisto entirely --- .../modules/mob/living/silicon/robot/robot.dm | 2 -- .../mob/living/silicon/robot/robot_modules.dm | 31 ------------------- 2 files changed, 33 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 49614d61..8b9ab658 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -217,8 +217,6 @@ "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) if(!CONFIG_GET(flag/disable_peaceborg)) modulelist["Peacekeeper"] = /obj/item/robot_module/peacekeeper if(!CONFIG_GET(flag/disable_secborg)) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 26547caf..fbf30e35 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/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" From 40185f26c7806365c34c8fc1d3e5d4d328b466a7 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 16 Jun 2020 20:49:41 -0400 Subject: [PATCH 5/5] oops, forgot this bit --- code/modules/mob/living/silicon/robot/robot.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 8b9ab658..d8ea65aa 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -799,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)