Sex spells #1057

Comicao1 · 2024-01-11T23:19:38Z

About The Pull Request

Adds sex spells and sex magician to the game. (BOUNTY)

Why It's Good For The Game

Adds more sex options!

A Port?

No.

Pre-Merge Checklist

You tested this on a local server.
This code did not runtime during testing.
You documented all of your changes.

Changelog

🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
wip: still being worked on
experiment: experimental
tgs: has something to do with tgs
expansion: expands on something
qol: quality of life content
/:cl:

ariaworld · 2024-01-13T00:07:29Z

Looks amazing, I wonder if it would be theoretically possible to make it so the genital spells don't clutter the screen? for example perhaps by making it so it's just a button that when pressed gives you a choice of genital to target and which action to take, and then puts the appropriate melee object spell in hand

Zap-zapper · 2024-01-13T16:00:17Z

Ideas: Expansion/Reduction of various bodyparts (not just penis), as well as general Shrinking or Growth of the whole body, for sizeplayish stuff. Maybe even total body morph on others, like the trait?

Also lust spell should be targeted, I feel, not aoe.

catrock31 · 2024-01-13T20:47:46Z

Ideas: Expansion/Reduction of various bodyparts (not just penis), as well as general Shrinking or Growth of the whole body, for sizeplayish stuff. Maybe even total body morph on others, like the trait?

Also lust spell should be targeted, I feel, not aoe.

This was my bounty I paid 80$ if you want to make a single target lust spell do that when it's added to the game

Zap-zapper · 2024-01-13T20:55:47Z

Ideas: Expansion/Reduction of various bodyparts (not just penis), as well as general Shrinking or Growth of the whole body, for sizeplayish stuff. Maybe even total body morph on others, like the trait?
Also lust spell should be targeted, I feel, not aoe.

This was my bounty I paid 80$ if you want to make a single target lust spell do that when it's added to the game

Oh, sure

Yawet330 · 2024-02-18T17:26:37Z

modular_splurt/code/modules/spell/spell_types/uncover.dm

+	do_sparks(4, FALSE, M.loc)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H?.client?.prefs?.magicalpref == "Yes")


why are you doing == "yes", you could just make magicalpref a true/false instead of ASK and have it follow standard antag esc... This is another setting we don't need, and one that yknow.

bad. coder. practice.

Yawet330 · 2024-02-18T17:26:53Z

modular_splurt/code/modules/spell/spell_types/uncover.dm

+				H.uncovered = 1
+			else
+				H.uncovered = 0
+			spawn(10 MINUTES)


spawn() moment

if you dont know what is wrong with using spawn() casually please go and read modern /tg/ documentation.

Yawet330 · 2024-02-18T17:27:56Z

modular_splurt/code/modules/spell/spell_types/penis_spells.dm

+		else
+			var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS)
+			P.modify_size(10)
+			spawn(15 MINUTES)


Yawet330 · 2024-02-18T17:28:17Z

modular_splurt/code/modules/spell/spell_types/groping.dm

+		else
+			var/datum/interaction/lewd/fingerass_self/FI = new
+			FI.do_action(is_being_groped, src, TRUE)
+			qdel(FI)


Yawet330 · 2024-02-18T17:28:39Z

modular_splurt/code/modules/spell/spell_types/eyes_of_lust.dm

+	var/datum/atom_hud/data/human/arousal/hud = GLOB.huds[DATA_HUD_AROUSAL]
+	hud.add_hud_to(src)
+	arousal_hud_update()
+	for(var/mob/living/carbon/human/H in view(7, src))


time to crash the server

dont do this

Yawet330 · 2024-02-18T17:29:10Z

modular_splurt/code/modules/spell/spell_types/aoe_lust.dm

+
+/obj/effect/proc_holder/spell/self/aoe_lust/cast(mob/living/carbon/human/user)
+	for(var/mob/living/carbon/human/HH in view(5, user))
+		if(HH?.client?.prefs?.magicalpref == "No")


if(!HH?.client?.prefs?.magicalpref)

