diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 68704460ed..1eea3be802 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -2017,8 +2017,8 @@ "eX" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/empty, -/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood, /turf/open/floor/plasteel/cmo, /area/awaymission/snowdin/post) "eY" = ( @@ -2207,7 +2207,7 @@ /turf/open/floor/plasteel/cmo, /area/awaymission/snowdin/post) "fx" = ( -/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ piping_layer = 3; pixel_x = 5; diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a2464240f7..5d67213046 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -3032,7 +3032,7 @@ dir = 4 }, /obj/machinery/iv_drip, -/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood, /turf/open/floor/plasteel/whitered/side{ dir = 5 }, @@ -51887,8 +51887,8 @@ /area/quartermaster/storage) "cCp" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/blood/empty, -/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood/AMinus, /obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9240db741c..1109d24d7c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -56418,11 +56418,11 @@ }, /obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood{ pixel_x = -3; pixel_y = -3 }, -/obj/item/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood{ pixel_x = -3; pixel_y = -3 }, @@ -66149,8 +66149,8 @@ pixel_x = 8; pixel_y = 2 }, -/obj/item/reagent_containers/blood/empty, -/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/dropper, /obj/structure/sign/warning/biohazard{ @@ -66543,8 +66543,8 @@ /area/medical/virology) "cIu" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/blood/empty, -/obj/item/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood{ pixel_x = -3; pixel_y = -3 }, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 003b4d01e1..dfd4dffc07 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -1216,8 +1216,8 @@ /area/mine/maintenance) "dB" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/blood/empty, -/obj/item/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood{ pixel_x = -3; pixel_y = -3 }, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 72620f68f7..9d144d9bf5 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -879,8 +879,8 @@ /area/shuttle/escape) "cE" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/blood/empty, -/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood, +/obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood/AMinus, /obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index be7b37b260..1815a8e3af 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -1288,7 +1288,7 @@ /area/shuttle/abandoned) "cl" = ( /obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood{ pixel_x = -3; pixel_y = -3 }, diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 56359d4492..0d8a73292e 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -87,8 +87,8 @@ /obj/structure/closet/crate/freezer/blood/PopulateContents() . = ..() - new /obj/item/reagent_containers/blood/empty(src) - new /obj/item/reagent_containers/blood/empty(src) + new /obj/item/reagent_containers/blood(src) + new /obj/item/reagent_containers/blood(src) new /obj/item/reagent_containers/blood/AMinus(src) new /obj/item/reagent_containers/blood/BMinus(src) new /obj/item/reagent_containers/blood/BPlus(src) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index cc2beb3c2a..ab830a7a33 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -825,8 +825,8 @@ /datum/supply_pack/medical/bloodpacks name = "Blood Pack Variety Crate" cost = 3500 - contains = list(/obj/item/reagent_containers/blood/empty, - /obj/item/reagent_containers/blood/empty, + contains = list(/obj/item/reagent_containers/blood, + /obj/item/reagent_containers/blood, /obj/item/reagent_containers/blood/APlus, /obj/item/reagent_containers/blood/AMinus, /obj/item/reagent_containers/blood/BPlus, diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 98bac76ab8..85f99fb99a 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -44,8 +44,9 @@ icon_state = "random_bloodpack" /obj/item/reagent_containers/blood/random/Initialize() + icon_state = "bloodpack" blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L") - . = ..() + return ..() /obj/item/reagent_containers/blood/APlus blood_type = "A+" @@ -71,10 +72,6 @@ /obj/item/reagent_containers/blood/universal blood_type = "U" -/obj/item/reagent_containers/blood/empty - name = "blood pack" - icon_state = "empty" - /obj/item/reagent_containers/blood/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/pen) || istype(I, /obj/item/toy/crayon))