Merge pull request #804 from quotefox/sexhud

New HTML arousal hud, with contextal options, plus new lewd features.
This commit is contained in:
QuoteFox
2021-01-02 14:34:31 +00:00
committed by GitHub
16 changed files with 477 additions and 36 deletions
+1 -3
View File
@@ -44,6 +44,7 @@
var/rad_insulation = RAD_NO_INSULATION
var/icon/blood_splatter_icon
var/icon/cum_splatter_icon
var/list/fingerprints
var/list/fingerprintshidden
var/list/blood_DNA
@@ -514,9 +515,6 @@
/atom/proc/wash_cream()
return TRUE
/atom/proc/wash_cum()
return TRUE
/atom/proc/isinspace()
if(isspaceturf(get_turf(src)))
return TRUE
+1
View File
@@ -90,6 +90,7 @@
target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
target.wash_cream()
target.wash_cum()
return
@@ -378,6 +378,7 @@
/obj/machinery/shower/proc/wash_obj(obj/O)
. = SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
. = O.clean_blood()
. = O.wash_cum()
O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
if(isitem(O))
var/obj/item/I = O
@@ -581,6 +582,7 @@
H.lip_style = null //Washes off lipstick
H.lip_color = initial(H.lip_color)
H.wash_cream()
H.wash_cum()
H.regenerate_icons()
user.drowsyness = max(user.drowsyness - rand(2,3), 0) //Washing your face wakes you up if you're falling asleep
else
@@ -652,6 +654,7 @@
busy = FALSE
SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
O.clean_blood()
O.wash_cum()
O.acid_level = 0
create_reagents(5)
reagents.add_reagent(dispensedreagent, 5)