diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index f3977516b60..430ba42c6cc 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -1293,7 +1293,7 @@ var/datum/disease/F = new /datum/disease/fake_gbs(0) var/list/data = list("virus"= F) reagents.add_reagent("blood", 20, data) - +/* /obj/item/weapon/reagent_containers/glass/bottle/rhumba_beat name = "Rhumba Beat culture bottle" desc = "A small bottle. Contains The Rhumba Beat culture in synthblood medium."//Or simply - General BullShit @@ -1308,7 +1308,7 @@ var/datum/disease/F = new /datum/disease/rhumba_beat var/list/data = list("virus"= F) R.add_reagent("blood", 20, data) - +*/ /obj/item/weapon/reagent_containers/glass/bottle/brainrot name = "Brainrot culture bottle" diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm index 17794f6eab7..c7241c24ce0 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -13,10 +13,10 @@ ..() switch(stage) if(1) - if(affected_mob.ckey == "callagan") + if(affected_mob.ckey == "rosham") src.cure() if(2) - if(affected_mob.ckey == "callagan") + if(affected_mob.ckey == "rosham") src.cure() if(prob(45)) affected_mob.toxloss += 5 @@ -24,7 +24,7 @@ if(prob(1)) affected_mob << "\red You feel strange..." if(3) - if(affected_mob.ckey == "callagan") + if(affected_mob.ckey == "rosham") src.cure() if(prob(5)) affected_mob << "\red You feel the urge to dance..." @@ -33,7 +33,7 @@ else if(prob(10)) affected_mob << "\red You feel the need to chick chicky boom..." if(4) - if(affected_mob.ckey == "callagan") + if(affected_mob.ckey == "rosham") src.cure() if(prob(10)) affected_mob.emote("gasp") @@ -42,7 +42,7 @@ affected_mob.toxloss += 5 affected_mob.updatehealth() if(5) - if(affected_mob.ckey == "callagan") + if(affected_mob.ckey == "rosham") src.cure() affected_mob << "\red Your body is unable to contain the Rhumba Beat..." if(prob(50)) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 9ac1f2f25a6..519f35de616 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -237,6 +237,8 @@ virus_type = /datum/disease/gbs if("magnitis") virus_type = /datum/disease/magnitis + if("rhumba beat") + virus_type = /datum/disease/rhumba_beat if("brain rot") virus_type = /datum/disease/brainrot if("cold") diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 8322c1d5eec..6a03a8116ab 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1181,7 +1181,7 @@ var/showadminmessages = 1 viral_outbreak() message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1) else - var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu","pierrot's throat") + var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu","pierrot's throat","rhumba beat") var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses viral_outbreak(V) message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1)