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

Merge pull request #6094 from Citadel-Station-13/kevinz000-patch-1

Browse Source 
Increases arousal performance, bandaid patch
This commit is contained in:
LetterJay
2018-03-26 22:39:11 -05:00
committed by GitHub
parent c579d81f4c 2cd98340de
commit 0baeeb548d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/arousal.dm
+12 -9
View File
@@ -36,9 +36,9 @@
if(canbearoused && dna)
var/datum/species/S
S = dna.species
if(S && SSmobs.times_fired%36==2 && getArousalLoss() < max_arousal)//Totally stolen from breathing code. Do this every 36 ticks.
if(S && !(SSmobs.times_fired % 36) && getArousalLoss() < max_arousal)//Totally stolen from breathing code. Do this every 36 ticks.
adjustArousalLoss(arousal_rate * S.arousal_gain_rate)
if(dna.features["exhibitionist"])
if(dna.features["exhibitionist"] && client)
var/amt_nude = 0
if(is_chest_exposed() && (gender == FEMALE || getorganslot("breasts")))
amt_nude++
@@ -47,13 +47,16 @@
amt_nude++
if(getorganslot("vagina"))
amt_nude++
var/mob/living/M
var/watchers = 0
for(M in view(world.view, src))
if(M.client && !M.stat && !M.eye_blind && (locate(src) in viewers(world.view,M)))
watchers++
if(watchers && amt_nude)
adjustArousalLoss((amt_nude * watchers) + S.arousal_gain_rate)
if(amt_nude)
var/watchers = 0
for(var/mob/_M in view(world.view, src))
var/mob/living/M = _M
if(!istype(M))
continue
if(M.client && !M.stat && !M.eye_blind && (locate(src) in viewers(world.view,M)))
watchers++
if(watchers)
adjustArousalLoss((amt_nude * watchers) + S.arousal_gain_rate)
/mob/living/proc/getArousalLoss()