cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

More medicine fixes

Browse Source
This commit is contained in:
Unknown
2021-06-22 11:13:18 -04:00
parent e3d33334d6
commit e5891bc972
8 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/firstaid.dm
+1 -1
View File
@@ -167,7 +167,7 @@
name = "bone repair kit"
desc = "Contains chemicals to mend broken bones."
max_storage_space = ITEMSIZE_COST_SMALL * 7
starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed = 8)
starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed = 8)
/*
* Pill Bottles
code/game/objects/items/weapons/storage/quickdraw.dm
+12 -3
View File
@@ -93,7 +93,16 @@
desc = "A small case for safely carrying sharps around. This one is deluxe!"
max_w_class = ITEMSIZE_SMALL
starts_with = list(
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed
/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed
)
/obj/item/weapon/storage/quickdraw/syringe_case/clonemed
desc = "A small case for safely carrying sharps around. This one is deluxe!"
max_w_class = ITEMSIZE_SMALL
starts_with = list(
/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed
)
code/game/objects/random/unidentified/medicine.dm
+10 -5
View File
@@ -19,6 +19,8 @@ much more likely to show up. This is done for several purposes;
/obj/random/unidentified_medicine/item_to_spawn()
return pick(
/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified,
@@ -27,7 +29,6 @@ much more likely to show up. This is done for several purposes;
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified,
@@ -65,6 +66,8 @@ much more likely to show up. This is done for several purposes;
// 75 Good, 25 Bad. 75% chance of getting something good.
// Good odds, but the contents aren't super great unless someone gets lucky.
return pick(
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified,
@@ -73,7 +76,6 @@ much more likely to show up. This is done for several purposes;
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed/unidentified,
prob(25);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified)
// For military PoIs like BSD. High odds of good loot since those PoIs are really hard.
@@ -82,12 +84,13 @@ much more likely to show up. This is done for several purposes;
// 75 Good, 30 Bad, roughly 71.4% chance to get something good.
// Very high but very hard to reach and still has a chance of ending poorly if injecting blind.
return pick(
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed/unidentified,
prob(30);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified,
prob(30);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified)
@@ -98,10 +101,11 @@ much more likely to show up. This is done for several purposes;
// 65 Good, 160 Bad, roughly 28.8% to get something good.
// Poor odds, but there are a lot of these scattered in the drug dens and illegal chem labs.
return pick(
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed/unidentified,
prob(40);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified,
prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified,
prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/space_drugs/unidentified,
@@ -120,9 +124,10 @@ much more likely to show up. This is done for several purposes;
// 45 Good, 45 Bad, 50% chance to get something good.
// Do you feel lucky?
return pick(
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/clonemed/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed/unidentified,
prob(10);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified,
prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified,
prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified,