diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 3945a12a40..86ede7f255 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 @@ -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 ejaculation 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 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) if(vent && vent.loc) 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 e5d2b49b37..ae77fbcfc0 100644 --- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm +++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm @@ -37,11 +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"