cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the last of fox's noted bugs, runtime prevention

Browse Source
This commit is contained in:
Tigercat2000
2016-03-30 18:12:03 -07:00
parent 12efef6029
commit ec3502af38
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/beesease.dm
+1 -1
View File
@@ -14,7 +14,7 @@
/datum/disease/beesease/stage_act()
..()
switch(stage)
if(2) //also changes say, see say.dm
if(2) //also changes say, see say.dm // no it doesn't, that's horrifyingly snowflakey
if(prob(2))
affected_mob << "<span class='notice'>You taste honey in your mouth.</span>"
if(3)
code/game/machinery/computer/medical.dm
+14 -6
View File
@@ -200,12 +200,20 @@
src.active2 = null
if(href_list["vir"])
var/datum/data/record/v = locate(href_list["vir"])
src.temp = "<center>GNAv2 based virus lifeform V-[v.fields["id"]]</center>"
src.temp += "<br><b>Name:</b> <A href='?src=\ref[src];field=vir_name;edit_vir=\ref[v]'>[v.fields["name"]]</A>"
src.temp += "<br><b>Antigen:</b> [v.fields["antigen"]]"
src.temp += "<br><b>Spread:</b> [v.fields["spread type"]] "
src.temp += "<br><b>Details:</b><br> <A href='?src=\ref[src];field=vir_desc;edit_vir=\ref[v]'>[v.fields["description"]]</A>"
var/type = href_list["vir"]
var/datum/disease/Dis = new type(0)
var/AfS = ""
for(var/mob/M in Dis.viable_mobtypes)
AfS += " [initial(M.name)];"
src.temp = {"<b>Name:</b> [Dis.name]
<BR><b>Number of stages:</b> [Dis.max_stages]
<BR><b>Spread:</b> [Dis.spread_text] Transmission
<BR><b>Possible Cure:</b> [(Dis.cure_text||"none")]
<BR><b>Affected Lifeforms:</b>[AfS]
<BR>
<BR><b>Notes:</b> [Dis.desc]
<BR>
<BR><b>Severity:</b> [Dis.severity]"}
if (href_list["del_all"])
src.temp = text("Are you sure you wish to delete all records?<br>\n\t<A href='?src=\ref[];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)
code/modules/reagents/Chemistry-Holder.dm
+1
View File
@@ -447,6 +447,7 @@ var/const/INGEST = 2
R.volume += amount
update_total()
my_atom.on_reagent_change()
R.on_merge(data)
handle_reactions()
return 0
code/modules/reagents/oldchem/reagents/reagents_water.dm
+2 -2
View File
@@ -190,8 +190,8 @@
preserve += D
data["viruses"] = preserve
if(mix_data["blood_colour"])
color = mix_data["blood_colour"]
if(mix_data["blood_colour"])
color = mix_data["blood_colour"]
return 1
/datum/reagent/blood/on_update(var/atom/A)
code/modules/surgery/organs/blood.dm
+3 -1
View File
@@ -213,8 +213,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
B.data["donor"] = src
B.data["viruses"] = list()
for(var/datum/disease/D in src.viruses)
for(var/datum/disease/D in viruses)
B.data["viruses"] += D.Copy()
if(resistances && resistances.len)
B.data["resistances"] = resistances.Copy()
B.data["blood_DNA"] = copytext(src.dna.unique_enzymes,1,0)
B.data["blood_type"] = copytext(src.dna.b_type,1,0)