From 49a15b027afd9b19edc0e9cba864c5a065fbeff8 Mon Sep 17 00:00:00 2001
From: RachelDoe <81965332+RachelDoe@users.noreply.github.com>
Date: Mon, 28 Jun 2021 03:50:50 +0200
Subject: [PATCH 1/2] Prevent Portallights from being deepfried?
Tested and confirmed working. This edit will prevent portallights from being deepfried.
I will leave the decision to either merge or reject this PR to the admin looking into this. This literally took me like five minutes so don't feel bad if you need to kick this if its not aligning to the vision of the server.
---
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 27ee5481..6bf7fb49 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -46,7 +46,8 @@ God bless America.
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/food/condiment,
/obj/item/storage/part_replacer,
- /obj/item/his_grace))
+ /obj/item/his_grace,
+ /obj/item/portallight))
var/datum/looping_sound/deep_fryer/fry_loop
/obj/machinery/deepfryer/Initialize()
From 714c7377354668a754ba48748088b9bb83bfc3c3 Mon Sep 17 00:00:00 2001
From: RachelDoe <81965332+RachelDoe@users.noreply.github.com>
Date: Mon, 28 Jun 2021 05:49:51 +0200
Subject: [PATCH 2/2] Portal Panties make you cum + built in Qol
Test Description Please Ignore
---
hyperstation/code/obj/fleshlight.dm | 7 ++++++
.../code/modules/arousal/arousal.dm | 22 ++++++++++++-------
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/hyperstation/code/obj/fleshlight.dm b/hyperstation/code/obj/fleshlight.dm
index 7ba5421d..19aff71e 100644
--- a/hyperstation/code/obj/fleshlight.dm
+++ b/hyperstation/code/obj/fleshlight.dm
@@ -164,6 +164,13 @@
C.adjustArousalLoss(20)
M.adjustArousalLoss(20)
M.do_jitter_animation() //make your partner shake too!
+
+ if (M.getArousalLoss() >= 100 && ishuman(M) && prob(5))//Why not have a probability to cum when someone's getting nailed with max arousal?~
+ if(V.is_exposed()) //Oh yea, if vagina is not exposed, the climax will not cause a spill
+ M.mob_climax_outside(V, spillage = TRUE)
+ else
+ M.mob_climax_outside(V, spillage = FALSE)
+
if (C.getArousalLoss() >= 100 && ishuman(C) && C.has_dna())
var/mob/living/carbon/human/O = C
diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index 8c5bf255..beb5f8b9 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -284,7 +284,7 @@
setArousalLoss(min_arousal)
-/mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/G, mb_time = 30) //This is used for forced orgasms and other hands-free climaxes
+/mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/G, mb_time = 30, spillage = TRUE) //This is used for forced orgasms and other hands-free climaxes
var/total_fluids = 0
var/datum/reagents/fluid_source = null
var/unable_to_come = FALSE
@@ -310,12 +310,18 @@
"You feel yourself about to orgasm.", \
"You feel yourself about to orgasm.")
if(do_after(src, mb_time, target = src))
- if(total_fluids > 5)
- fluid_source.reaction(src.loc, TOUCH, 1, 0)
- fluid_source.clear_reagents()
- src.visible_message("[src] orgasms[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""], using [p_their()] [G.name]!", \
- "You climax[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""] with your [G.name].", \
- "You climax using your [G.name].")
+ if(spillage)
+ if(total_fluids > 5)
+ fluid_source.reaction(src.loc, TOUCH, 1, 0)
+ fluid_source.clear_reagents()
+ src.visible_message("[src] orgasms[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""], with [p_their()] [G.name]!", \
+ "You climax[istype(src.loc, /turf/open/floor) ? ", spilling onto [src.loc]" : ""] with your [G.name].", \
+ "You climax using your [G.name].")
+ else //Else from spillage check, also note subtle text change
+ src.visible_message("[src] orgasms with [p_their()] [G.name]!", \
+ "You climax with your [G.name].", \
+ "You climax using your [G.name].")
+
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
if(G.can_climax)
setArousalLoss(min_arousal)
@@ -420,7 +426,7 @@
src.visible_message("[src] climaxes with someone, using [p_their()] [G.name]!", \
"You ejaculate with someone, using your [G.name].", \
"You have climaxed inside someone, using your [G.name].")
- to_chat(L, "You feel someone ejeculate inside you.")
+ to_chat(L, "You feel someone ejaculate inside you.")
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "orgasm", /datum/mood_event/orgasm)