Skip to content

Commit 3b8764c

Browse files
lavillastrangiatoLa Villa StrangiatoNPC1314
authored
God can't help me now (#1177)
* cleanups * deletes zape forever * some wording changes? * help * pronounce * i guess i'll add those back for now --------- Co-authored-by: La Villa Strangiato <mangodeity@gmail.com~> Co-authored-by: NPC1314 <110836368+NPC1314@users.noreply.github.com>
1 parent ff7e37d commit 3b8764c

File tree

2 files changed

+16
-131
lines changed

2 files changed

+16
-131
lines changed

‎code/datums/sexcon.dm

Lines changed: 16 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@
5353
return FALSE
5454
if(get_playerquality(client.ckey) <= -10)
5555
return FALSE
56-
// if(!client.whitelisted())
57-
// if(!client.patreonlevel())
58-
// can_do_sex = 0
59-
// return can_do_sex
6056
if(client.blacklisted())
6157
can_do_sex = 0
6258
return can_do_sex
@@ -81,7 +77,7 @@
8177
if(G.limb_grabbed == chest)
8278
if(G.grabbee == user)
8379
if(G.sublimb_grabbed == BODY_ZONE_PRECISE_GROIN)
84-
var/yea = list("fap")
80+
var/yea = list("pleasure self")
8581
var/td = input(user, "pleasures","") as null|anything in yea
8682
if(td == "fap")
8783
sexcon.begin_fapping(G, user)
@@ -112,11 +108,11 @@
112108
if(user.gender == MALE)
113109
if(gender == FEMALE)
114110
if(get_location_accessible(src, BODY_ZONE_CHEST))
115-
what2do += "use chest"
111+
what2do += "taff chest"
116112
if(user.gender == MALE)
117113
if(ourgroin && theirgroin)
118-
what2do += "love"
119-
what2do += "zodomy"
114+
what2do += "taff the front"
115+
what2do += "taff the back"
120116
if(user.gender == FEMALE)
121117
if(ourgroin && theirgroin)
122118
if(!user.lying && src.lying)
@@ -141,9 +137,9 @@
141137
user.sexcon.begin_mouthride(src)
142138
if("use chest")
143139
user.sexcon.begin_titfuck(src)
144-
if("zodomy")
140+
if("taff back")
145141
user.sexcon.begin_assfuck(src)
146-
if("love")
142+
if("taff front")
147143
user.sexcon.begin_fuck(src)
148144
if("service")
149145
if(G)
@@ -272,7 +268,7 @@
272268
if(user.cmode)
273269
user.emote("embed", forced = TRUE)
274270
playsound(owner, list('sound/misc/mat/insert (1).ogg','sound/misc/mat/insert (2).ogg'), 20, TRUE, ignore_walls = FALSE)
275-
owner.visible_message("<span class='[!user.cmode ? "love" : "warning"]'>[owner] zodomizes [user].</span>")
271+
owner.visible_message("<span class='[!user.cmode ? "love" : "warning"]'>[owner] taffs [user] from behind.</span>")
276272
START_PROCESSING(SSsex, user.sexcon)
277273
START_PROCESSING(SSsex, src)
278274

@@ -656,21 +652,7 @@
656652
return TRUE
657653

658654
/datum/sex_controller/proc/can_change_dir()
659-
if(fucking)
660-
return FALSE
661-
if(inass)
662-
return FALSE
663-
if(inpussy)
664-
return FALSE
665-
if(ontits)
666-
return FALSE
667-
if(inmouth)
668-
return FALSE
669-
if(weeating)
670-
return FALSE
671-
if(riding)
672-
return FALSE
673-
if(fapping && fapping.grabbee != owner)
655+
if(fucking || inass || inpussy || ontits || inmouth || weeating || riding || (fapping && fapping.grabbee != owner))
674656
return FALSE
675657
return TRUE
676658

