From d31389e1bbcaa94294993aac1ed876c4ef6961ed Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 13:43:51 -0400 Subject: [PATCH 01/11] Add files via upload --- modular_citadel/icons/obj/modularpills.dmi | Bin 0 -> 427 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modular_citadel/icons/obj/modularpills.dmi diff --git a/modular_citadel/icons/obj/modularpills.dmi b/modular_citadel/icons/obj/modularpills.dmi new file mode 100644 index 0000000000000000000000000000000000000000..78095d82c0ff8d3c4252e4a00353c52f0501a230 GIT binary patch literal 427 zcmV;c0aX5pP)V=-0C=2ri?IsAFcd}Sysx;lyI6J2A}Nxg{e=+8Yx6);Nz&@)I~3g9&Vh4U zT>G0HVFpVZ=ORmj#^rD%^_Ea0G|nedk!6l`mr{LYXf&_9mLfj6`(x#XRFGVt(UF?6 zfAY@1+9#G43@sXc`U4fAfy}s007@fL_t(&f$i4q34<^ch2huI zjczySE;>`PiyP$5WPfOirC&+V($e#QTnHh04~YsQA|fIpB7dkWpW07#OUH_}D<#Ie zu@mQ(rH*CO`pF1500R&(z~N~Hrd>ivj27>QJu$X~a44Oao3|+d18%&mySO%Q;HwM6 zB9C{*8^r+_00Hlo9pJpIo4aX#8OpcudAucr!Xpqnht)e^$j|V!?)nZ`oHp2Kg#o}P z8mf`P96+wEzN)FW5~IcWFs`;*KA(8+)n9|(3IJ|HSZQe Date: Thu, 4 Apr 2019 13:57:15 -0400 Subject: [PATCH 02/11] Update firstaid.dm --- code/game/objects/items/storage/firstaid.dm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c795726421..2f524131c3 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -112,12 +112,17 @@ /obj/item/storage/firstaid/radbgone/PopulateContents() if(empty) return + if(prob(50)) + new /obj/item/reagent_containers/pill/mutarad(src) + if(prob(80)) + new /obj/item/reagent_containers/pill/antirad+(src) new /obj/item/reagent_containers/syringe/charcoal(src) new /obj/item/storage/pill_bottle/charcoal(src) new /obj/item/reagent_containers/pill/mutadone(src) new /obj/item/reagent_containers/pill/antirad(src) new /obj/item/reagent_containers/food/drinks/bottle/vodka(src) new /obj/item/healthanalyzer(src) + /obj/item/storage/firstaid/o2 name = "oxygen deprivation treatment kit" @@ -291,3 +296,19 @@ /obj/item/storage/pill_bottle/aranesp/PopulateContents() for(var/i in 1 to 5) new /obj/item/reagent_containers/pill/aranesp(src) + +/obj/item/storage/pill_bottle/antirad+ + name = "anti radiation deluxe pill bottle" + desc = "The label says 'Med-Co branded pills'." + +/obj/item/storage/pill_bottle/anitrad+/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/reagent_containers/pill/antirad+(src) + +/obj/item/storage/pill_bottle/mutarad + name = "radiation treatment deluxe pill bottle" + desc = "The label says 'Med-Co branded pills' and below that 'Contains Mutadone in each pill!`." + +/obj/item/storage/pill_bottle/anitrad+/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/reagent_containers/pill/mutarad(src) From f92ba3714dc2051e1a8e771a62f59e769c15d206 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 13:58:21 -0400 Subject: [PATCH 03/11] Grammar fix --- code/game/objects/items/storage/firstaid.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 2f524131c3..589e23240d 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -301,7 +301,7 @@ name = "anti radiation deluxe pill bottle" desc = "The label says 'Med-Co branded pills'." -/obj/item/storage/pill_bottle/anitrad+/PopulateContents() +/obj/item/storage/pill_bottle/antirad+/PopulateContents() for(var/i in 1 to 7) new /obj/item/reagent_containers/pill/antirad+(src) @@ -309,6 +309,6 @@ name = "radiation treatment deluxe pill bottle" desc = "The label says 'Med-Co branded pills' and below that 'Contains Mutadone in each pill!`." -/obj/item/storage/pill_bottle/anitrad+/PopulateContents() +/obj/item/storage/pill_bottle/mutarad/PopulateContents() for(var/i in 1 to 7) new /obj/item/reagent_containers/pill/mutarad(src) From d4b9c06dd2897d356156854f18bc000ebac329ae Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 14:59:23 -0400 Subject: [PATCH 04/11] Update pill.dm --- .../modules/reagents/reagent_containers/pill.dm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index b5d00d2ba4..a5f01f04ad 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -172,6 +172,23 @@ icon_state = "pill18" list_reagents = list("potass_iodide" = 50) roundstart = 1 + +/obj/item/reagent_containers/pill/antirad+ + name = "prussian blue pill" + desc = "Used to treat heavy radition poisoning." + icon = 'modular_citadel/icons/obj/modularpills.dmi' + icon_state = "prussian_blue" + list_reagents = list("prussian_blue" = 25, "water" = 10) + roundstart = 1 + +/obj/item/reagent_containers/pill/mutarad + name = "radiation treatment deluxe pill" + desc = "Used to treat heavy radition poisoning and genetic defects." + icon = 'modular_citadel/icons/obj/modularpills.dmi' + icon_state = "anit_rad_fixgene" + list_reagents = list("prussian_blue" = 15, "potass_iodide" = 15, "mutadone" = 15, "water" = 5) + roundstart = 1 + ///////////////////////////////////////// this pill is used only in a legion mob drop /obj/item/reagent_containers/pill/shadowtoxin name = "black pill" From abf3cde518fbfc9321432fb518325cab1bcd8fe9 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 15:20:00 -0400 Subject: [PATCH 05/11] Update medicine_reagents.dm --- .../chemistry/reagents/medicine_reagents.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 4e278d2ede..46a19ac806 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -463,6 +463,19 @@ M.radiation -= min(M.radiation, 8) ..() +/datum/reagent/medicine/prussian_blue + name = "Prussian Blue" + id = "prussian_blue" + description = "Efficiently restores heavy radiation damage." + reagent_state = LIQUID + color = "#003153" // RGB 0, 49, 83 + metabolization_rate = .5 * REAGENTS_METABOLISM + +/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M) + if(M.radiation > 0) + M.radiation -= min(M.radiation, 20) + ..() + /datum/reagent/medicine/pen_acid name = "Pentetic Acid" id = "pen_acid" From 899985f22e83276bc706aff0b6d2a95f2df8442f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 15:35:49 -0400 Subject: [PATCH 06/11] Update packs.dm --- code/modules/cargo/packs.dm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a9972ca2d4..20d3c77e13 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -81,6 +81,21 @@ crate_name = "emergency crate" crate_type = /obj/structure/closet/crate/internals +/datum/supply_pack/emergency/radiatione_emergency + name = "Emergenc Radiation Protection Crate" + desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a few pill bottles that are able to handles radiation and the affects of the poisoning." + cost = 2500 + contains = list(/obj/item/clothing/head/radiation, + /obj/item/clothing/head/radiation, + /obj/item/clothing/suit/radiation, + /obj/item/clothing/suit/radiation, + /obj/item/geiger_counter, + /obj/item/geiger_counter, + /obj/item/storage/pill_bottle/mutarad, + /obj/item/storage/firstaid/radbgone) + crate_name = "radiation protection crate" + crate_type = /obj/structure/closet/crate/radiation + /datum/supply_pack/emergency/rcds name = "Emergency RCDs" desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!" @@ -1332,6 +1347,19 @@ /obj/item/storage/firstaid/o2) crate_name = "oxygen deprivation kit crate" +/datum/supply_pack/medical/advrad + name = "Radiation Treatment Crate Deluxe" + desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pill bottle, as well as a radiation treatment deluxe pill bottle!" + cost = 3500 + contains = list(/obj/item/storage/pill_bottle/antirad+, + /obj/item/storage/pill_bottle/mutarad, + /obj/item/storage/firstaid/radbgone, + /obj/item/storage/firstaid/radbgone, + /obj/item/geiger_counter, + /obj/item/geiger_counter) + crate_name = "radiation protection crate" + crate_type = /obj/structure/closet/crate/radiation + /datum/supply_pack/medical/surgery name = "Surgical Supplies Crate" desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed." From 0bf8d345e24eba72f6d13e364d191f3e81033cd3 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 15:52:46 -0400 Subject: [PATCH 07/11] Update pill.dm --- code/modules/reagents/reagent_containers/pill.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index a5f01f04ad..792d2014b1 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -173,7 +173,7 @@ list_reagents = list("potass_iodide" = 50) roundstart = 1 -/obj/item/reagent_containers/pill/antirad+ +/obj/item/reagent_containers/pill/antirad_plus name = "prussian blue pill" desc = "Used to treat heavy radition poisoning." icon = 'modular_citadel/icons/obj/modularpills.dmi' From 003dd6d93d1331435f58a102e2607156650139df Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 15:53:36 -0400 Subject: [PATCH 08/11] + is bad I guess --- code/game/objects/items/storage/firstaid.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 589e23240d..1455a58493 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -115,7 +115,7 @@ if(prob(50)) new /obj/item/reagent_containers/pill/mutarad(src) if(prob(80)) - new /obj/item/reagent_containers/pill/antirad+(src) + new /obj/item/reagent_containers/pill/antirad_plus(src) new /obj/item/reagent_containers/syringe/charcoal(src) new /obj/item/storage/pill_bottle/charcoal(src) new /obj/item/reagent_containers/pill/mutadone(src) @@ -297,13 +297,13 @@ for(var/i in 1 to 5) new /obj/item/reagent_containers/pill/aranesp(src) -/obj/item/storage/pill_bottle/antirad+ +/obj/item/storage/pill_bottle/antirad_plus name = "anti radiation deluxe pill bottle" desc = "The label says 'Med-Co branded pills'." /obj/item/storage/pill_bottle/antirad+/PopulateContents() for(var/i in 1 to 7) - new /obj/item/reagent_containers/pill/antirad+(src) + new /obj/item/reagent_containers/pill/antirad_plus(src) /obj/item/storage/pill_bottle/mutarad name = "radiation treatment deluxe pill bottle" From 3e023df8befc46518fef932ccb13d9f4c5048a24 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 16:09:45 -0400 Subject: [PATCH 09/11] Update packs.dm --- code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 20d3c77e13..0d0e9057aa 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1351,7 +1351,7 @@ name = "Radiation Treatment Crate Deluxe" desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pill bottle, as well as a radiation treatment deluxe pill bottle!" cost = 3500 - contains = list(/obj/item/storage/pill_bottle/antirad+, + contains = list(/obj/item/storage/pill_bottle/antirad_plus, /obj/item/storage/pill_bottle/mutarad, /obj/item/storage/firstaid/radbgone, /obj/item/storage/firstaid/radbgone, From b096e2f4cf2d4d306aac8f3194698839a006c0a6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 16:27:21 -0400 Subject: [PATCH 10/11] Hmm cat brain fails --- code/modules/reagents/chemistry/reagents/medicine_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 46a19ac806..3970e8157b 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -469,9 +469,9 @@ description = "Efficiently restores heavy radiation damage." reagent_state = LIQUID color = "#003153" // RGB 0, 49, 83 - metabolization_rate = .5 * REAGENTS_METABOLISM + metabolization_rate = 0.5 * REAGENTS_METABOLISM -/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/carbon/M) +/datum/reagent/medicine/prussian_blue/on_mob_life(mob/living/carbon/M) if(M.radiation > 0) M.radiation -= min(M.radiation, 20) ..() From 9ab2bf386053c11cd7a394a7cc6a391b982a7c60 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Apr 2019 16:28:18 -0400 Subject: [PATCH 11/11] + <-- BAD --- code/game/objects/items/storage/firstaid.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 1455a58493..079feec17a 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -301,7 +301,7 @@ name = "anti radiation deluxe pill bottle" desc = "The label says 'Med-Co branded pills'." -/obj/item/storage/pill_bottle/antirad+/PopulateContents() +/obj/item/storage/pill_bottle/antirad_plus/PopulateContents() for(var/i in 1 to 7) new /obj/item/reagent_containers/pill/antirad_plus(src)