cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forgot a few fixes.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@844 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
crazyclonetheninja
2011-01-13 01:33:57 +00:00
parent 84d1fff1ed
commit 2468bbea8d
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -1293,7 +1293,7 @@
var/datum/disease/F = new /datum/disease/fake_gbs(0) var/datum/disease/F = new /datum/disease/fake_gbs(0)
var/list/data = list("virus"= F) var/list/data = list("virus"= F)
reagents.add_reagent("blood", 20, data) reagents.add_reagent("blood", 20, data)
/*
/obj/item/weapon/reagent_containers/glass/bottle/rhumba_beat /obj/item/weapon/reagent_containers/glass/bottle/rhumba_beat
name = "Rhumba Beat culture bottle" name = "Rhumba Beat culture bottle"
desc = "A small bottle. Contains The Rhumba Beat culture in synthblood medium."//Or simply - General BullShit 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/datum/disease/F = new /datum/disease/rhumba_beat
var/list/data = list("virus"= F) var/list/data = list("virus"= F)
R.add_reagent("blood", 20, data) R.add_reagent("blood", 20, data)
*/
/obj/item/weapon/reagent_containers/glass/bottle/brainrot /obj/item/weapon/reagent_containers/glass/bottle/brainrot
name = "Brainrot culture bottle" name = "Brainrot culture bottle"

10
code/datums/diseases/rhumba_beat.dm
View File

@@ -13,10 +13,10 @@
..() ..()
switch(stage) switch(stage)
if(1) if(1)
if(affected_mob.ckey == "callagan") if(affected_mob.ckey == "rosham")
src.cure() src.cure()
if(2) if(2)
if(affected_mob.ckey == "callagan") if(affected_mob.ckey == "rosham")
src.cure() src.cure()
if(prob(45)) if(prob(45))
affected_mob.toxloss += 5 affected_mob.toxloss += 5
@@ -24,7 +24,7 @@
if(prob(1)) if(prob(1))
affected_mob << "\red You feel strange..." affected_mob << "\red You feel strange..."
if(3) if(3)
if(affected_mob.ckey == "callagan") if(affected_mob.ckey == "rosham")
src.cure() src.cure()
if(prob(5)) if(prob(5))
affected_mob << "\red You feel the urge to dance..." affected_mob << "\red You feel the urge to dance..."
@@ -33,7 +33,7 @@
else if(prob(10)) else if(prob(10))
affected_mob << "\red You feel the need to chick chicky boom..." affected_mob << "\red You feel the need to chick chicky boom..."
if(4) if(4)
if(affected_mob.ckey == "callagan") if(affected_mob.ckey == "rosham")
src.cure() src.cure()
if(prob(10)) if(prob(10))
affected_mob.emote("gasp") affected_mob.emote("gasp")
@@ -42,7 +42,7 @@
affected_mob.toxloss += 5 affected_mob.toxloss += 5
affected_mob.updatehealth() affected_mob.updatehealth()
if(5) if(5)
if(affected_mob.ckey == "callagan") if(affected_mob.ckey == "rosham")
src.cure() src.cure()
affected_mob << "\red Your body is unable to contain the Rhumba Beat..." affected_mob << "\red Your body is unable to contain the Rhumba Beat..."
if(prob(50)) if(prob(50))

2
code/game/gamemodes/events.dm
View File

@@ -237,6 +237,8 @@
virus_type = /datum/disease/gbs virus_type = /datum/disease/gbs
if("magnitis") if("magnitis")
virus_type = /datum/disease/magnitis virus_type = /datum/disease/magnitis
if("rhumba beat")
virus_type = /datum/disease/rhumba_beat
if("brain rot") if("brain rot")
virus_type = /datum/disease/brainrot virus_type = /datum/disease/brainrot
if("cold") if("cold")

2
code/modules/admin/admin.dm
View File

@@ -1181,7 +1181,7 @@ var/showadminmessages = 1
viral_outbreak() viral_outbreak()
message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1) message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1)
else 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 var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses
viral_outbreak(V) viral_outbreak(V)
message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1) message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1)