@@ -757,9 +739,6 @@
757739
if(prob(33))
758740
fucking.visible_message("<span class='[!owner.cmode ? "love" : "warning"]'>[fucking] rides [owner].</span>")
759741
var/usedsource = "insidepussy"
760-
if(D.owner.stat == DEAD)
761-
usedsource = "fuckcorpse"
762-
stop_fucking()
763742
D.adjust_horny(4, "pussyfucked")
764743
if(adjust_horny(3, usedsource))
765744
D.adjust_horny(50, "pussyfucked")
@@ -773,12 +752,8 @@
773752
if(prob(33))
774753
fucking.visible_message("<span class='[!D.owner.cmode ? "love" : "warning"]'>[owner] taffs [fucking].</span>")
775754
var/usedsource = "insidepussy"
776-
if(D.owner.stat == DEAD)
777-
usedsource = "fuckcorpse"
778-
stop_fucking()
779-
else
780-
if(D.owner.stat != CONSCIOUS)
781-
usedsource = "sleepingbeauty"
755+
if(D.owner.stat != CONSCIOUS)
756+
usedsource = "sleepingbeauty"
782757
if(D.owner.cmode)
783758
D.owner.flash_fullscreen("redflash1")
784759
D.adjust_horny(4, "pussyfucked")
@@ -793,12 +768,9 @@
793768
if(fucking)
794769
playsound(owner, 'sound/misc/mat/segso.ogg', 50, TRUE, -2, ignore_walls = FALSE)
795770
if(prob(33))
796-
fucking.visible_message("<span class='[!D.owner.cmode ? "love" : "warning"]'>[owner] zodomizes [fucking].</span>")
771+
fucking.visible_message("<span class='[!D.owner.cmode ? "love" : "warning"]'>[owner] taffs [fucking] from behind.</span>")
797772
// D.owner.Immobilize(10)
798773
var/usedsource = "insideass"
799-
if(D.owner.stat == DEAD)
800-
usedsource = "fuckcorpse"
801-
stop_fucking()
802774
if(D.owner.cmode)
803775
D.owner.flash_fullscreen("redflash1")
804776
if(D.owner.cmode)
@@ -817,11 +789,8 @@
817789
if(fucking)
818790
playsound(owner, 'sound/misc/mat/fap.ogg', 30, TRUE, -2, ignore_walls = FALSE)
819791
if(prob(33))
820-
fucking.visible_message("<span class='[!D.owner.cmode ? "love" : "warning"]'>[owner] uses [fucking]'s chest.</span>")
792+
fucking.visible_message("<span class='[!D.owner.cmode ? "love" : "warning"]'>[owner] taffs [fucking]'s chest.</span>")
821793
var/usedsource = "ontits"
822-
if(D.owner.stat == DEAD)
823-
usedsource = "fuckcorpse"
824-
stop_fucking()
825794
if(adjust_horny(2, usedsource))
826795
stop_fucking()
827796
// D.owner.Immobilize(10)
@@ -838,12 +807,9 @@
838807
else
839808
playsound(fucking, pick('sound/misc/mat/guymouth (1).ogg','sound/misc/mat/guymouth (2).ogg','sound/misc/mat/guymouth (3).ogg','sound/misc/mat/guymouth (4).ogg','sound/misc/mat/guymouth (5).ogg'), 20, TRUE, ignore_walls = FALSE)
840809
if(prob(33))
841-
fucking.visible_message("<span class='[!D.owner.cmode ? "love" : "warning"]'>[owner] feeds [fucking].</span>")
810+
fucking.visible_message("<span class='[!D.owner.cmode ? "love" : "warning"]'>[owner] thrusts in [fucking]'s mouth.</span>")
842811
// D.owner.Immobilize(10)
843812
var/usedsource = "fuckmouth"
844-
if(D.owner.stat == DEAD)
845-
usedsource = "fuckcorpse"
846-
stop_fucking()
847813
if(adjust_horny(3, usedsource))
848814
stop_fucking()
849815
if(riding)
@@ -876,9 +842,9 @@
876842
playsound(eatingus, pick('sound/misc/mat/guymouth (1).ogg','sound/misc/mat/guymouth (2).ogg','sound/misc/mat/guymouth (3).ogg','sound/misc/mat/guymouth (4).ogg','sound/misc/mat/guymouth (5).ogg'), 100, TRUE, -2, ignore_walls = FALSE)
877843
if(prob(33))
878844
if(owner.gender == MALE)
879-
owner.visible_message("<span class='[!owner.cmode ? "love" : "warning"]'>[eatingus] sucks [owner].</span>")
845+
owner.visible_message("<span class='[!owner.cmode ? "love" : "warning"]'>[eatingus] sucks off [owner].</span>")
880846
else
881-
owner.visible_message("<span class='[!owner.cmode ? "love" : "warning"]'>[eatingus] eats [owner].</span>")
847+
owner.visible_message("<span class='[!owner.cmode ? "love" : "warning"]'>[eatingus] eats out [owner].</span>")
882848
if(adjust_horny(3, "suckedoff"))
883849
stop_eating_us()
884850
if(fapping)
@@ -895,7 +861,7 @@
895861
if(fapping)
896862
playsound(owner, 'sound/misc/mat/fap.ogg', 30, TRUE, -2, ignore_walls = FALSE)
897863
if(prob(33))
898-
owner.visible_message("<span class='[!owner.cmode ? "love" : "warning"]'>[owner] faps.</span>")
864+
owner.visible_message("<span class='[!owner.cmode ? "love" : "warning"]'>[owner] pleasures themself.</span>")
899865
if(adjust_horny(1, "fapself"))
900866
stop_fapping()
901867
else
@@ -960,67 +926,6 @@
960926

