diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index b1bb0d4ec655..5ee03126b6ef 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -8,6 +8,7 @@ obj_flags = UNIQUE_RENAME | RENAME_NO_DESC var/blood_type = null var/labeled = FALSE + var/start_blood_amount = 200 // DARKPACK EDIT ADD /obj/item/reagent_containers/blood/Initialize(mapload, vol) . = ..() @@ -15,7 +16,7 @@ return var/datum/blood_type/bloodtype = get_blood_type(blood_type) // Blood pack blood is halfway synthetic, meaning instead of a maximum of like 6 blood worms being able to become adults via 2 freezers, only 3 or so can. - reagents.add_reagent(bloodtype.reagent_type, volume, list("blood_type" = bloodtype, "blood_DNA" = bloodtype.dna_string, BLOOD_DATA_SYNTH_CONTENT = 0.5), creation_callback = CALLBACK(src, PROC_REF(on_blood_created))) + reagents.add_reagent(bloodtype.reagent_type, start_blood_amount, list("blood_type" = bloodtype, "blood_DNA" = bloodtype.dna_string, BLOOD_DATA_SYNTH_CONTENT = 0.5), creation_callback = CALLBACK(src, PROC_REF(on_blood_created))) // DARKPACK EDIT CHANGE /obj/item/reagent_containers/blood/proc/on_blood_created(datum/reagent/new_blood) new_blood.AddElement(/datum/element/blood_reagent, null, get_blood_type(blood_type)) diff --git a/modular_darkpack/modules/drugs/code/bloodpacks/bloodpack_adulteration.dm b/modular_darkpack/modules/drugs/code/bloodpacks/bloodpack_adulteration.dm index 45398cc6fd52..e8c921839d09 100644 --- a/modular_darkpack/modules/drugs/code/bloodpacks/bloodpack_adulteration.dm +++ b/modular_darkpack/modules/drugs/code/bloodpacks/bloodpack_adulteration.dm @@ -1,23 +1,13 @@ -/datum/crafting_recipe/methpack - name = "Make Meth Adulterated Bloodpack" - time = 25 - reqs = list(/datum/reagent/drug/methamphetamine = 30, /obj/item/reagent_containers/blood = 1) - result = /obj/item/reagent_containers/drug/methpack - always_available = TRUE - category = CAT_DRUGS +/obj/item/reagent_containers/blood/random/drug_filled + start_blood_amount = 180 // Leave room for the drugs. -/datum/crafting_recipe/morphpack_reagent - name = "Make Morphine Adulterated Bloodpack" - time = 25 - reqs = list(/datum/reagent/medicine/morphine = 15, /obj/item/reagent_containers/blood = 1) - result = /obj/item/reagent_containers/drug/morphpack - always_available = TRUE - category = CAT_DRUGS +/obj/item/reagent_containers/blood/random/drug_filled/meth + list_reagents = list(/datum/reagent/drug/methamphetamine = 15) + start_blood_amount = 185 -/datum/crafting_recipe/cokepack - name = "Make Cocaine Adulterated Bloodpack" - time = 25 - reqs = list(/datum/reagent/drug/methamphetamine/cocaine = 30, /obj/item/reagent_containers/blood = 1) - result = /obj/item/reagent_containers/drug/cokepack - always_available = TRUE - category = CAT_DRUGS +/obj/item/reagent_containers/blood/random/drug_filled/coke + list_reagents = list(/datum/reagent/drug/methamphetamine/cocaine = 15) + start_blood_amount = 185 + +/obj/item/reagent_containers/blood/random/drug_filled/morphine + list_reagents = list(/datum/reagent/toxin/chloralhydrate = 10, /datum/reagent/medicine/morphine = 10) diff --git a/modular_darkpack/modules/drugs/code/bloodpacks/cokepack.dm b/modular_darkpack/modules/drugs/code/bloodpacks/cokepack.dm deleted file mode 100644 index 0ed5ffb37902..000000000000 --- a/modular_darkpack/modules/drugs/code/bloodpacks/cokepack.dm +++ /dev/null @@ -1,48 +0,0 @@ -/obj/item/reagent_containers/drug/cokepack - name = "\improper elite blood pack (full)" - desc = "Fast way to feed your inner beast." - icon = 'modular_darkpack/modules/deprecated/icons/items.dmi' - icon_state = "blood4" - inhand_icon_state = "blood4" - lefthand_file = 'modular_darkpack/modules/deprecated/icons/lefthand.dmi' - righthand_file = 'modular_darkpack/modules/deprecated/icons/righthand.dmi' - ONFLOOR_ICON_HELPER('modular_darkpack/modules/deprecated/icons/onfloor.dmi') - list_reagents = list(/datum/reagent/drug/methamphetamine/cocaine = 15) //some of the source chemicals are lost in the process - resistance_flags = FREEZE_PROOF - item_flags = NOBLUDGEON - w_class = WEIGHT_CLASS_SMALL - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100) - resistance_flags = FIRE_PROOF | ACID_PROOF - - var/empty = FALSE - var/feeding = FALSE - var/amount_of_bloodpoints = 4 - var/vitae = FALSE - -/obj/item/reagent_containers/drug/cokepack/attack(mob/living/M, mob/living/user) - . = ..() - if(!iskindred(M)) - if(!vitae) - return - if(empty) - return - feeding = TRUE - if(do_mob(user, src, 3 SECONDS)) - var/obj/item/reagent_containers/drug/cokepack/H = new(src) //setting up the drugged bag in question (and its contents) as a variable to be called later - feeding = FALSE - empty = TRUE - icon_state = "blood0" - inhand_icon_state = "blood0" - name = "\improper drinkable blood pack (empty)" - M.adjust_blood_pool(amount_of_bloodpoints) - M.adjust_brute_loss(-20, TRUE) - M.adjust_fire_loss(-20, TRUE) - M.update_damage_overlays() - M.update_health_hud() - if(iskindred(M)) - H.reagents.trans_to(M, min(10, H.reagents.total_volume), transfered_by = H, methods = INGEST) //calling the earlier variable to transfer to target, M - playsound(M.loc,'sound/items/drink.ogg', 50, TRUE) - return - else - feeding = FALSE - return diff --git a/modular_darkpack/modules/drugs/code/bloodpacks/methpack.dm b/modular_darkpack/modules/drugs/code/bloodpacks/methpack.dm deleted file mode 100644 index f3bcb3d9d75b..000000000000 --- a/modular_darkpack/modules/drugs/code/bloodpacks/methpack.dm +++ /dev/null @@ -1,48 +0,0 @@ -/obj/item/reagent_containers/drug/methpack - name = "\improper elite blood pack (full)" - desc = "Fast way to feed your inner beast." - icon = 'modular_darkpack/modules/deprecated/icons/items.dmi' - icon_state = "blood4" - inhand_icon_state = "blood4" - lefthand_file = 'modular_darkpack/modules/deprecated/icons/lefthand.dmi' - righthand_file = 'modular_darkpack/modules/deprecated/icons/righthand.dmi' - ONFLOOR_ICON_HELPER('modular_darkpack/modules/deprecated/icons/onfloor.dmi') - list_reagents = list(/datum/reagent/drug/methamphetamine = 15) //some of the source chemicals are lost in the process - resistance_flags = FREEZE_PROOF - item_flags = NOBLUDGEON - w_class = WEIGHT_CLASS_SMALL - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100) - resistance_flags = FIRE_PROOF | ACID_PROOF - - var/empty = FALSE - var/feeding = FALSE - var/amount_of_bloodpoints = 4 - var/vitae = FALSE - -/obj/item/reagent_containers/drug/methpack/attack(mob/living/M, mob/living/user) - . = ..() - if(!iskindred(M)) - if(!vitae) - return - if(empty) - return - feeding = TRUE - if(do_mob(user, src, 3 SECONDS)) - var/obj/item/reagent_containers/drug/methpack/H = new(src) //setting up the drugged bag in question (and its contents) as a variable to be called later - feeding = FALSE - empty = TRUE - icon_state = "blood0" - inhand_icon_state = "blood0" - name = "\improper drinkable blood pack (empty)" - M.adjust_blood_pool(amount_of_bloodpoints) - M.adjust_brute_loss(-20, TRUE) - M.adjust_fire_loss(-20, TRUE) - M.update_damage_overlays() - M.update_health_hud() - if(iskindred(M)) - H.reagents.trans_to(M, min(10, H.reagents.total_volume), transfered_by = H, methods = INGEST) //calling the earlier variable to transfer to target, M - playsound(M.loc,'sound/items/drink.ogg', 50, TRUE) - return - else - feeding = FALSE - return diff --git a/modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm b/modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm deleted file mode 100644 index 7d1f1e03dfb6..000000000000 --- a/modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm +++ /dev/null @@ -1,48 +0,0 @@ -/obj/item/reagent_containers/drug/morphpack - name = "\improper elite blood pack (full)" - desc = "Fast way to feed your inner beast." - icon = 'modular_darkpack/modules/deprecated/icons/items.dmi' - icon_state = "blood4" - inhand_icon_state = "blood4" - lefthand_file = 'modular_darkpack/modules/deprecated/icons/lefthand.dmi' - righthand_file = 'modular_darkpack/modules/deprecated/icons/righthand.dmi' - ONFLOOR_ICON_HELPER('modular_darkpack/modules/deprecated/icons/onfloor.dmi') - list_reagents = list(/datum/reagent/toxin/chloralhydrate = 10, /datum/reagent/medicine/morphine = 10) //some of the source chemicals are lost in the process - resistance_flags = FREEZE_PROOF - item_flags = NOBLUDGEON - w_class = WEIGHT_CLASS_SMALL - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100) - resistance_flags = FIRE_PROOF | ACID_PROOF - - var/empty = FALSE - var/feeding = FALSE - var/amount_of_bloodpoints = 4 - var/vitae = FALSE - -/obj/item/reagent_containers/drug/morphpack/attack(mob/living/M, mob/living/user) - . = ..() - if(!iskindred(M)) - if(!vitae) - return - if(empty) - return - feeding = TRUE - if(do_mob(user, src, 3 SECONDS)) - var/obj/item/reagent_containers/drug/morphpack/H = new(src) //setting up the drugged bag in question (and its contents) as a variable to be called later - feeding = FALSE - empty = TRUE - icon_state = "blood0" - inhand_icon_state = "blood0" - name = "\improper drinkable blood pack (empty)" - M.adjust_blood_pool(amount_of_bloodpoints) - M.adjust_brute_loss(-20, TRUE) - M.adjust_fire_loss(-20, TRUE) - M.update_damage_overlays() - M.update_health_hud() - if(iskindred(M)) - H.reagents.trans_to(M, min(10, H.reagents.total_volume), transfered_by = H, methods = INGEST) //calling the earlier variable to transfer to target, M - playsound(M.loc,'sound/items/drink.ogg', 50, TRUE) - return - else - feeding = FALSE - return diff --git a/modular_darkpack/modules/drugs/code/drugs_globals.dm b/modular_darkpack/modules/drugs/code/drugs_globals.dm deleted file mode 100644 index 42fe9cbd854e..000000000000 --- a/modular_darkpack/modules/drugs/code/drugs_globals.dm +++ /dev/null @@ -1,2 +0,0 @@ -/// List of all weed trays for processing in the snowflake weed subsystem -GLOBAL_LIST_EMPTY(weed_list) diff --git a/tgstation.dme b/tgstation.dme index 16f285eae546..9b084a0a08ab 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7105,7 +7105,6 @@ #include "modular_darkpack\modules\doors\code\keys\keys.dm" #include "modular_darkpack\modules\doors\code\keys\keys_npc.dm" #include "modular_darkpack\modules\doors\code\keys\lockpick.dm" -#include "modular_darkpack\modules\drugs\code\drugs_globals.dm" #include "modular_darkpack\modules\drugs\code\meth\baggie.dm" #include "modular_darkpack\modules\drugs\code\meth\methlab.dm" #include "modular_darkpack\modules\drugs\code\meth\pills.dm"