From 3aa5a56e055d17fc8d93b5bcc5267c812ecc91a1 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 9 Nov 2017 02:03:27 -0500 Subject: [PATCH 1/7] Calm Down Satan --- code/datums/diseases/kingstons.dm | 46 ++++++++++++++++++++++++++ code/datums/diseases/lycancoughy.dm | 45 +++++++++++++++++++++++++ code/datums/diseases/pierrot_throat.dm | 36 ++++++++++++++++++++ code/modules/clothing/masks/gasmask.dm | 1 + paradise.dme | 2 ++ 5 files changed, 130 insertions(+) create mode 100644 code/datums/diseases/kingstons.dm create mode 100644 code/datums/diseases/lycancoughy.dm diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm new file mode 100644 index 00000000000..0b2417d57f1 --- /dev/null +++ b/code/datums/diseases/kingstons.dm @@ -0,0 +1,46 @@ +/datum/disease/kingstons + name = "Kingstons" + max_stages = 4 + spread_text = "Airborne" + cure_text = "Milk." + cures = list("milk") + cure_chance = 75 + agent = "NYA Virus" + viable_mobtypes = list(/mob/living/carbon/human) + permeability_mod = 0.75 + desc = "If left untreated the subject will turn into a felonid. In felines it has..OTHER..effects." + severity = MEDIUM + +/datum/disease/kingstons/stage_act() + ..() + switch(stage) + if(1) + if(prob(10)) + if(affected_mob.get_species() == "Tajaran") + to_chat(affected_mob, "You feel good.") + else + to_chat(affected_mob, "You feel like playing with string.") + if(2) + if(prob(10)) + if(affected_mob.get_species() == "Tajaran") + to_chat(affected_mob, "Something in your throat itches.") + else + to_chat(affected_mob, "You NEED to find a mouse.") + if(3) + if(prob(10)) + if(affected_mob.get_species() == "Tajaran") + to_chat(affected_mob, "You feel something in your throat!.") + affected_mob.emote("cough") + else + affected_mob.say( pick( list("Mew", "meow", "Nya!") ) ) + if(4) + if(prob(5)) + if(affected_mob.get_species() == "Tajaran") + affected_mob.visible_message("[affected_mob] coughs up a hairball!", \ + "You cough up a hairball!") + affected_mob.Stun(5) + else + affected_mob.visible_message("[affected_mob] form contorts into something more feline!!", \ + "YOU TURN INTO A TAJARAN!") + var/mob/living/carbon/human/catface = affected_mob + catface.set_species("Tajaran") \ No newline at end of file diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm new file mode 100644 index 00000000000..6ef2467d27e --- /dev/null +++ b/code/datums/diseases/lycancoughy.dm @@ -0,0 +1,45 @@ +/datum/disease/lycan + name = "Lycancoughy" + form = "Infection" + max_stages = 4 + spread_text = "On contact" + spread_flags = CONTACT_GENERAL + cure_text = "Ethanol" + cures = list("ethanol") + agent = "Excess Snuggles" + viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) + desc = "If left untreated subject will regurgitate...puppys?" + severity = MEDIUM + +/datum/disease/lycan/stage_act() + ..() + switch(stage) + if(2) //also changes say, see say.dm + if(prob(5)) + to_chat(affected_mob, "You itch.") + affected_mob.emote("cough") + if(3) + if(prob(10)) + to_chat(affected_mob, "You hear faint barking.") + if(prob(5)) + to_chat(affected_mob, "You crave meat.") + affected_mob.emote("cough") + if(prob(2)) + to_chat(affected_mob, "Your stomache growls!") + if(4) + if(prob(10)) + to_chat(affected_mob, "Your stomache barks?!") + if(prob(5)) + affected_mob.visible_message("[affected_mob] howls!", \ + "You howl!") + affected_mob.AdjustConfused(rand(6,8)) + playsound(affected_mob, 'sound/goonstation/voice/howl.ogg', 60, 0, 10) + if(prob(3)) + 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("[affected_mob] coughs up [initial(puppypicked.name)]!", \ + "You cough up [initial(puppypicked.name)]!?") + affected_mob.emote("cough") + new puppypicked(affected_mob.loc) + new puppypicked(affected_mob.loc) + return diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 2bf0ca308a8..be412bd9afe 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -26,3 +26,39 @@ if(4) if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) + + +/datum/disease/pierrot_throat/advanced + name = "Advanced Pierrot's Throat" + max_stages = 4 + spread_text = "Airborne" + cure_text = "Banana products, especially banana bread." + cures = list("banana") + cure_chance = 75 + agent = "H0NI<42.B4n4 Virus" + viable_mobtypes = list(/mob/living/carbon/human) + permeability_mod = 0.75 + desc = "If left untreated the subject will probably drive others to insanity and go insane themselves." + severity = DANGEROUS + +/datum/disease/pierrot_throat/advanced/stage_act() + ..() + switch(stage) + if(1) + if(prob(10)) + to_chat(affected_mob, "You feel a little silly.") + if(prob(5)) + to_chat(affected_mob, "You feel like making a joke.") + if(2) + if(prob(10)) + to_chat(affected_mob, "You don't just start seeing rainbows..YOU ARE RAINBOWS!") + if(3) + if(prob(10)) + to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!") + affected_mob << 'sound/items/AirHorn.ogg' + if(4) + if(prob(5)) + affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) + + if(!istype(affected_mob.wear_mask, /obj/item/clothing/mask/gas/virusclown_hat)) + affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/virusclown_hat(src), slot_wear_mask) \ No newline at end of file diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 80350b3f3fe..645d0cdf633 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -131,6 +131,7 @@ desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." icon_state = "clown" item_state = "clown_hat" + flags = NODROP /obj/item/clothing/mask/gas/sexyclown name = "sexy-clown wig and mask" diff --git a/paradise.dme b/paradise.dme index d2239b98e70..c4f2e268889 100644 --- a/paradise.dme +++ b/paradise.dme @@ -245,7 +245,9 @@ #include "code\datums\diseases\fluspanish.dm" #include "code\datums\diseases\food_poisoning.dm" #include "code\datums\diseases\gbs.dm" +#include "code\datums\diseases\kingstons.dm" #include "code\datums\diseases\kuru.dm" +#include "code\datums\diseases\lycancoughy.dm" #include "code\datums\diseases\magnitis.dm" #include "code\datums\diseases\pierrot_throat.dm" #include "code\datums\diseases\retrovirus.dm" From 93d1a40f63d65bffccbdc478a5c6de9536958b0d Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 9 Nov 2017 02:13:13 -0500 Subject: [PATCH 2/7] typo --- code/datums/diseases/kingstons.dm | 4 ++-- code/datums/diseases/lycancoughy.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm index 0b2417d57f1..6592d22a662 100644 --- a/code/datums/diseases/kingstons.dm +++ b/code/datums/diseases/kingstons.dm @@ -17,9 +17,9 @@ if(1) if(prob(10)) if(affected_mob.get_species() == "Tajaran") - to_chat(affected_mob, "You feel good.") + to_chat(affected_mob, "You feel good.") else - to_chat(affected_mob, "You feel like playing with string.") + to_chat(affected_mob, "You feel like playing with string.") if(2) if(prob(10)) if(affected_mob.get_species() == "Tajaran") diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm index 6ef2467d27e..69c1e46dde2 100644 --- a/code/datums/diseases/lycancoughy.dm +++ b/code/datums/diseases/lycancoughy.dm @@ -25,10 +25,10 @@ to_chat(affected_mob, "You crave meat.") affected_mob.emote("cough") if(prob(2)) - to_chat(affected_mob, "Your stomache growls!") + to_chat(affected_mob, "Your stomach growls!") if(4) if(prob(10)) - to_chat(affected_mob, "Your stomache barks?!") + to_chat(affected_mob, "Your stomach barks?!") if(prob(5)) affected_mob.visible_message("[affected_mob] howls!", \ "You howl!") From a389f0e4ae7f667f84cc5891b382fe0c6b66920a Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 9 Nov 2017 19:59:03 -0500 Subject: [PATCH 3/7] ADVANCED kingstons --- code/datums/diseases/kingstons.dm | 69 ++++++++++++++++++++++---- code/datums/diseases/lycancoughy.dm | 5 +- code/datums/diseases/pierrot_throat.dm | 4 +- 3 files changed, 64 insertions(+), 14 deletions(-) diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm index 6592d22a662..c26174acfca 100644 --- a/code/datums/diseases/kingstons.dm +++ b/code/datums/diseases/kingstons.dm @@ -1,14 +1,14 @@ /datum/disease/kingstons - name = "Kingstons" + name = "Kingstons Syndrome" max_stages = 4 spread_text = "Airborne" - cure_text = "Milk." + cure_text = "Milk" cures = list("milk") - cure_chance = 75 - agent = "NYA Virus" + cure_chance = 50 + agent = "Nya Virus" viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.75 - desc = "If left untreated the subject will turn into a felonid. In felines it has..OTHER..effects." + desc = "If left untreated the subject will turn into a feline. In felines it has... OTHER... effects." severity = MEDIUM /datum/disease/kingstons/stage_act() @@ -29,7 +29,7 @@ if(3) if(prob(10)) if(affected_mob.get_species() == "Tajaran") - to_chat(affected_mob, "You feel something in your throat!.") + to_chat(affected_mob, "You feel something in your throat!") affected_mob.emote("cough") else affected_mob.say( pick( list("Mew", "meow", "Nya!") ) ) @@ -40,7 +40,58 @@ "You cough up a hairball!") affected_mob.Stun(5) else - affected_mob.visible_message("[affected_mob] form contorts into something more feline!!", \ + affected_mob.visible_message("[affected_mob] form contorts into something more feline!", \ "YOU TURN INTO A TAJARAN!") - var/mob/living/carbon/human/catface = affected_mob - catface.set_species("Tajaran") \ No newline at end of file + if(!affected_mob.get_species() != "Tajaran") + var/mob/living/carbon/human/catface = affected_mob + catface.set_species("Tajaran") + + +/datum/disease/kingstons/advanced + name = "Advanced Kingstons Syndrome" + max_stages = 4 + spread_text = "Airborne" + cure_text = "Plasma" + cures = list("plasma") + cure_chance = 50 + agent = "AMB45DR Bacteria" + viable_mobtypes = list(/mob/living/carbon/human) + permeability_mod = 0.75 + desc = "If left untreated the subject will mutate to a diffrent species." + severity = MEDIUM + var/list/virspecies = list("Human", "Tajaran", "Unathi", "Skrell", "Grey")//no karma races sorrys. + var/list/virsuffix = list("pox", "rot", "flu", "Cough", "-gitis", "cold", "Rash") + var/chosentype + var/chosensuff + +/datum/disease/kingstons/advanced/New() + chosentype = pick(virspecies) + chosensuff = pick(virsuffix) + + name = "[chosentype] [chosensuff]" + +/datum/disease/kingstons/advanced/stage_act() + ..() + switch(stage) + if(1) + if(prob(10)) + to_chat(affected_mob, "You feel awkward.") + if(2) + if(prob(10)) + to_chat(affected_mob, "You itch.") + if(3) + if(prob(10)) + to_chat(affected_mob, "Your skin starts to flake!") + + if(4) + if(prob(5)) + if(affected_mob.get_species() != chosentype) + affected_mob.visible_message("[affected_mob]'s skin splits and form contorts!", \ + "Your body mutates into a [chosentype]!") + var/mob/living/carbon/human/twisted = affected_mob + twisted.set_species(chosentype) + else + affected_mob.visible_message("[affected_mob] scratches at thier skin!", \ + "You scratch your skin to try not to itch!") + affected_mob.adjustBruteLoss(-5) + affected_mob.adjustStaminaLoss(5) \ No newline at end of file diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm index 69c1e46dde2..b47999f07f2 100644 --- a/code/datums/diseases/lycancoughy.dm +++ b/code/datums/diseases/lycancoughy.dm @@ -8,7 +8,7 @@ cures = list("ethanol") agent = "Excess Snuggles" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) - desc = "If left untreated subject will regurgitate...puppys?" + desc = "If left untreated subject will regurgitate... puppys?" severity = MEDIUM /datum/disease/lycan/stage_act() @@ -33,12 +33,11 @@ affected_mob.visible_message("[affected_mob] howls!", \ "You howl!") affected_mob.AdjustConfused(rand(6,8)) - playsound(affected_mob, 'sound/goonstation/voice/howl.ogg', 60, 0, 10) if(prob(3)) 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("[affected_mob] coughs up [initial(puppypicked.name)]!", \ - "You cough up [initial(puppypicked.name)]!?") + "You cough up [initial(puppypicked.name)]?!") affected_mob.emote("cough") new puppypicked(affected_mob.loc) new puppypicked(affected_mob.loc) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index be412bd9afe..5d2b343665b 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -46,12 +46,12 @@ switch(stage) if(1) if(prob(10)) - to_chat(affected_mob, "You feel a little silly.") + to_chat(affected_mob, "You feel a very silly.") if(prob(5)) to_chat(affected_mob, "You feel like making a joke.") if(2) if(prob(10)) - to_chat(affected_mob, "You don't just start seeing rainbows..YOU ARE RAINBOWS!") + to_chat(affected_mob, "You don't just start seeing rainbows... YOU ARE RAINBOWS!") if(3) if(prob(10)) to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!") From f65f350959c0127d0912d82550934c9d4f9938d8 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 10 Nov 2017 00:45:49 -0500 Subject: [PATCH 4/7] feedback --- code/datums/diseases/kingstons.dm | 15 +++++++-------- code/datums/diseases/lycancoughy.dm | 3 ++- code/datums/diseases/pierrot_throat.dm | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm index c26174acfca..a5d330629b7 100644 --- a/code/datums/diseases/kingstons.dm +++ b/code/datums/diseases/kingstons.dm @@ -9,7 +9,7 @@ viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.75 desc = "If left untreated the subject will turn into a feline. In felines it has... OTHER... effects." - severity = MEDIUM + severity = DANGEROUS /datum/disease/kingstons/stage_act() ..() @@ -42,9 +42,8 @@ else affected_mob.visible_message("[affected_mob] form contorts into something more feline!", \ "YOU TURN INTO A TAJARAN!") - if(!affected_mob.get_species() != "Tajaran") - var/mob/living/carbon/human/catface = affected_mob - catface.set_species("Tajaran") + var/mob/living/carbon/human/catface = affected_mob + catface.set_species("Tajaran") /datum/disease/kingstons/advanced @@ -57,10 +56,10 @@ agent = "AMB45DR Bacteria" viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.75 - desc = "If left untreated the subject will mutate to a diffrent species." - severity = MEDIUM - var/list/virspecies = list("Human", "Tajaran", "Unathi", "Skrell", "Grey")//no karma races sorrys. - var/list/virsuffix = list("pox", "rot", "flu", "Cough", "-gitis", "cold", "Rash") + desc = "If left untreated the subject will mutate to a different species." + severity = BIOHAZARD + var/list/virspecies = list("Human", "Tajaran", "Unathi", "Skrell", "Grey", "Vulpkanin")//no karma races sorrys. + var/list/virsuffix = list("pox", "rot", "flu", "cough", "-gitis", "cold", "rash", "itch") var/chosentype var/chosensuff diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm index b47999f07f2..4b00d99a383 100644 --- a/code/datums/diseases/lycancoughy.dm +++ b/code/datums/diseases/lycancoughy.dm @@ -8,7 +8,7 @@ cures = list("ethanol") agent = "Excess Snuggles" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) - desc = "If left untreated subject will regurgitate... puppys?" + desc = "If left untreated subject will regurgitate... puppies." severity = MEDIUM /datum/disease/lycan/stage_act() @@ -39,6 +39,7 @@ affected_mob.visible_message("[affected_mob] coughs up [initial(puppypicked.name)]!", \ "You cough up [initial(puppypicked.name)]?!") affected_mob.emote("cough") + affected_mob.adjustBruteLoss(5) new puppypicked(affected_mob.loc) new puppypicked(affected_mob.loc) return diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 5d2b343665b..99ff1f567fe 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -46,7 +46,7 @@ switch(stage) if(1) if(prob(10)) - to_chat(affected_mob, "You feel a very silly.") + to_chat(affected_mob, "You feel very silly.") if(prob(5)) to_chat(affected_mob, "You feel like making a joke.") if(2) From 7d5d6655b529c52f263f3a12143a04439f3bd074 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 10 Nov 2017 20:17:26 -0500 Subject: [PATCH 5/7] try to take out some rdefines. --- code/datums/diseases/kingstons.dm | 1 - code/datums/diseases/pierrot_throat.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm index a5d330629b7..b1017ce0fd4 100644 --- a/code/datums/diseases/kingstons.dm +++ b/code/datums/diseases/kingstons.dm @@ -48,7 +48,6 @@ /datum/disease/kingstons/advanced name = "Advanced Kingstons Syndrome" - max_stages = 4 spread_text = "Airborne" cure_text = "Plasma" cures = list("plasma") diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 99ff1f567fe..f2f9e1371b1 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -30,7 +30,6 @@ /datum/disease/pierrot_throat/advanced name = "Advanced Pierrot's Throat" - max_stages = 4 spread_text = "Airborne" cure_text = "Banana products, especially banana bread." cures = list("banana") From 7cd79cc1c83d28b19d4d9cd6467af599e1c5f433 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 16 Nov 2017 20:52:50 -0500 Subject: [PATCH 6/7] grey are a karma race Ask me how long it took to realize --- code/datums/diseases/kingstons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm index b1017ce0fd4..4a07e8b5cc7 100644 --- a/code/datums/diseases/kingstons.dm +++ b/code/datums/diseases/kingstons.dm @@ -57,8 +57,8 @@ permeability_mod = 0.75 desc = "If left untreated the subject will mutate to a different species." severity = BIOHAZARD - var/list/virspecies = list("Human", "Tajaran", "Unathi", "Skrell", "Grey", "Vulpkanin")//no karma races sorrys. - var/list/virsuffix = list("pox", "rot", "flu", "cough", "-gitis", "cold", "rash", "itch") + var/list/virspecies = list("Human", "Tajaran", "Unathi", "Skrell", "Vulpkanin")//no karma races sorrys. + var/list/virsuffix = list("pox", "rot", "flu", "cough", "-gitis", "cold", "rash", "itch", "decay") var/chosentype var/chosensuff From 07452c681893f0451a7a1965032e428f05a5bb77 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 1 Feb 2018 22:33:10 -0500 Subject: [PATCH 7/7] tweaks --- code/datums/diseases/kingstons.dm | 4 ++-- code/datums/diseases/lycancoughy.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm index 4a07e8b5cc7..abad7dcf720 100644 --- a/code/datums/diseases/kingstons.dm +++ b/code/datums/diseases/kingstons.dm @@ -32,7 +32,7 @@ to_chat(affected_mob, "You feel something in your throat!") affected_mob.emote("cough") else - affected_mob.say( pick( list("Mew", "meow", "Nya!") ) ) + affected_mob.say(pick(list("Mew", "Meow!", "Nya!~"))) if(4) if(prob(5)) if(affected_mob.get_species() == "Tajaran") @@ -40,7 +40,7 @@ "You cough up a hairball!") affected_mob.Stun(5) else - affected_mob.visible_message("[affected_mob] form contorts into something more feline!", \ + affected_mob.visible_message("[affected_mob]'s form contorts into something more feline!", \ "YOU TURN INTO A TAJARAN!") var/mob/living/carbon/human/catface = affected_mob catface.set_species("Tajaran") diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm index 4b00d99a383..2c5a8752cbb 100644 --- a/code/datums/diseases/lycancoughy.dm +++ b/code/datums/diseases/lycancoughy.dm @@ -32,7 +32,7 @@ if(prob(5)) affected_mob.visible_message("[affected_mob] howls!", \ "You howl!") - affected_mob.AdjustConfused(rand(6,8)) + affected_mob.AdjustConfused(rand(6, 8)) if(prob(3)) 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)