From 81ba8ff40b33d07ceba1596e2253f715a5266c67 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Tue, 19 Mar 2019 23:55:37 -0400 Subject: [PATCH 1/5] Update vent_clog.dm Works locally, like this. Fuck if I know. --- code/modules/events/vent_clog.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 3945a12a40..02d7596678 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -118,6 +118,9 @@ foam.start() CHECK_TICK +/datum/round_event/vent_clog/male/announce() + priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + /datum/round_event/vent_clog/male/start() for(var/obj/machinery/atmospherics/components/unary/vent in vents) if(vent && vent.loc) @@ -130,6 +133,9 @@ foam.start() CHECK_TICK +/datum/round_event/vent_clog/female/announce() + priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + /datum/round_event/vent_clog/female/start() for(var/obj/machinery/atmospherics/components/unary/vent in vents) if(vent && vent.loc) From 0b459ad06ffe1bef25c8ada7e24323004a3c42fc Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 20 Mar 2019 00:35:42 -0400 Subject: [PATCH 2/5] Fixes 200,000 runtimes during scrubber event thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz thanks kevinz --- .../code/modules/reagents/reagents/cit_reagents.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm index e5d2b49b37..1390417a5c 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -37,10 +37,17 @@ ..() dir = pick(1,2,4,8) -/datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume) +/* /datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume) if(!isspaceturf(T)) var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/semen(T) - reagentdecal.reagents.add_reagent("semen", reac_volume) + reagentdecal.reagents.add_reagent("semen", reac_volume) */ + +/datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume) + if(!isspaceturf(T)) + var/obj/effect/decal/cleanable/semen/S = locate() in T.contents + if(!S) + S = new/obj/effect/decal/cleanable/semen(T) + S.reagents.add_reagent("semen", reac_volume) /datum/reagent/consumable/femcum name = "Female Ejaculate" From f7807ceb737618fd38e61ba3ac9e3fcbc58fbe02 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 20 Mar 2019 01:14:43 -0400 Subject: [PATCH 3/5] Hmm... --- .../code/modules/reagents/reagents/cit_reagents.dm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm index 1390417a5c..30bf43bfea 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -40,14 +40,8 @@ /* /datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume) if(!isspaceturf(T)) var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/semen(T) - reagentdecal.reagents.add_reagent("semen", reac_volume) */ - -/datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume) - if(!isspaceturf(T)) - var/obj/effect/decal/cleanable/semen/S = locate() in T.contents - if(!S) - S = new/obj/effect/decal/cleanable/semen(T) - S.reagents.add_reagent("semen", reac_volume) + reagentdecal.reagents.add_reagent("semen", reac_volume) +*/ /datum/reagent/consumable/femcum name = "Female Ejaculate" From 793a8c5c44ad1b2aeccde91219ff1c05cf8bfef9 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 20 Mar 2019 01:42:18 -0400 Subject: [PATCH 4/5] QoL naming changes It's MY CODE NOW, TRILBY. YOU CAN'ST STOPP ME --- code/modules/events/vent_clog.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 02d7596678..f84fe2edb0 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -75,7 +75,7 @@ reagentsAmount = 250 /datum/round_event_control/vent_clog/beer - name = "Foamy beer stationwide" + name = "Clogged Vents: Beer" typepath = /datum/round_event/vent_clog/beer max_occurrences = 0 @@ -83,12 +83,12 @@ reagentsAmount = 100 /datum/round_event_control/vent_clog/plasma_decon - name = "Plasma decontamination" + name = "Anti-Plasma Flood" typepath = /datum/round_event/vent_clog/plasma_decon max_occurrences = 0 /datum/round_event_control/vent_clog/female - name = "FemCum stationwide" + name = "Clogged Vents; Girlcum" typepath = /datum/round_event/vent_clog/female max_occurrences = 0 @@ -96,7 +96,7 @@ reagentsAmount = 100 /datum/round_event_control/vent_clog/male - name = "Semen stationwide" + name = "Clogged Vents: Semen" typepath = /datum/round_event/vent_clog/male max_occurrences = 0 From ee9368cadb4e7ba36333a3099a1589aea2de5d61 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 20 Mar 2019 20:08:07 -0400 Subject: [PATCH 5/5] why does ghomme help us is it because he feels bad for us real deepthink --- code/modules/events/vent_clog.dm | 4 ++-- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- .../code/modules/reagents/reagents/cit_reagents.dm | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index f84fe2edb0..86ede7f255 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -119,7 +119,7 @@ CHECK_TICK /datum/round_event/vent_clog/male/announce() - priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejaculation of contents may occur.", "Atmospherics alert") /datum/round_event/vent_clog/male/start() for(var/obj/machinery/atmospherics/components/unary/vent in vents) @@ -134,7 +134,7 @@ CHECK_TICK /datum/round_event/vent_clog/female/announce() - priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") + priority_announce("The scrubbers network is experiencing a backpressure squirt. Some ejection of contents may occur.", "Atmospherics alert") /datum/round_event/vent_clog/female/start() for(var/obj/machinery/atmospherics/components/unary/vent in vents) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 4b4f118a9c..15a2ef1cba 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1251,7 +1251,7 @@ L.remove_trait(TRAIT_SLEEPIMMUNE, id) ..() -/datum/reagent/stimulum/on_mob_life(mob/living/carbon/M) +/datum/reagent/stimulum/on_mob_life(mob/living/carbon/M) M.adjustStaminaLoss(-2*REM, 0) current_cycle++ holder.remove_reagent(id, 0.99) //Gives time for the next tick of life(). diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm index 30bf43bfea..ae77fbcfc0 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -37,12 +37,6 @@ ..() dir = pick(1,2,4,8) -/* /datum/reagent/consumable/semen/reaction_turf(turf/T, reac_volume) - if(!isspaceturf(T)) - var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/semen(T) - reagentdecal.reagents.add_reagent("semen", reac_volume) -*/ - /datum/reagent/consumable/femcum name = "Female Ejaculate" id = "femcum"