"}
+
| "}
// END AUTOFIX
if(sample)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in sample.reagents.reagent_list
@@ -53,8 +53,8 @@
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\centrifuge.dm:48: dat += " | | "
dat += {" | |
- Antibodies: [antigens2string(B.data["antibodies"])]
- | Isolate"}
+Antibodies: [antigens2string(B.data["antibodies"])]
+ | Isolate"}
// END AUTOFIX
var/list/virus = B.data["virus2"]
for (var/ID in virus)
@@ -63,7 +63,7 @@
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\centrifuge.dm:55: dat += " | | pathogen [V.name()]"
dat += {" | | pathogen [V.name()]
- | Isolate"}
+ | Isolate"}
// END AUTOFIX
else
dat += "Please check container contents."
diff --git a/code/modules/virus2/curer.dm b/code/modules/virus2/curer.dm
index 44d90c97f41..21da6c2669f 100644
--- a/code/modules/virus2/curer.dm
+++ b/code/modules/virus2/curer.dm
@@ -63,7 +63,7 @@
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\curer.dm:62: dat += "
Antibodies: [code]"
dat += {"
Antibodies: [code]
-
Begin antibody production"}
+
Begin antibody production"}
// END AUTOFIX
else
dat += "
Please check container contents."
diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm
index 261d46f179d..f315dc88dfa 100644
--- a/code/modules/virus2/disease2.dm
+++ b/code/modules/virus2/disease2.dm
@@ -128,7 +128,10 @@
var/list/res = list()
for (var/ID in viruses)
var/datum/disease2/disease/V = viruses[ID]
- res["[V.uniqueID]"] = V.getcopy()
+ if(istype(V))
+ res["[V.uniqueID]"] = V.getcopy()
+ else
+ testing("Got a NULL disease2 in virus_copylist!")
return res
diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm
index fff77e7ef4e..59abb2890d1 100644
--- a/code/modules/virus2/diseasesplicer.dm
+++ b/code/modules/virus2/diseasesplicer.dm
@@ -62,7 +62,7 @@
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\diseasesplicer.dm:61: dat += ""
dat += {"
-
Burn DNA Sequence to data storage disk"}
+
Burn DNA Sequence to data storage disk"}
// END AUTOFIX
else
dat += "Empty."
diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm
index 57b35c82663..df939172e31 100644
--- a/code/modules/virus2/dishincubator.dm
+++ b/code/modules/virus2/dishincubator.dm
@@ -109,41 +109,41 @@
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\dishincubator.dm:108: dat += "Power status : [string]"
dat += {"Power status : [string]
-
- Food supply : [foodsupply]
-
- Radiation Levels : [radiation] RADS : Radiate
-
- Toxins : [toxins]
-
"}
+
+Food supply : [foodsupply]
+
+Radiation Levels : [radiation] RADS : Radiate
+
+Toxins : [toxins]
+
"}
// END AUTOFIX
if(beaker)
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\dishincubator.dm:117: dat += "Eject chemicals : Eject"
dat += {"Eject chemicals : Eject
-
"}
+
"}
// END AUTOFIX
if(dish)
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\dishincubator.dm:120: dat += "Eject Virus dish : Eject"
dat += {"Eject Virus dish : Eject
-
"}
+
"}
// END AUTOFIX
if(beaker)
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\dishincubator.dm:123: dat += "Breed viral culture in beaker : Start"
dat += {"Breed viral culture in beaker : Start
-
"}
+
"}
// END AUTOFIX
// AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\virus2\dishincubator.dm:125: dat += "
"
dat += {"
- Flush system
- Close
"}
+Flush system
+Close
"}
// END AUTOFIX
user << browse("Pathogenic incubatorincubator menu:
[dat]", "window=incubator;size=575x400")
onclose(user, "incubator")
diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm
index 9e09f330733..b3dbcaa062b 100644
--- a/code/modules/virus2/isolator.dm
+++ b/code/modules/virus2/isolator.dm
@@ -39,6 +39,11 @@
if(B)
Blood = B
break
+ // /vg/: Try to fix isolators
+ if(!Blood)
+ usr << "\red ERROR: Unable to locate blood within the beaker. Bug?"
+ testing("Unable to locate blood in [beaker]!")
+ return
var/list/virus = virus_copylist(Blood.data["virus2"])
var/choice = text2num(href_list["isolate"]);
for (var/datum/disease2/disease/V in virus)
diff --git a/code/setup.dm b/code/setup.dm
index 1477faf880f..41343379ec5 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -722,7 +722,7 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse
#define NO_EAT 1
#define NO_BREATHE 2
#define NO_SLEEP 4
-#define NO_SHOCK 8
+#define RAD_ABSORB 8
#define NO_SCAN 16
#define NON_GENDERED 32
#define REQUIRE_LIGHT 64
diff --git a/html/changelog.html b/html/changelog.html
index 0b7ff46b0c6..0fe95912707 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -93,14 +93,14 @@
Pomf123 updated
- Space is cold for humans again.
- - Bhangometer now logs the 'theoretical' size of the bomb if its over the cap.
+ - Bhangmeter now logs the 'theoretical' size of the bomb if its over the cap.
- Adds 50 milk and x5 meat button for biogenerator
- Fixed ventcrawling being broken by aliens (possibly).
- Posibrains no longer speak or hear binary.
- Fixed pump shotguns fucking up when fired point-blank.
- Fixed users using flavor text to pretend being braindead.
- - Aliums can see in the dark now
- - Phazon removed due to be imbalanced as fuck.
+ - Aliums can see in the dark now.
+ - Phazon removed due to being imbalanced as fuck.
|
|