Largely finish up beach ruin

This commit is contained in:
Mark van Alphen
2019-03-31 00:20:27 +01:00
parent 45a066c7d1
commit ceceb9f3b3
12 changed files with 219 additions and 1554 deletions
@@ -632,3 +632,50 @@
description = "Ewwwwwwwww."
reagent_state = LIQUID
color = "#857400"
/datum/reagent/spraytan
name = "Spray Tan"
id = "spraytan"
description = "A substance applied to the skin to darken the skin."
color = "#FFC080" // rgb: 255, 196, 128 Bright orange
metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly. But this changes on an overdose
overdose_threshold = 11 //Slightly more than one un-nozzled spraybottle.
taste_message = "sour oranges"
/datum/reagent/spraytan/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(ishuman(M))
if(method == TOUCH)
var/mob/living/carbon/human/N = M
set_skin_color(N)
if(method == INGEST)
if(show_message)
to_chat(M, "<span class='notice'>That tasted horrible.</span>")
..()
/datum/reagent/spraytan/overdose_process(mob/living/M)
metabolization_rate = 1 * REAGENTS_METABOLISM
if(ishuman(M) && is_species(M, /datum/species/human))
var/mob/living/carbon/human/N = M
N.change_hair("Spiky")
N.change_facial_hair("Shaved")
N.change_hair_color("#000000")
N.change_facial_hair_color("#000000")
set_skin_color(N)
if(prob(7))
if(N.w_uniform)
M.visible_message(pick("<b>[M]</b>'s collar pops up without warning.</span>", "<b>[M]</b> flexes [M.p_their()] arms."))
else
M.visible_message("<b>[M]</b> flexes [M.p_their()] arms.")
if(prob(10))
M.say(pick("Shit was SO cash.", "You are everything bad in the world.", "What sports do you play, other than 'jack off to naked drawn Japanese people?'", "Dont be a stranger. Just hit me with your best shot.", "My name is John and I hate every single one of you."))
return list(0, STATUS_UPDATE_NONE)
/datum/reagent/spraytan/proc/set_skin_color(mob/living/carbon/human/H)
if(H.dna.species.bodyflags & HAS_SKIN_TONE)
H.change_skin_tone(-30)
if(H.dna.species.bodyflags & HAS_SKIN_COLOR) //take current alien color and darken it slightly
H.change_skin_color("#9B7653")
@@ -112,6 +112,13 @@
volume = 50
list_reagents = list("cleaner" = 50)
//spray tan
/obj/item/reagent_containers/spray/spraytan
name = "spray tan"
volume = 50
desc = "Gyaro brand spray tan. Do not spray near eyes or other orifices."
list_reagents = list("spraytan" = 50)
//pepperspray
/obj/item/reagent_containers/spray/pepper
name = "pepperspray"