mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
This commit is contained in:
@@ -492,6 +492,25 @@
|
||||
M.adjustFireLoss(-1)
|
||||
..()
|
||||
|
||||
/datum/reagent/consumable/onion
|
||||
name = "Concentrated Onion Juice"
|
||||
id = "onionjuice"
|
||||
description = "A strong tasting substance that can induce partial blindness."
|
||||
color = "#c0c9a0"
|
||||
taste_message = "bitterness"
|
||||
|
||||
/datum/reagent/consumable/onion/reaction_mob(mob/living/M, method = TOUCH, volume)
|
||||
if(method == TOUCH)
|
||||
if(!M.is_mouth_covered() && !M.is_eyes_covered())
|
||||
if(!M.get_organ_slot("eyes")) //can't blind somebody with no eyes
|
||||
to_chat(M, "<span class = 'notice'>Your eye sockets feel wet.</span>")
|
||||
else
|
||||
if(!M.eye_blurry)
|
||||
to_chat(M, "<span class = 'warning'>Tears well up in your eyes!</span>")
|
||||
M.EyeBlind(2)
|
||||
M.EyeBlurry(5)
|
||||
..()
|
||||
|
||||
/datum/reagent/consumable/chocolate
|
||||
name = "Chocolate"
|
||||
id = "chocolate"
|
||||
|
||||
@@ -686,6 +686,9 @@
|
||||
color = "#5096C8"
|
||||
|
||||
/datum/reagent/medicine/mutadone/on_mob_life(mob/living/carbon/human/M)
|
||||
if(M.mind && M.mind.assigned_role == "Cluwne") // HUNKE
|
||||
..()
|
||||
return
|
||||
M.SetJitter(0)
|
||||
var/needs_update = M.mutations.len > 0 || M.disabilities > 0
|
||||
|
||||
|
||||
@@ -292,12 +292,10 @@
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
var/obj/item/organ/external/head/head_organ = H.get_organ("head")
|
||||
head_organ.r_facial = rand(0,255)
|
||||
head_organ.g_facial = rand(0,255)
|
||||
head_organ.b_facial = rand(0,255)
|
||||
head_organ.r_hair = rand(0,255)
|
||||
head_organ.g_hair = rand(0,255)
|
||||
head_organ.b_hair = rand(0,255)
|
||||
head_organ.facial_colour = rand_hex_color()
|
||||
head_organ.sec_facial_colour = rand_hex_color()
|
||||
head_organ.hair_colour = rand_hex_color()
|
||||
head_organ.sec_hair_colour = rand_hex_color()
|
||||
H.update_hair()
|
||||
H.update_fhair()
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user