From 2eee0ea4d086d0c14cc1701c67e56cd469e14a8d Mon Sep 17 00:00:00 2001 From: Iglpigl <61051786+Iglpigl@users.noreply.github.com> Date: Mon, 2 Jan 2023 11:11:26 +0100 Subject: [PATCH 1/2] fix --- .../structures/crates_lockers/closets/secure/security.dm | 4 ++-- code/modules/reagents/reagent_containers/syringes.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 07ec0af0ddb..677969bc6a0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -200,8 +200,8 @@ icon_state = "secure" /obj/structure/closet/secure_closet/injection/populate_contents() - new /obj/item/reagent_containers/syringe/ld50_syringe/choral(src) - new /obj/item/reagent_containers/syringe/ld50_syringe/choral(src) + new /obj/item/reagent_containers/syringe/ld50_syringe/pacid(src) + new /obj/item/reagent_containers/syringe/ld50_syringe/pacid(src) /obj/structure/closet/secure_closet/brig name = "brig locker" diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index c64332ab325..1e1ebfcfc76 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -450,8 +450,8 @@ spawn_tags = SPAWN_ITEM_CONTRABAND rarity_value = 40 -/obj/item/reagent_containers/syringe/ld50_syringe/choral - preloaded_reagents = list("chloralhydrate" = 50) +/obj/item/reagent_containers/syringe/ld50_syringe/pacid + preloaded_reagents = list("pacid" = 50) /obj/item/reagent_containers/syringe/stim name = "syringe (stim)" From a229e130b8dad9eff0d61f3e4490e2af36b9e069 Mon Sep 17 00:00:00 2001 From: Iglpigl <61051786+Iglpigl@users.noreply.github.com> Date: Mon, 2 Jan 2023 12:14:40 +0100 Subject: [PATCH 2/2] no acids --- .../structures/crates_lockers/closets/secure/security.dm | 4 ++-- code/modules/reagents/reagent_containers/syringes.dm | 4 ++-- code/modules/reagents/reagents/toxins.dm | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 677969bc6a0..7ef9b85b928 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -200,8 +200,8 @@ icon_state = "secure" /obj/structure/closet/secure_closet/injection/populate_contents() - new /obj/item/reagent_containers/syringe/ld50_syringe/pacid(src) - new /obj/item/reagent_containers/syringe/ld50_syringe/pacid(src) + new /obj/item/reagent_containers/syringe/ld50_syringe/chlorine(src) + new /obj/item/reagent_containers/syringe/ld50_syringe/chlorine(src) /obj/structure/closet/secure_closet/brig name = "brig locker" diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 1e1ebfcfc76..9dff5f871bc 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -450,8 +450,8 @@ spawn_tags = SPAWN_ITEM_CONTRABAND rarity_value = 40 -/obj/item/reagent_containers/syringe/ld50_syringe/pacid - preloaded_reagents = list("pacid" = 50) +/obj/item/reagent_containers/syringe/ld50_syringe/chlorine + preloaded_reagents = list("chlorine" = 25, "chloralhydrate" = 25) /obj/item/reagent_containers/syringe/stim name = "syringe (stim)" diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm index 3da87d02e86..772253222e4 100644 --- a/code/modules/reagents/reagents/toxins.dm +++ b/code/modules/reagents/reagents/toxins.dm @@ -826,6 +826,7 @@ /datum/reagent/toxin/chlorine name = "Chlorine" + id = "chlorine" description = "A highly poisonous liquid. Smells strongly of bleach." reagent_state = LIQUID taste_description = "bleach"