diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 169a696b9b9..16b4171958f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -15923,9 +15923,9 @@ pixel_x = 24; pixel_y = 24 }, -/obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "aIz" = ( @@ -73151,12 +73151,12 @@ /turf/open/floor/plasteel, /area/engine/storage) "cHt" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /obj/machinery/status_display/ai{ pixel_y = -32 }, /obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel, /area/engine/storage) "cHu" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index d1b15f6d908..da1542cf8c9 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -41288,7 +41288,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bVX" = ( -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel, /area/engine/atmos) "bVY" = ( @@ -44768,7 +44768,7 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "cic" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1cf4aef56ff..b3a2337dcfa 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -12986,13 +12986,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aCN" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/item/radio/intercom{ pixel_x = -30 }, /obj/effect/turf_decal/bot{ dir = 1 }, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel{ dir = 1 }, @@ -38304,7 +38304,6 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bMe" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/item/radio/intercom{ pixel_y = -26 }, @@ -38313,6 +38312,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel, /area/engine/atmos) "bMf" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index a62164f7e08..ef0d2b9c04a 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -39528,7 +39528,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/camera{ c_tag = "Atmospherics Mixing" }, @@ -39538,6 +39537,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel, /area/engine/atmos) "bTR" = ( @@ -57893,7 +57893,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/plasteel, /area/engine/engineering) "vkd" = ( diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 3aaeda2db28..50514a05058 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1094,6 +1094,14 @@ crate_name = "high-capacity water tank crate" crate_type = /obj/structure/closet/crate/large +/datum/supply_pack/materials/hightankfuel + name = "Large Fuel Tank Crate" + desc = "Contains a high-capacity fuel tank. Keep contents away from open flame." + cost = 2000 + contains = list(/obj/structure/reagent_dispensers/fueltank/large) + crate_name = "high-capacity fuel tank crate" + crate_type = /obj/structure/closet/crate/large + /datum/supply_pack/materials/nitrogen name = "Nitrogen Canister" desc = "Contains a canister of Nitrogen." diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 0901478a49a..76e03997ccc 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -110,6 +110,15 @@ return return ..() +/obj/structure/reagent_dispensers/fueltank/large + name = "high capacity fuel tank" + desc = "A tank full of a high quantity of welding fuel. Keep away from open flames." + icon_state = "fuel_high" + tank_volume = 5000 + +/obj/structure/reagent_dispensers/fueltank/large/boom() + explosion(get_turf(src), 1, 2, 7, flame_range = 12) + qdel(src) /obj/structure/reagent_dispensers/peppertank name = "pepper spray refiller" diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 8b15f026f86..f718aba3f00 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