961927
/datum/sex_controller/female/handle_sex()
962928
. = ..()
963-
/* if(world.time > last_silence_check + 10 SECONDS)
964-
if(iscarbon(owner))
965-
var/mob/living/carbon/C = owner
966-
if(C.silent || !C.canspeak())
967-
if(curplaying)
968-
curplaying = null
969-
if(femmoans)
970-
femmoans.stop()
971-
return
972-
if(owner.stat)
973-
if(curplaying)
974-
curplaying = null
975-
if(femmoans)
976-
femmoans.stop()
977-
if(draining)
978-
if(curplaying)
979-
curplaying = null
980-
if(femmoans)
981-
femmoans.stop()
982-
/ else
983-
if(owner.r_intent == SUBMIT_INTENT && owner.stat == CONSCIOUS)
984-
if(horny > 200)
985-
if(curplaying != "hvy")
986-
if(femmoans)
987-
femmoans.stop()
988-
if(prob(50))
989-
femmoans = new /datum/looping_sound/femhornyhvy(list(owner), FALSE)
990-
else
991-
femmoans = new /datum/looping_sound/femhornyhvyalt(list(owner), FALSE)
992-
femmoans.start()
993-
curplaying = "hvy"
994-
else if(horny > 150)
995-
if(curplaying != "med")
996-
if(femmoans)
997-
femmoans.stop()
998-
if(prob(50))
999-
femmoans = new /datum/looping_sound/femhornymed(list(owner), FALSE)
1000-
else
1001-
femmoans = new /datum/looping_sound/femhornymedalt(list(owner), FALSE)
1002-
femmoans.start()
1003-
curplaying = "med"
1004-
else if(horny > 50)
1005-
if(curplaying != "lite")
1006-
if(femmoans)
1007-
femmoans.stop()
1008-
if(prob(50))
1009-
femmoans = new /datum/looping_sound/femhornylite(list(owner), FALSE)
1010-
else
1011-
femmoans = new /datum/looping_sound/femhornylitealt(list(owner), FALSE)
1012-
femmoans.start()
1013-
curplaying = "lite"
1014-
else
1015-
if(curplaying)
1016-
curplaying = null
1017-
if(femmoans)
1018-
femmoans.stop()
1019-
else
1020-
if(curplaying)
1021-
curplaying = null
1022-
if(femmoans)
1023-
femmoans.stop()*/
1024929

1025930
/datum/sex_controller/proc/adjust_horny(amt, source)
1026931
if(!amt)
@@ -1086,9 +991,6 @@
1086991
C.add_stress(/datum/stressevent/cumok)
1087992
else
1088993
C.add_stress(/datum/stressevent/cumbad)
1089-
if("fuckcorpse")
1090-
C.add_stress(/datum/stressevent/cumcorpse)
1091-
C.freak_out()
1092994

1093995
/datum/sex_controller/male/cum(source)
1094996
..()
@@ -1115,18 +1017,6 @@
11151017
playsound(owner, pick('sound/misc/mat/mouthend (1).ogg','sound/misc/mat/mouthend (2).ogg'), 100, FALSE, ignore_walls = FALSE)
11161018
owner.visible_message("<span class='notice'>[owner] feeds [fucking]!</span>")
11171019
add_cum_floor(get_turf(fucking))
1118-
if(fucking && fucking.sexcon.weeating == owner)
1119-
if(fucking.cmode)
1120-
if(ishuman(owner))
1121-
var/mob/living/carbon/human/H = owner
1122-
var/wuzantag
1123-
if(H.mind)
1124-
if(H.mind.antag_datums)
1125-
if(H.mind.antag_datums.len)
1126-
wuzantag = TRUE
1127-
if(!wuzantag)
1128-
adjust_playerquality(-2, H.ckey, reason="Raped as a non villain.")
1129-
addtimer(CALLBACK(eatingus, TYPE_PROC_REF(/mob, emote), "gag"), rand(10,20))
11301020
if("insideass")
11311021
if(owner.has_flaw(/datum/charflaw/addiction/lovefiend))
11321022
owner.sate_addiction()

‎code/datums/stress/negative_events.dm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,6 @@
169169
stressadd = 5
170170
desc = "<span class='red'>I was violated.</span>"
171171

172-
/datum/stressevent/cumcorpse
173-
timer = 1 MINUTES
174-
stressadd = 20
175-
desc = "<span class='red'>What have I done?</span>"
176-
177172
/datum/stressevent/blueb
178173
timer = 1 MINUTES
179174
stressadd = 2

0 commit comments

Comments
 (0)