diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 998b0702302..86c9d4449fd 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -41,7 +41,7 @@ /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, /obj/item/weapon/storage/pill_bottle/inaprovaline, - /obj/item/weapon/storage/pill_bottle/iron, + /obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/storage/pill_bottle/dexalin ) @@ -146,6 +146,12 @@ /obj/item/weapon/storage/pill_bottle/iron starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 14) +/obj/item/weapon/storage/pill_bottle/blood_regen + name = "pill bottle (blood regeneration)" + desc = "Contains iron and copper pills for treating bloodloss by employed species." + starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 9, + /obj/item/weapon/reagent_containers/pill/copper = 5) + /obj/item/weapon/storage/pill_bottle/adminordrazine name = "pill bottle (Adminordrazine)" desc = "It's magic. We don't have to explain it." @@ -265,7 +271,8 @@ starts_with = list( /obj/item/weapon/reagent_containers/pill/inaprovaline = 3, /obj/item/weapon/reagent_containers/pill/antitox = 3, - /obj/item/weapon/reagent_containers/pill/iron = 2, + /obj/item/weapon/reagent_containers/pill/iron = 1, + /obj/item/weapon/reagent_containers/pill/copper = 1, /obj/item/weapon/reagent_containers/pill/tramadol = 2, /obj/item/weapon/reagent_containers/pill/hyronalin = 3, /obj/item/weapon/reagent_containers/pill/spaceacillin diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index f2798b2aacb..0d7f96d797e 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -215,7 +215,7 @@ prob(1);/obj/item/weapon/storage/pill_bottle/dermaline, prob(1);/obj/item/weapon/storage/pill_bottle/dexalin_plus, prob(1);/obj/item/weapon/storage/pill_bottle/bicaridine, - prob(1);/obj/item/weapon/storage/pill_bottle/iron) + prob(1);/obj/item/weapon/storage/pill_bottle/blood_regen) /obj/random/medical/lite name = "Random Medicine" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index b3b0a637cd9..f967f6c521b 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -301,7 +301,7 @@ /obj/item/weapon/reagent_containers/pill/iron name = "Iron (30u)" //VOREStation Edit - desc = "Used to aid in blood regeneration after bleeding." + desc = "Used to aid in blood regeneration after bleeding for red-blooded crew." icon_state = "pill1" /obj/item/weapon/reagent_containers/pill/iron/Initialize() @@ -309,6 +309,16 @@ reagents.add_reagent("iron", 30) //VOREStation Edit color = reagents.get_color() +/obj/item/weapon/reagent_containers/pill/copper + name = "Copper (30u)" + desc = "Used to aid in blood regeneration after bleeding for blue-blooded crew." + icon_state = "pill1" + +/obj/item/weapon/reagent_containers/pill/iron/Initialize() + . = ..() + reagents.add_reagent("copper", 30) + color = reagents.get_color() + //Not-quite-medicine /obj/item/weapon/reagent_containers/pill/happy name = "Happy pill" diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm index 11db26dd114..699b29e099a 100644 --- a/maps/groundbase/gb-centcomm.dmm +++ b/maps/groundbase/gb-centcomm.dmm @@ -15284,8 +15284,8 @@ /area/centcom/specops) "Yp" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/blood_regen, +/obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/floor/tiled/dark, /area/centcom/specops) diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm index 59489943107..7b676d4c91e 100644 --- a/maps/stellar_delight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -402,8 +402,8 @@ /area/centcom/specops) "bc" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/blood_regen, +/obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/floor/tiled/dark, /area/centcom/specops) diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index ecce2e4fd4e..3623c556c7a 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -3339,8 +3339,8 @@ /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/blood_regen, +/obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/storage/pill_bottle/sleevingcure/full, /obj/item/weapon/storage/box/syringes, /obj/item/weapon/storage/box/syringes{ diff --git a/maps/submaps/depreciated_vr/ert_base.dmm b/maps/submaps/depreciated_vr/ert_base.dmm index e16d4b09ed3..0e182e0365d 100644 --- a/maps/submaps/depreciated_vr/ert_base.dmm +++ b/maps/submaps/depreciated_vr/ert_base.dmm @@ -790,8 +790,8 @@ /obj/item/stack/nanopaste/advanced, /obj/item/stack/nanopaste/advanced, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/blood_regen, +/obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/storage/pill_bottle/sleevingcure/full, /obj/item/weapon/extinguisher/mini, /obj/item/weapon/extinguisher/mini, diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm index 606f61575ef..bf1ed7f018d 100644 --- a/maps/submaps/shelters/shelter_4.dmm +++ b/maps/submaps/shelters/shelter_4.dmm @@ -73,7 +73,7 @@ /obj/item/device/binoculars, /obj/item/device/perfect_tele, /obj/item/weapon/storage/pill_bottle/nutriment, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/storage/pill_bottle/arithrazine, /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, @@ -84,7 +84,7 @@ /obj/item/device/fbp_backup_cell, /obj/item/device/fbp_backup_cell, /obj/item/weapon/storage/pill_bottle/nutriment, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/storage/pill_bottle/arithrazine, /obj/item/weapon/storage/pill_bottle/corophizine, /obj/item/weapon/towel/random, diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index a9df0402f59..b6fe5fb58e9 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -391,8 +391,8 @@ /area/centcom/specops) "bc" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/pill_bottle/iron, -/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/blood_regen, +/obj/item/weapon/storage/pill_bottle/blood_regen, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /turf/simulated/floor/tiled/dark, /area/centcom/specops)