Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/modules/reagents/reagent_containers/blood_pack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
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)
. = ..()
if (!blood_type)
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))
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
48 changes: 0 additions & 48 deletions modular_darkpack/modules/drugs/code/bloodpacks/cokepack.dm

This file was deleted.

48 changes: 0 additions & 48 deletions modular_darkpack/modules/drugs/code/bloodpacks/methpack.dm

This file was deleted.

48 changes: 0 additions & 48 deletions modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm

This file was deleted.

2 changes: 0 additions & 2 deletions modular_darkpack/modules/drugs/code/drugs_globals.dm

This file was deleted.

1 change: 0 additions & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DM Environment file for tgstation.dme.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\area_dwelling.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\_dwelling_gvars_defines.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\quirks\code\quirks.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\bloodpack_adulteration.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\werewolf_the_apocalypse\code\old\gifts.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\werewolf_the_apocalypse\code\gifts\tribes\tribes.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\weather\code\weather.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\computer.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\app.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\app_types.dm.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.

Expand Down Expand Up @@ -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"
Expand Down
Loading