Commented out the lagspike wizarditis bit of code (too derpy atm to actually fix it).

Added suspenders for mime.
Changed the virus crate so that it is a secure crate now.
Added the ability for admins to choose which virus to spread when triggering an outbreak.
Changed the dorf mode secret to be more manly.
Made clown's mask a gas one.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@328 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-10-19 19:36:10 +00:00
parent 063eef7317
commit b7e22cc56b
10 changed files with 53 additions and 345 deletions
+22 -2
View File
@@ -230,10 +230,30 @@
A.power_environ = 1
A.power_change()
/proc/viral_outbreak()
/proc/viral_outbreak(var/virus = null)
command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
world << sound('outbreak7.ogg')
var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/wizarditis)
var/virus_type
if(!virus)
virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/wizarditis)
else
switch(virus)
if("fake gbs")
virus_type = /datum/disease/fake_gbs
if("gbs")
virus_type = /datum/disease/gbs
if("magnitis")
virus_type = /datum/disease/magnitis
if("wizarditis")
virus_type = /datum/disease/wizarditis
if("brain rot")
virus_type = /datum/disease/brainrot
if("cold")
virus_type = /datum/disease/cold
if("rhinovirus")
virus_type = /datum/disease/dnaspread
if("flu")
virus_type = /datum/disease/flu
for(var/mob/living/carbon/human/H in world)
if((H.virus) || (H.stat == 2))
continue
+3 -2
View File
@@ -303,19 +303,20 @@
src.equip_if_possible(new /obj/item/device/pda/clown(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/clown(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/mask/clown_hat(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/weapon/banana(src), slot_in_backpack)
src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack)
src.mutations |= 16
if ("Mime")
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_belt)
src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_r_store)
src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/gloves/latex(src), slot_gloves)
src.equip_if_possible(new /obj/item/clothing/mask/mime(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/clothing/head/beret(src), slot_head)
src.equip_if_possible(new /obj/item/clothing/belt/suspenders(src), slot_belt)
src.verbs += /client/proc/mimespeak
src.verbs += /client/proc/mimewall
src.miming = 1
+2 -1
View File
@@ -153,8 +153,9 @@ var/supply_shuttle_points = 50
"/obj/item/weapon/storage/firstaid/syringes",
"/obj/item/weapon/storage/beakerbox")
cost = 20
containertype = "/obj/crate/freezer"
containertype = "/obj/crate/secure/weapon"
containername = "Virus crate"
access = access_heads
/datum/supply_packs/janitor