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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes CBZ #3353

Merged
merged 1 commit into from Jan 11, 2021
Merged

Removes CBZ #3353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions code/modules/cargo/packs.dm
View file
Open in desktop
Expand Up @@ -478,13 +478,6 @@
/obj/item/clothing/suit/armor/bulletproof)
crate_name = "bulletproof armor crate"

/datum/supply_pack/security/armory/cling_test
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Who the hell thought this was a good idea?

name = "Changeling Testing Kit"
desc = "Contains a single bottle of concentrated BZ, used for detecting and incapacitating changelings. Due to the rarity of this chemical, the cost is extortionate, and security personnel are recommended to visit their local chemistry department instead if possible. Requires Armory access to open."
cost = 10000
contains = list(/obj/item/reagent_containers/glass/bottle/concentrated_bz)
crate_name = "Changeling testing kit crate"

/datum/supply_pack/security/armory/chemimp
name = "Chemical Implants Crate"
desc = "Contains five Remote Chemical implants. Requires Armory access to open."
Expand Down
41 changes: 0 additions & 41 deletions code/modules/reagents/chemistry/reagents/other_reagents.dm
View file
Open in desktop
Expand Up @@ -1904,47 +1904,6 @@
changeling.chem_charges = max(changeling.chem_charges-2, 0)
return ..()

/datum/reagent/concentrated_bz
name = "Concentrated BZ"
description = "A hyperconcentrated liquid form of BZ gas, known to cause an extremely adverse reaction to changelings. Also causes minor brain damage."
color = "#FAFF00"
taste_description = "acrid cinnamon"
random_unrestricted = FALSE

/datum/reagent/concentrated_bz/on_mob_metabolize(mob/living/L)
..()
ADD_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type)

/datum/reagent/concentrated_bz/on_mob_end_metabolize(mob/living/L)
..()
REMOVE_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type)

/datum/reagent/concentrated_bz/on_mob_life(mob/living/L)
if(L.mind)
var/datum/antagonist/changeling/changeling = L.mind.has_antag_datum(/datum/antagonist/changeling)
if(changeling)
changeling.chem_charges = max(changeling.chem_charges-2, 0)
if(prob(30))
L.losebreath += 1
L.adjustOxyLoss(3,5)
L.emote("gasp")
to_chat(L, "<font size=3 color=red><b>You can't breathe!</b></font>")

L.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 50)
return ..()

/datum/reagent/fake_cbz
name = "Concentrated BZ"
description = "A hyperconcentrated liquid form of BZ gas, known to cause an extremely adverse reaction to changelings. Also causes minor brain damage."
color = "#FAFF00"
taste_description = "acrid cinnamon"
random_unrestricted = FALSE

/datum/reagent/fake_cbz/on_mob_life(mob/living/L)
L.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 50)
if(prob(15))
to_chat(L, "You don't feel much of anything")

/datum/reagent/pax/peaceborg
name = "Synthpax"
description = "A colorless liquid that suppresses violent urges in its subjects. Cheaper to synthesize than normal Pax, but wears off faster."
Expand Down
12 changes: 0 additions & 12 deletions code/modules/reagents/chemistry/recipes/others.dm
View file
Open in desktop
Expand Up @@ -37,18 +37,6 @@
results = list(/datum/reagent/impedrezene = 2)
required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1)

/datum/chemical_reaction/concentrated_bz
name = "Concentrated BZ"
id = "Concentrated BZ"
results = list(/datum/reagent/concentrated_bz = 10)
required_reagents = list(/datum/reagent/toxin/plasma = 40, /datum/reagent/nitrous_oxide = 10)

/datum/chemical_reaction/fake_cbz
name = "Fake CBZ"
id = "Fake CBZ"
results = list(/datum/reagent/fake_cbz = 1)
required_reagents = list(/datum/reagent/concentrated_bz = 1, /datum/reagent/medicine/neurine = 3)

/datum/chemical_reaction/cryptobiolin
name = "Cryptobiolin"
id = /datum/reagent/cryptobiolin
Expand Down
5 changes: 0 additions & 5 deletions code/modules/reagents/reagent_containers/bottle.dm
View file
Open in desktop
Expand Up @@ -82,11 +82,6 @@
desc = "A small bottle of cryostylane. It feels cold to the touch"
list_reagents = list(/datum/reagent/cryostylane = 30)

/obj/item/reagent_containers/glass/bottle/concentrated_bz
name = "concentrated BZ bottle"
desc = "A small bottle of concentrated BZ"
list_reagents = list(/datum/reagent/concentrated_bz = 30)

/obj/item/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle of ammonia."
Expand Down