mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-21 03:55:05 +01:00
- Disease & related fixes.
- Wizarditis should not teleport you to space. But still can teleport you to areas with no air. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@344 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -298,7 +298,7 @@
|
||||
if (href_list["create_vaccine"])
|
||||
if(!src.wait)
|
||||
var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
|
||||
var/vaccine_type = href_list["create_vaccine"]
|
||||
var/vaccine_type = text2path(href_list["create_vaccine"])//the path is received as string - converting
|
||||
var/datum/disease/D = new vaccine_type
|
||||
var/name = input(usr,"Name:","Name the vaccine",D.name)
|
||||
if(!name || name == " ") name = D.name
|
||||
@@ -316,7 +316,7 @@
|
||||
if(!wait)
|
||||
var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
|
||||
B.icon_state = "bottle3"
|
||||
var/type = href_list["create_virus_culture"]
|
||||
var/type = text2path(href_list["create_virus_culture"])//the path is received as string - converting
|
||||
var/datum/disease/D = new type
|
||||
var/list/data = list("virus"=D)
|
||||
var/name = input(usr,"Name:","Name the culture",D.name)
|
||||
|
||||
@@ -127,6 +127,14 @@ datum
|
||||
blood_prop.virus.spread_type = CONTACT_HANDS
|
||||
return
|
||||
|
||||
/* Must check the transfering of reagents and their data first. They all can point to one disease datum.
|
||||
|
||||
Del()
|
||||
if(src.data["virus"])
|
||||
var/datum/disease/D = src.data["virus"]
|
||||
D.cure(0)
|
||||
..()
|
||||
*/
|
||||
vaccine
|
||||
//data must contain virus type
|
||||
name = "Vaccine"
|
||||
@@ -137,7 +145,7 @@ datum
|
||||
var/datum/reagent/vaccine/self = src
|
||||
src = null
|
||||
if(self.data&&method == INGEST)
|
||||
if(M.virus&&M.virus.type == self.data)
|
||||
if(M.virus && M.virus.type == self.data)
|
||||
M.virus.cure()
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user