From d29f9d84e796b0fe3d65828eb37fe384d828fdce Mon Sep 17 00:00:00 2001 From: Martinpachu <86135885+Martinpachu@users.noreply.github.com> Date: Thu, 29 Feb 2024 19:39:55 -0300 Subject: [PATCH] Adds cell chargers to more ships and to cargo. (#2755) ## About The Pull Request As the name says, most ships had cell chargers but i've corrected those i've seen. ## Why It's Good For The Game I don't think cell chargers have any real reason to be rare. The cargo pack is pretty expensive so it's not cheap to get a ton of chargers. ## Changelog :cl: add: Added cell chargers to more ships. add: Added a cell charger cargo pack. /:cl: --- _maps/shuttles/independent/independent_box.dmm | 1 + _maps/shuttles/independent/independent_shepherd.dmm | 2 ++ _maps/shuttles/inteq/inteq_colossus.dmm | 1 + _maps/shuttles/inteq/inteq_valor.dmm | 1 + _maps/shuttles/inteq/inteq_vaquero.dmm | 1 + _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm | 1 + _maps/shuttles/roumain/srm_elder.dmm | 2 ++ code/modules/cargo/packs/tools.dm | 7 +++++++ 8 files changed, 16 insertions(+) diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm index d5df2b277080..9001bc9faf69 100644 --- a/_maps/shuttles/independent/independent_box.dmm +++ b/_maps/shuttles/independent/independent_box.dmm @@ -1279,6 +1279,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/ship/engineering) "iU" = ( diff --git a/_maps/shuttles/independent/independent_shepherd.dmm b/_maps/shuttles/independent/independent_shepherd.dmm index b3e9e88c6d2c..891811e17789 100644 --- a/_maps/shuttles/independent/independent_shepherd.dmm +++ b/_maps/shuttles/independent/independent_shepherd.dmm @@ -966,6 +966,8 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/table, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/ship/engineering/electrical) "ii" = ( diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 4efdcb0ba74c..a90d594ce1db 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -1822,6 +1822,7 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = -32 }, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/ship/engineering) "tX" = ( diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index aebe46afb678..8aaf959387af 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -4310,6 +4310,7 @@ pixel_x = -32 }, /obj/effect/turf_decal/corner_techfloor_gray/full, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/ship/maintenance/port) "NZ" = ( diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 340eb8ec6739..d38ca3b2c68d 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -723,6 +723,7 @@ /obj/machinery/light/small/directional/west, /obj/machinery/airalarm/directional/north, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/cell_charger, /turf/open/floor/plasteel/grimy, /area/ship/crew) "jK" = ( diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm index ed46e7e7ef1e..9dc0703630b8 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm @@ -76,6 +76,7 @@ /obj/effect/turf_decal/techfloor{ dir = 4 }, +/obj/machinery/cell_charger, /turf/open/floor/plasteel/mono/dark, /area/ship/engineering) "aI" = ( diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm index 5d8cb37ffc6b..dd5fa22a86ad 100644 --- a/_maps/shuttles/roumain/srm_elder.dmm +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -491,6 +491,8 @@ pixel_y = 21 }, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/table/wood, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "eU" = ( diff --git a/code/modules/cargo/packs/tools.dm b/code/modules/cargo/packs/tools.dm index 3d5389e23327..92726a3ab6a6 100644 --- a/code/modules/cargo/packs/tools.dm +++ b/code/modules/cargo/packs/tools.dm @@ -39,6 +39,13 @@ /obj/item/clothing/glasses/meson/engine) crate_name = "engineering gear crate" +/datum/supply_pack/tools/cellcharger + name = "Cell Charger Crate" + desc = "Contains a cell charger, able to charge all sorts of power cells." + cost = 4000 + contains = list(/obj/machinery/cell_charger) + + /datum/supply_pack/tools/rped name = "RPED crate" desc = "Tired of deconstructing all of your machines just to replace the power cells? This device has you covered. Actual parts not included."