cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chemical Improvements & Tweaks: Side-effects, overdoses, and more. (#9708)

Browse Source
This commit is contained in:
sadkermit
2020-09-01 13:29:40 +01:00
committed by GitHub
parent 47fbd436df
commit 36dc8a5220
30 changed files with 727 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/contraband.dm
View File

@@ -11,6 +11,11 @@
desc = "Highly illegal drug. Trade brain for speed."
starts_with = list(/obj/item/reagent_containers/pill/zoom = 7)
/obj/item/storage/pill_bottle/tranquility
name = "bottle of Tranquility pills"
desc = "Highly illegal drug. Bang - and your stress is gone."
starts_with = list(/obj/item/reagent_containers/pill/tranquility = 7)
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
var/list/random_reagent_list = list(list(/datum/reagent/water = 15) = 1, list(/datum/reagent/spacecleaner = 15) = 1)
@@ -18,9 +23,12 @@
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
random_reagent_list = list(
list(/datum/reagent/mindbreaker = 10, /datum/reagent/space_drugs = 20) = 3,
list(/datum/reagent/mercury = 15) = 3,
list(/datum/reagent/toxin/carpotoxin = 15) = 2,
list(/datum/reagent/impedrezene = 15) = 2,
list(/datum/reagent/toxin/dextrotoxin = 10) = 1)
list(/datum/reagent/toxin/dextrotoxin = 10) = 1,
list(/datum/reagent/mental/neurapan = 15) = 2,
list(/datum/reagent/toxin/spectrocybin = 15) = 1)
/obj/item/reagent_containers/glass/beaker/vial/random/Initialize()
. = ..()

59
code/game/objects/items/weapons/storage/firstaid.dm
View File

