Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lethal injection fix #7958

Merged
merged 2 commits into from
Jan 6, 2023
Merged

Lethal injection fix #7958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eee0ea
fix
Iglpigl Jan 2, 2023
a229e13
no acids
Iglpigl Jan 2, 2023
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
4 changes: 2 additions & 2 deletions code/game/objects/structures/crates_lockers/closets/secure/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/chlorine(src)
new /obj/item/reagent_containers/syringe/ld50_syringe/chlorine(src)

/obj/structure/closet/secure_closet/brig
name = "brig locker"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/reagents/reagent_containers/syringes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/chlorine
preloaded_reagents = list("chlorine" = 25, "chloralhydrate" = 25)

/obj/item/reagent_containers/syringe/stim
name = "syringe (stim)"
Expand Down
1 change: 1 addition & 0 deletions code/modules/reagents/reagents/toxins.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down