shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8149 from Ragolution/fixes-the-cum

Browse Source 
Fixes Semen Vent Foam
This commit is contained in:
deathride58
2019-03-31 21:25:28 -04:00
committed by GitHub
parent bada92764b ee9368cadb
commit 684d6cf074
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/events/vent_clog.dm
View File

@@ -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)

2
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -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().