(have magicalpref be TRUE OR FALSE and FALSE BY DEFAULT

this makes it sure that all statements using the above code will return TRUE if MAGICALPREF is FALSE.

Neater way of doing what you're doing.

Also just better coder practice as you're no longer doing an is equals but rather is true or false

Yawet330 · 2024-02-18T17:33:03Z

modular_splurt/code/modules/client/preferences.dm

@@ -6,6 +6,7 @@
 /datum/preferences
 	max_save_slots = DEFAULT_SAVE_SLOTS
 	var/unholypref = "No" //Goin 2 hell fo dis one
+	var/magicalpref = "No" //Goin 2 hell fo dis one


var/magicalpref = FALSE

Yawet330 · 2024-02-18T17:33:30Z

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

@@ -1297,6 +1297,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	return

 /datum/species/proc/can_equip(obj/item/I, slot, disable_warning, mob/living/carbon/human/H, bypass_equip_delay_self = FALSE, clothing_check = FALSE, list/return_warning)
+
+	if(H.uncovered)


nonmodular lol

Yawet330 · 2024-02-18T17:33:37Z

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

+
+	if(H.uncovered)
+		if(return_warning)
+			return_warning[1] = "<span class='warning'>I've been wicked!</span>"


what the hell

Yawet330 · 2024-02-18T17:33:57Z

code/_rendering/atom_huds/atom_hud.dm

@@ -34,6 +34,7 @@ GLOBAL_LIST_INIT(huds, list(
 	ANTAG_HUD_GANGSTER = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_SLAVER = new/datum/atom_hud/antag(),
 	DATA_HUD_ANTAGTARGET = new/datum/atom_hud/data/human/antagtarget(),
+	DATA_HUD_AROUSAL = new/datum/atom_hud/data/human/arousal(),


extra layer being created and used for literally one effect. Move this to cult/magic layers.

Yawet330 · 2024-02-18T17:36:29Z

also I deliberately didn't use the multi-comment review system so you have to manually mark each one as resolved.

Love you BBG.

Yawet330

horrible, downright stanky code

this is stuff you learn not to do on the modern /tg/ and coderbus documentation and wikiguides. This is stuff you can google search about and it'll lead you to byond forums showing examples of why not to do this.

Overall though the base concept looks good? There's clearly been effort put in. Just needs upgrading to better code standards.

ariaworld · 2024-03-11T22:11:09Z

Hello, just a few things:
-The sex spell effects should be on the same layer of cult effects/magic, to avoid making an extra one just for these
-There's a few things that can be modularized like the "I've been wicked" effect
-For magical pref, use the same logic used for stomp-pref to avoid "Yes"/"No" and instead TRUE/FALSE
-also please instead of Use span_warning("Text")
Make sure to test your code and edit the changelog, as well as follow Yawet's comments, as there's alot of rushed things that could do damage

Comicao1 added 11 commits June 15, 2023 11:46

Commit so i can change branch

868d3c1

Merge remote-tracking branch 'upstream/master' into sex-spells

05dbb90

aye

325e7ac

Merge remote-tracking branch 'upstream/master' into sex-spells

4adcdcf

aye

407f32d

aye

9198a25

a

c46efb6

hehehehaw

bc6a7da

Merge remote-tracking branch 'upstream/master' into sex-spells

7c4d40b

Updating to master

86286a9

Brug

06a9764

Yawet330 reviewed Feb 18, 2024

View reviewed changes

Yawet330 suggested changes Feb 18, 2024

View reviewed changes

Done

96cf674

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sex spells #1057

Sex spells #1057

Comicao1 commented Jan 11, 2024

ariaworld commented Jan 13, 2024

Zap-zapper commented Jan 13, 2024 •

edited

Loading

catrock31 commented Jan 13, 2024

Zap-zapper commented Jan 13, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024 •

edited

Loading

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 Feb 18, 2024

Yawet330 commented Feb 18, 2024

Yawet330 left a comment

ariaworld commented Mar 11, 2024

Sex spells #1057

Are you sure you want to change the base?

Sex spells #1057

Conversation

Comicao1 commented Jan 11, 2024

About The Pull Request

Why It's Good For The Game

A Port?

Pre-Merge Checklist

Changelog

ariaworld commented Jan 13, 2024

Zap-zapper commented Jan 13, 2024 • edited Loading

catrock31 commented Jan 13, 2024

Zap-zapper commented Jan 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Yawet330 Feb 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Yawet330 commented Feb 18, 2024

Yawet330 left a comment

Choose a reason for hiding this comment

ariaworld commented Mar 11, 2024

Zap-zapper commented Jan 13, 2024 •

edited

Loading

Yawet330 Feb 18, 2024 •

edited

Loading