From f01483494d063d60a60cb97728e2ba1dc5522054 Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Fri, 20 Dec 2024 16:23:40 +1000 Subject: [PATCH 1/4] killed --- code/__DEFINES/loadout.dm | 11 ++++------- .../objects/items/reagent_containers/autoinjectors.dm | 3 +-- code/game/objects/machinery/vending/vending_types.dm | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 93397daaae6..59433c1019a 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -102,9 +102,8 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list( /obj/structure/closet/crate/mortar_ammo/mortar_kit = list(CAT_MARINE, "Mortar kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"), /obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"), - /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"), - /obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjector", 10, "cyan"), - /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"), + /obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 10, "cyan"), + /obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_MARINE, "Synaptizine autoinjector", 14, "cyan"), /obj/vehicle/ridden/motorbike = list(CAT_MARINE, "Bike", 30, "blue"), /obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"), /obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "blue"), @@ -165,7 +164,6 @@ GLOBAL_LIST_INIT(medic_gear_listed_products, list( /obj/item/reagent_containers/glass/bottle/lemoline/doctor = list(CAT_MEDSUP, "Lemoline bottle", 14, "orange"), /obj/item/storage/pill_bottle/meralyne = list(CAT_MEDSUP, "Meralyne pills", 14, "orange"), /obj/item/storage/pill_bottle/dermaline = list(CAT_MEDSUP, "Dermaline pills", 14, "orange"), - /obj/item/storage/pill_bottle/russian_red = list(CAT_MEDSUP, "Red Russian pills", 12, "orange"), /obj/item/storage/pill_bottle/quickclot = list(CAT_MEDSUP, "Quickclot pills", 6, "orange"), /obj/item/storage/pill_bottle/peridaxon = list(CAT_MEDSUP, "Peridaxon pills", 6, "orange"), /obj/item/stack/medical/heal_pack/advanced/bruise_combat_pack = list(CAT_MEDSUP, "Combat Trauma Kit", 3, "orange"), @@ -180,7 +178,7 @@ GLOBAL_LIST_INIT(medic_gear_listed_products, list( /obj/item/reagent_containers/hypospray/advanced/dermaline = list(CAT_MEDSUP, "Hypospray (120u Dermaline)", 14, "cyan"), /obj/item/reagent_containers/hypospray/advanced/meraderm = list(CAT_MEDSUP, "Hypospray (120u Meraderm)", 14, "cyan"), /obj/item/reagent_containers/hypospray/advanced/nanoblood = list(CAT_MEDSUP, "Hypospray (60u Nanoblood)", 2, "cyan"), - /obj/item/reagent_containers/hypospray/advanced/russian_red = list(CAT_MEDSUP, "Hypospray (120u Russian Red)", 8, "cyan"), + /obj/item/reagent_containers/hypospray/advanced/russian_red = list(CAT_MEDSUP, "Hypospray (120u Russian Red)", 14, "cyan"), /obj/item/reagent_containers/hypospray/advanced/quickclot = list(CAT_MEDSUP, "Hypospray (120u Quickclot)", 4, "blue"), /obj/item/reagent_containers/hypospray/advanced/oxycodone = list(CAT_MEDSUP, "Hypospray (120u Oxycodone)", 12, "blue"), /obj/item/reagent_containers/hypospray/advanced/peridaxon = list(CAT_MEDSUP, "Hypospray (Peridaxon)", 7, "blue"), @@ -397,7 +395,6 @@ GLOBAL_LIST_INIT(synthetic_gear_listed_products, list( /obj/item/reagent_containers/glass/bottle/lemoline/doctor = list(CAT_SYNTH, "Lemoline bottle", 14, "orange"), /obj/item/storage/pill_bottle/meralyne = list(CAT_SYNTH, "Meralyne pills", 14, "orange"), /obj/item/storage/pill_bottle/dermaline = list(CAT_SYNTH, "Dermaline pills", 14, "orange"), - /obj/item/storage/pill_bottle/russian_red = list(CAT_SYNTH, "Red Russian pills", 12, "orange"), /obj/item/storage/pill_bottle/quickclot = list(CAT_SYNTH, "Quickclot pills", 6, "orange"), /obj/item/storage/pill_bottle/peridaxon = list(CAT_SYNTH, "Peridaxon pills", 6, "orange"), /obj/item/stack/medical/heal_pack/advanced/bruise_combat_pack = list(CAT_SYNTH, "Combat Trauma Kit", 3, "orange"), @@ -412,7 +409,7 @@ GLOBAL_LIST_INIT(synthetic_gear_listed_products, list( /obj/item/reagent_containers/hypospray/advanced/dermaline = list(CAT_SYNTH, "Hypospray (120u dermaline)", 14, "cyan"), //half the units of the derm case half the price /obj/item/reagent_containers/hypospray/advanced/meraderm = list(CAT_SYNTH, "Hypospray (120u Meraderm)", 14, "cyan"), //half the units of the meraderm case half the price /obj/item/reagent_containers/hypospray/advanced/nanoblood = list(CAT_SYNTH, "Hypospray (60u Nanoblood)", 2, "cyan"), //bit more than half of the nanoblood case - /obj/item/reagent_containers/hypospray/advanced/russian_red = list(CAT_SYNTH, "Hypospray (120u Russian Red)", 8, "cyan"), + /obj/item/reagent_containers/hypospray/advanced/russian_red = list(CAT_SYNTH, "Hypospray (120u Russian Red)", 16, "cyan"), /obj/item/reagent_containers/hypospray/advanced/quickclot = list(CAT_SYNTH, "Hypospray (120u Quickclot)", 4, "blue"), /obj/item/reagent_containers/hypospray/advanced/oxycodone = list(CAT_SYNTH, "Hypospray (120u Oxycodone)", 12, "blue"), /obj/item/reagent_containers/hypospray/advanced/peridaxon = list(CAT_SYNTH, "Hypospray (Peridaxon)", 7, "blue"), diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 18752fc4eee..0524c42d845 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -266,10 +266,9 @@ name = "emergency autoinjector" desc = "An autoinjector loaded with 3 doses of Russian Red. Restores a significant amount of stamina and heals a large amount of damage, but causes slight permanent damage." icon_state = "Redwood" - amount_per_transfer_from_this = 15 + amount_per_transfer_from_this = 10 list_reagents = list( /datum/reagent/medicine/russian_red = 30, - /datum/reagent/medicine/oxycodone = 15, ) description_overlay = "Rr" free_refills = FALSE diff --git a/code/game/objects/machinery/vending/vending_types.dm b/code/game/objects/machinery/vending/vending_types.dm index 3f4f2315066..cc4b01ed894 100644 --- a/code/game/objects/machinery/vending/vending_types.dm +++ b/code/game/objects/machinery/vending/vending_types.dm @@ -163,6 +163,7 @@ /obj/item/storage/pill_bottle/imidazoline = 6, /obj/item/storage/pill_bottle/imialky = 6, /obj/item/storage/pill_bottle/hypervene = 6, + /obj/item/storage/pill_bottle/russian_red = 4, ), "Hypospray" = list ( /obj/item/reagent_containers/hypospray/autoinjector/dexalinplus = 10, From 6d81190da25d576818b9ab3abcde2ae429ef0a9d Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Fri, 20 Dec 2024 16:44:30 +1000 Subject: [PATCH 2/4] delete injector --- code/modules/reqs/supplypacks/medical.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/reqs/supplypacks/medical.dm b/code/modules/reqs/supplypacks/medical.dm index c52a92af39b..25df93e8b10 100644 --- a/code/modules/reqs/supplypacks/medical.dm +++ b/code/modules/reqs/supplypacks/medical.dm @@ -306,12 +306,6 @@ contains = list(/obj/item/storage/pill_bottle/russian_red) cost = 250 -/datum/supply_packs/medical/russian_red_injector - name = "Russian Red autoinjector" - notes = "contains emergency autoinjector." - contains = list(/obj/item/reagent_containers/hypospray/autoinjector/russian_red) - cost = 40 - /datum/supply_packs/medical/synaptizine_injector name = "synaptizine auto injector" notes = "contains synaptizine auto injector." From 2054b2b4bddc66afcd010e4dd0c1e9e3152d9cab Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Fri, 20 Dec 2024 16:56:42 +1000 Subject: [PATCH 3/4] Update medical.dm --- code/modules/reagents/reagents/medical.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index 24a56cfa50c..c317712c67c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1586,7 +1586,6 @@ var/max_reagent = 50 /datum/reagent/medicine/sulfasalazine/on_mob_life(mob/living/L, metabolism) - if(absorbtion > 0 && volume < max_reagent) L.reagents.add_reagent(/datum/reagent/medicine/sulfasalazine, 3.5) From 6d922f11ab55584e6a5d022eca0136b0262da4d5 Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Fri, 20 Dec 2024 16:56:59 +1000 Subject: [PATCH 4/4] Update medical.dm --- code/modules/reagents/reagents/medical.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm index c317712c67c..24a56cfa50c 100644 --- a/code/modules/reagents/reagents/medical.dm +++ b/code/modules/reagents/reagents/medical.dm @@ -1586,6 +1586,7 @@ var/max_reagent = 50 /datum/reagent/medicine/sulfasalazine/on_mob_life(mob/living/L, metabolism) + if(absorbtion > 0 && volume < max_reagent) L.reagents.add_reagent(/datum/reagent/medicine/sulfasalazine, 3.5)