@@ -95,12 +95,12 @@
icon_state = "bezerk"
item_state = "bezerk"
starts_with = list(
/obj/item/storage/pill_bottle/bicaridine = 1,
/obj/item/storage/pill_bottle/butazoline = 1,
/obj/item/storage/pill_bottle/dermaline = 1,
/obj/item/storage/pill_bottle/dexalin_plus = 1,
/obj/item/storage/pill_bottle/dylovene = 1,
/obj/item/storage/pill_bottle/mortaphenyl = 1,
/obj/item/reagent_containers/inhaler/hyperzine = 1,
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 1,
/obj/item/stack/medical/splint = 1
)
@@ -135,8 +135,10 @@
icon_state = "brute"
item_state = "brute"
starts_with = list(
/obj/item/stack/medical/bruise_pack = 4,
/obj/item/stack/medical/advanced/bruise_pack = 2
/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/advanced/bruise_pack = 2,
/obj/item/reagent_containers/pill/bicaridine = 2,
/obj/item/device/healthanalyzer = 1
)
/*
@@ -183,61 +185,66 @@
/obj/item/storage/pill_bottle/antitox
name = "bottle of Dylovene pills"
desc = "Contains pills used to counter toxins."
name = "bottle of 10u Dylovene pills"
desc = "Contains pills used to remove toxic substances from the blood."
starts_with = list(/obj/item/reagent_containers/pill/antitox = 7)
/obj/item/storage/pill_bottle/bicaridine
name = "bottle of Bicaridine pills"
desc = "Contains pills used to stabilize the severely injured."
name = "bottle of 10u Bicaridine pills"
desc = "Contains pills used to treat minor injuries and bleeding."
starts_with = list(/obj/item/reagent_containers/pill/bicaridine = 7)
/obj/item/storage/pill_bottle/dexalin_plus
name = "bottle of Dexalin Plus pills"
name = "bottle of 15u Dexalin Plus pills"
desc = "Contains pills used to treat extreme cases of oxygen deprivation."
starts_with = list(/obj/item/reagent_containers/pill/dexalin_plus = 7)
/obj/item/storage/pill_bottle/dermaline
name = "bottle of Dermaline pills"
desc = "Contains pills used to treat burn wounds."
name = "bottle of 10u Dermaline pills"
desc = "Contains pills used to treat severe burn wounds."
starts_with = list(/obj/item/reagent_containers/pill/dermaline = 7)
/obj/item/storage/pill_bottle/dylovene
name = "bottle of Dylovene pills"
desc = "Contains pills used to treat toxic substances in the blood."
name = "bottle of 15u Dylovene pills"
desc = "Contains pills used to remove toxic substances from the blood."
starts_with = list(/obj/item/reagent_containers/pill/dylovene = 7)
/obj/item/storage/pill_bottle/inaprovaline
name = "bottle of Inaprovaline pills"
desc = "Contains pills used to stabilize patients."
name = "bottle of 10u Inaprovaline pills"
desc = "Contains pills used to stabilize a patient's heart activity."
starts_with = list(/obj/item/reagent_containers/pill/inaprovaline = 7)
/obj/item/storage/pill_bottle/kelotane
name = "bottle of Kelotane pills"
desc = "Contains pills used to treat burns."
name = "bottle of 10u Kelotane pills"
desc = "Contains pills used to treat minor burns."
starts_with = list(/obj/item/reagent_containers/pill/kelotane = 7)
obj/item/storage/pill_bottle/butazoline
name = "bottle of 10u Butazoline pills"
desc = "Contains pills used to severe injuries and bleeding."
starts_with = list(/obj/item/reagent_containers/pill/butazoline = 7)
/obj/item/storage/pill_bottle/cetahydramine
name = "bottle of Cetahydramine pills"
desc = "Often compared to ancient brands, Cetahydramine is a modern chem used to reduce symptoms of allergies. Helps with sneezing."
name = "bottle of 5u Cetahydramine pills"
desc = "Contains pills used to treat coughing, sneezing and itching."
starts_with = list(/obj/item/reagent_containers/pill/cetahydramine = 7)
/obj/item/storage/pill_bottle/mortaphenyl
name = "bottle of Mortaphenyl pills"
desc = "Contains pills used to relieve pain."
name = "bottle of 10u Mortaphenyl pills"
desc = "Contains pills used to relieve severe pain in a trauma setting."
starts_with = list(/obj/item/reagent_containers/pill/mortaphenyl = 7)
/obj/item/storage/pill_bottle/perconol
name = "bottle of Perconol pills"
desc = "Contains pills used to relieve pain and reduce fevers."
name = "bottle of 10u Perconol pills"
desc = "Contains pills used to relieve minor-moderate pain and reduce fevers."
starts_with = list(/obj/item/reagent_containers/pill/perconol = 7)
/obj/item/storage/pill_bottle/minaphobin
name = "bottle of Minaphobin pills"
desc = "Contains pills used to stabilize a patient's mood."
name = "bottle of 5u Minaphobin pills"
desc = "Contains pills used to treat anxiety disorders and depression."
starts_with = list(/obj/item/reagent_containers/pill/minaphobin = 7)
/obj/item/storage/pill_bottle/rmt
name = "bottle of RMT pills"
name = "bottle of 15u RMT pills"
desc = "Contains pills used to remedy the effects of prolonged zero-gravity adaptations."
starts_with = list(/obj/item/reagent_containers/pill/rmt = 7)

7
code/game/objects/items/weapons/storage/uplink_kits.dm
View File

@@ -242,3 +242,10 @@
/obj/item/storage/box/syndie_kit/random_weapon/Initialize()
.=..()
desc = "A sleek, sturdy box"
/obj/item/storage/box/syndie_kit/sideeffectbegone
name = "box of sideeffect-be-gone injectors"
desc = "Comes with 2x autoinjectors filled with drugs to counter chemical side-effects. Each injector has 2 uses."
starts_with = list(
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone = 2
)

6
code/game/objects/random/random.dm
View File

@@ -151,6 +151,7 @@
/obj/item/bodybag = 2,
/obj/item/bodybag/cryobag = 1,
/obj/item/storage/pill_bottle/kelotane = 2,
/obj/item/storage/pill_bottle/bicaridine = 2,
/obj/item/storage/pill_bottle/antitox = 2,
/obj/item/storage/pill_bottle/mortaphenyl = 2,
/obj/item/reagent_containers/syringe/dylovene = 2,
@@ -167,8 +168,9 @@
/obj/item/storage/firstaid/regular = 3,
/obj/item/storage/firstaid/toxin = 2,
/obj/item/storage/firstaid/o2 = 2,
/obj/item/storage/firstaid/adv = 1,
/obj/item/storage/firstaid/fire = 2
/obj/item/storage/firstaid/fire = 2,
/obj/item/storage/firstaid/brute = 1,
/obj/item/storage/firstaid/adv = 1
)
/obj/random/contraband