Merge pull request #9219 from Aurorablade/BORKBORK

Limits Dogs from Lycancoughy virus
This commit is contained in:
Crazy Lemon
2018-08-22 22:46:54 -07:00
committed by GitHub
+12 -3
View File
@@ -10,6 +10,7 @@
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
desc = "If left untreated subject will regurgitate... puppies."
severity = MEDIUM
var/barklimit = 0
/datum/disease/lycan/stage_act()
..()
@@ -33,13 +34,21 @@
affected_mob.visible_message("<span class='danger'>[affected_mob] howls!</span>", \
"<span class='userdanger'>You howl!</span>")
affected_mob.AdjustConfused(rand(6, 8))
if(prob(3))
if(prob(3) && barklimit <= 10)
var/list/puppytype = list(/mob/living/simple_animal/pet/corgi/puppy, /mob/living/simple_animal/pet/pug, /mob/living/simple_animal/pet/fox)
var/mob/living/puppypicked = pick(puppytype)
affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up [initial(puppypicked.name)]!</span>", \
"<span class='userdanger'>You cough up [initial(puppypicked.name)]?!</span>")
affected_mob.emote("cough")
affected_mob.adjustBruteLoss(5)
new puppypicked(affected_mob.loc)
new puppypicked(affected_mob.loc)
barklimit ++
if(prob(1))
var/list/plushtype = list(/obj/item/toy/plushie/orange_fox, /obj/item/toy/plushie/corgi, /obj/item/toy/plushie/robo_corgi, /obj/item/toy/plushie/pink_fox)
var/obj/item/toy/plushie/coughfox = pick(plushtype)
new coughfox(affected_mob.loc)
affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a [initial(coughfox.name)]!</span>", \
"<span class='userdanger'>You cough [initial(coughfox.name)] up ?!</span>")
affected_mob.emote("cough")
affected_mob.adjustBruteLoss(5)
return