Canned Laughter Improvements (#19446)

* ports improvement from hippie
https://github.com/HippieStationCode/HippieStation13/pull/2657

* fixes last commit, makes laughter brewable
This commit is contained in:
PKPenguin321
2016-07-25 21:14:13 +12:00
committed by oranges
parent c773ec7a4a
commit b325df3e6e
2 changed files with 21 additions and 11 deletions
@@ -117,18 +117,21 @@
metabolization_rate = INFINITY
color = "#FF4DD2"
/datum/reagent/consumable/laughter/on_mob_life(mob/living/M)
M.emote("laugh")
var/laughnum = rand(1,2)
if(M.gender == MALE)
if(laughnum == 1)
/datum/reagent/consumable/laughter/on_mob_life(mob/living/carbon/M)
if(!iscarbon(M))
return
if(!M.silent)//cant laugh if you're mute
M.emote("laugh")
var/laughnum = rand(1,2)
if(M.gender == MALE)
if(laughnum == 1)
playsound(get_turf(M), 'sound/voice/human/manlaugh1.ogg', 50, 1)
if(laughnum == 2)
playsound(get_turf(M), 'sound/voice/human/manlaugh2.ogg', 50, 1)
else if(M.gender == FEMALE)
playsound(get_turf(M), 'sound/voice/human/womanlaugh.ogg', 65, 1)
else//non-binary gender just sounds like a man
playsound(get_turf(M), 'sound/voice/human/manlaugh1.ogg', 50, 1)
if(laughnum == 2)
playsound(get_turf(M), 'sound/voice/human/manlaugh2.ogg', 50, 1)
else if(M.gender == FEMALE)
playsound(get_turf(M), 'sound/voice/human/womanlaugh.ogg', 65, 1)
else//non-binary gender just sounds like a man
playsound(get_turf(M), 'sound/voice/human/manlaugh1.ogg', 50, 1)
..()
/datum/reagent/consumable/potato_juice
@@ -517,3 +517,10 @@
result = "royal_bee_jelly"
required_reagents = list("mutagen" = 10, "honey" = 40)
result_amount = 5
/datum/chemical_reaction/laughter
name = "laughter"
id = "laughter"
result = "laughter"
required_reagents = list("sugar" = 1, "banana" = 1)
result_amount = 10