cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into final_master_push

Browse Source
This commit is contained in:
alberyk
2022-04-09 18:08:53 -03:00
parent 951eea5be4 3d937e6ff9
commit ad8932a15c
37 changed files with 868 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/contraband.dm
+11 -5
View File
@@ -11,10 +11,15 @@
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"
/obj/item/storage/pill_bottle/joy
name = "bottle of Joy pills"
desc = "Highly illegal drug. Bang - and your stress is gone."
starts_with = list(/obj/item/reagent_containers/pill/tranquility = 7)
starts_with = list(/obj/item/reagent_containers/pill/joy = 3)
/obj/item/storage/pill_bottle/smart
name = "bottle of Smart pills"
desc = "Highly illegal drug. For exam season."
starts_with = list(/obj/item/reagent_containers/pill/skrell_nootropic = 7)
/obj/item/reagent_containers/glass/beaker/vial/random
flags = 0
@@ -27,8 +32,9 @@
list(/decl/reagent/toxin/carpotoxin = 15) = 2,
list(/decl/reagent/impedrezene = 15) = 2,
list(/decl/reagent/toxin/dextrotoxin = 10) = 1,
list(/decl/reagent/mental/neurapan = 15) = 2,
list(/decl/reagent/toxin/spectrocybin = 15) = 1)
list(/decl/reagent/toxin/spectrocybin = 15) = 1,
list(/decl/reagent/joy = 10, /decl/reagent/water = 20) = 1,
list(/decl/reagent/ammonia = 15) = 3)
/obj/item/reagent_containers/glass/beaker/vial/random/Initialize()
. = ..()
code/game/objects/items/weapons/storage/firstaid.dm
+3 -2
View File
@@ -45,10 +45,11 @@
/obj/item/storage/firstaid/regular
icon_state = "firstaid"
starts_with = list(
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
/obj/item/device/healthanalyzer = 1,
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1,
/obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1
)
/obj/item/storage/firstaid/toxin