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
@@ -719,9 +719,6 @@
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_large"))
creamed = FALSE
/mob/living/carbon/human/wash_cum()
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_normal"))
cut_overlay(mutable_appearance('hyperstation/icons/effects/cumoverlay.dmi', "cum_large"))
//Turns a mob black, flashes a skeleton overlay
//Just like a cartoon!
+4 -2
View File
@@ -59,7 +59,9 @@
var/custom_body_size = 100
var/breedable = 0
var/impregchance = 0
//h13 noncon settings
var/Noncon = 0
var/ERP = 0
var/list/mob_biotypes = list(MOB_ORGANIC)
var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
@@ -109,7 +111,7 @@
var/last_words //used for database logging
var/list/obj/effect/proc_holder/abilities = list()
var/can_be_held = FALSE
var/radiation = 0 //If the mob is irradiated.
@@ -380,7 +380,7 @@
M.IgniteMob()
else
M.adjustToxLoss(1, 0)
M.adjustFireLoss(1, 0)
M.adjustFireLoss(1, 0)
if(data >= 60) // 30 units, 135 seconds
if(iscultist(M, FALSE, TRUE) || is_servant_of_ratvar(M, FALSE, TRUE))
if(iscultist(M))
@@ -1206,12 +1206,14 @@
O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
O.clean_blood()
O.wash_cum()
/datum/reagent/space_cleaner/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 1)
T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
T.clean_blood()
T.wash_cum()
for(var/obj/effect/decal/cleanable/C in T)
qdel(C)
@@ -1254,6 +1256,7 @@
if(H.shoes.clean_blood())
H.update_inv_shoes()
H.wash_cream()
H.wash_cum()
SEND_SIGNAL(M, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
M.clean_blood()
@@ -2243,7 +2246,7 @@
color = "#5EFF3B" //RGB: 94, 255, 59
race = /datum/species/insect
mutationtext = "<span class='danger'>The pain subsides. You feel... oddly attracted to light.</span>"
/datum/reagent/mutationtoxin/ipc
name = "IPC Mutation Toxin"
description = "A robotic toxin." //NANOMACHINES SON.
@@ -79,6 +79,7 @@
reagents.add_reagent(r_id, amount * 0.3)
M.adjust_fire_stacks(minus_plus * amount)
M.wash_cream()
M.wash_cum()
return TRUE
return ..()