diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 972aaeedd28..bed14882f7f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -892,7 +892,7 @@ }, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/mineral/plastitanium, /area/ruin/syndicate_lava_base/cargo) "ff" = ( @@ -3047,7 +3047,7 @@ amount = 50 }, /obj/item/clothing/head/welding, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3978,7 +3978,7 @@ /obj/machinery/firealarm/directional/west, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/decal/cleanable/dirt, /obj/item/pipe_dispenser{ pixel_y = 12 diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 02d6d0ea9a3..2aba0be1a2b 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -231,7 +231,7 @@ "aw" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = -7 @@ -526,7 +526,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/structure/cable, /turf/open/floor/plating, /area/ruin/space/has_grav/listeningstation) diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index ac474a9a6ab..0b042e19b53 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -1207,7 +1207,7 @@ }, /area/awaymission/moonoutpost19/syndicate) "cK" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ name = "Worn-out APC"; pixel_y = -25; req_access_txt = "150"; @@ -2967,7 +2967,7 @@ }, /area/awaymission/moonoutpost19/research) "gG" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ dir = 4; locked = 0; name = "Worn-out APC"; @@ -4381,7 +4381,7 @@ }, /area/awaymission/moonoutpost19/arrivals) "jH" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ dir = 1; locked = 0; name = "Worn-out APC"; diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 6449fd1f6bb..4e40840c8d9 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -776,7 +776,7 @@ /turf/open/floor/iron/dark, /area/awaymission/research/interior/gateway) "cb" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ dir = 4; name = "Gateway APC"; pixel_x = 25 @@ -2296,7 +2296,7 @@ /turf/open/floor/iron/dark, /area/awaymission/research/interior/secure) "fy" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ dir = 4; name = "Vault APC"; pixel_x = 25 diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index fc205decda0..4370babff13 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -5901,7 +5901,7 @@ /obj/machinery/light/directional/east, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/storage/toolbox/electrical{ pixel_x = 4; pixel_y = 8 diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 055a2a38dc1..00d16c03206 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -2457,7 +2457,7 @@ c_tag = "Hydroponics"; network = list("uo45") }, -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ locked = 0; name = "Hydroponics APC"; pixel_y = -25; @@ -4672,7 +4672,7 @@ }, /area/awaymission/undergroundoutpost45/crew_quarters) "jV" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ dir = 1; locked = 0; name = "UO45 Bar APC"; @@ -5684,7 +5684,7 @@ }, /area/awaymission/undergroundoutpost45/research) "lH" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ locked = 0; name = "UO45 Research Division APC"; pixel_y = -25; @@ -6201,7 +6201,7 @@ }, /area/awaymission/undergroundoutpost45/gateway) "mE" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ locked = 0; name = "UO45 Gateway APC"; pixel_y = -25; @@ -8804,7 +8804,7 @@ /turf/closed/wall/r_wall, /area/awaymission/undergroundoutpost45/engineering) "rp" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ dir = 8; name = "UO45 Engineering APC"; pixel_x = -25; @@ -9369,7 +9369,7 @@ }, /area/awaymission/undergroundoutpost45/mining) "sj" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ locked = 0; name = "UO45 Mining APC"; pixel_y = -25; diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 86343c9db5b..7698940098b 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -6620,7 +6620,7 @@ "bpU" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/machinery/ecto_sniffer{ pixel_x = 6; pixel_y = 6 @@ -8535,7 +8535,7 @@ /obj/structure/table, /obj/item/assembly/signaler, /obj/item/assembly/signaler, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/iron, /area/ai_monitored/command/storage/eva) "bWo" = ( @@ -13192,7 +13192,7 @@ pixel_y = -7 }, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/iron/dark, /area/ai_monitored/command/storage/eva) "dKh" = ( @@ -17187,7 +17187,7 @@ pixel_y = 3 }, /obj/item/stack/cable_coil, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating, /area/engineering/storage/tech) "fMZ" = ( @@ -20455,7 +20455,7 @@ /obj/structure/table, /obj/machinery/cell_charger, /obj/machinery/light_switch/directional/north, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/structure/cable, /turf/open/floor/iron, /area/commons/storage/primary) @@ -21506,7 +21506,7 @@ "hQl" = ( /obj/structure/table, /obj/item/plant_analyzer, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating, /area/engineering/storage/tech) "hQO" = ( @@ -23627,7 +23627,7 @@ /obj/item/stack/sheet/glass/fifty, /obj/item/electronics/airlock, /obj/item/electronics/airlock, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, @@ -25771,7 +25771,7 @@ pixel_x = -4; pixel_y = 4 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/stack/cable_coil, /obj/item/pen{ pixel_x = -5; @@ -30134,7 +30134,7 @@ "mhV" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/rcl/pre_loaded, /turf/open/floor/iron, /area/command/heads_quarters/ce) @@ -44640,8 +44640,8 @@ pixel_x = -8; pixel_y = 4 }, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/crowbar, /obj/item/radio/headset/headset_sci{ pixel_x = -3 @@ -49978,8 +49978,8 @@ /obj/structure/cable, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/iron, /area/maintenance/department/electrical) "vRo" = ( @@ -53178,7 +53178,7 @@ /obj/item/clothing/glasses/meson{ pixel_y = 4 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/reagent_containers/pill/patch/aiuri, /obj/effect/turf_decal/tile/neutral{ dir = 1 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 6572588ce98..3cd7533c9dc 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -57101,9 +57101,9 @@ pixel_x = -6; pixel_y = 6 }, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/crowbar/red, /obj/item/toy/figure/roboticist{ pixel_x = 6 @@ -77164,7 +77164,7 @@ /obj/item/electronics/airlock{ pixel_y = 6 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/engine, /area/engineering/storage/tech) "vHV" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index f50a0b7dc5c..f072375e05f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -24895,15 +24895,15 @@ /area/medical/surgery/room_b) "gGb" = ( /obj/structure/table/reinforced, -/obj/item/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high{ pixel_x = 4; pixel_y = 5 }, -/obj/item/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high{ pixel_x = -8; pixel_y = 9 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/item/borg/upgrade/rename{ pixel_x = 3; diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 72d55f3c17d..4f433afb9f3 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -94,7 +94,7 @@ /obj/item/stack/sheet/glass/fifty, /obj/item/electronics/airlock, /obj/item/electronics/airlock, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, @@ -5843,7 +5843,7 @@ }, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/iron, @@ -21118,7 +21118,7 @@ "gbY" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/commons/storage/primary) @@ -45920,12 +45920,12 @@ dir = 6 }, /obj/structure/table, -/obj/item/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high{ pixel_x = -8; pixel_y = 9 }, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/iron, /area/science/misc_lab) "pfR" = ( @@ -47771,7 +47771,7 @@ }, /obj/item/lighter, /obj/item/reagent_containers/pill/patch/aiuri, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 }, @@ -55054,12 +55054,12 @@ "sDu" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high{ pixel_x = 4; pixel_y = 5 }, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ pixel_x = -8; pixel_y = 9 }, diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index bd6de5da597..497f46e8ba0 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -1385,11 +1385,11 @@ pixel_x = 32 }, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high{ pixel_x = 4; pixel_y = 4 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/multitool, /turf/open/floor/pod/dark, /area/shuttle/syndicate/armory) diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index 0d09952dc32..2bd889ed524 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -58,7 +58,7 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/caravan/syndicate1) "vK" = ( -/obj/machinery/power/apc/highcap/fifteen_k{ +/obj/machinery/power/apc/highcap/ten_k{ dir = 8; name = "Syndicate Fighter APC"; pixel_x = -25; diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 4f844cd6971..9937678d015 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -785,7 +785,7 @@ /obj/item/stack/cable_coil{ pixel_x = 2 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -1542,7 +1542,7 @@ pixel_x = 2; pixel_y = 6 }, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /turf/open/floor/iron/dark, /area/shuttle/abandoned/engine) "cz" = ( @@ -1593,7 +1593,7 @@ /obj/machinery/firealarm/directional/south, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/item/storage/toolbox/emergency{ pixel_x = -12 }, diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index ccc2ee856cc..3f67dfd6d27 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -1642,7 +1642,7 @@ "dY" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/stripes/line, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/sbc_starfury) @@ -2370,7 +2370,7 @@ "gN" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -3626,7 +3626,7 @@ /area/shuttle/sbc_starfury) "jf" = ( /obj/machinery/power/apc/syndicate{ - cell_type = /obj/item/stock_parts/cell/high/plus; + cell_type = /obj/item/stock_parts/cell/high; dir = 1; name = "Syndicate Battlecruiser APC"; pixel_y = 25 @@ -3816,8 +3816,8 @@ /area/shuttle/sbc_starfury) "jT" = ( /obj/structure/closet/crate, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = -3 }, @@ -4201,7 +4201,7 @@ "lg" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 1434923e87a..92ead3724eb 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -18,11 +18,15 @@ if(!charging) return - . += image(charging.icon, charging.icon_state) - . += "ccharger-on" if(!(machine_stat & (BROKEN|NOPOWER))) var/newlevel = round(charging.percent() * 4 / 100) . += "ccharger-o[newlevel]" + . += image(charging.icon, charging.icon_state) + if(charging.grown_battery) + . += mutable_appearance('icons/obj/power.dmi', "grown_wires") + . += "ccharger-[charging.connector_type]-on" + if((charging.charge > 0.01) && charging.charge_light_type) + . += mutable_appearance('icons/obj/power.dmi', "cell-[charging.charge_light_type]-o[(charging.percent() >= 99.5) ? 2 : 1]") /obj/machinery/cell_charger/examine(mob/user) . = ..() diff --git a/code/game/objects/items/maintenance_loot.dm b/code/game/objects/items/maintenance_loot.dm index 6a28f8b5ec7..12fe786f81a 100644 --- a/code/game/objects/items/maintenance_loot.dm +++ b/code/game/objects/items/maintenance_loot.dm @@ -30,6 +30,8 @@ throwforce = 10 maxcharge = 20000 //decent max charge chargerate = 1400 //charging is about 30% less efficient compared lithium batteries. + charge_light_type = null + connector_type = "leadacid" rating = 2 //Kind of a mid-tier battery w_class = WEIGHT_CLASS_NORMAL grind_results = list(/datum/reagent/lead = 15, /datum/reagent/toxin/acid = 15, /datum/reagent/water = 20) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 75dc57d9fa3..dcbee9ab9eb 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -47,7 +47,7 @@ head.flash2 = new(head) chest = new(src) chest.wired = TRUE - chest.cell = new /obj/item/stock_parts/cell/high/plus(chest) + chest.cell = new /obj/item/stock_parts/cell/high(chest) update_appearance() /obj/item/robot_suit/update_overlays() diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 0a144541784..6f34ba6c2fc 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -54,7 +54,6 @@ /obj/item/mod/control/pre_equipped/loader theme = /datum/mod_theme/loader - applied_cell = /obj/item/stock_parts/cell/high/plus initial_modules = list( /obj/item/mod/module/storage/large_capacity, /obj/item/mod/module/flashlight, @@ -105,7 +104,6 @@ /obj/item/mod/control/pre_equipped/security theme = /datum/mod_theme/security - applied_cell = /obj/item/stock_parts/cell/high/plus initial_modules = list( /obj/item/mod/module/storage, /obj/item/mod/module/flashlight, @@ -199,7 +197,6 @@ /obj/item/mod/control/pre_equipped/prototype theme = /datum/mod_theme/prototype - applied_cell = /obj/item/stock_parts/cell/high/plus initial_modules = list( /obj/item/mod/module/storage, /obj/item/mod/module/welding, diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 49cc0a33eda..462f313f4f8 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -184,9 +184,6 @@ /obj/machinery/power/apc/highcap/ten_k cell_type = /obj/item/stock_parts/cell/high -/obj/machinery/power/apc/highcap/fifteen_k - cell_type = /obj/item/stock_parts/cell/high/plus - /obj/machinery/power/apc/auto_name auto_name = TRUE diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index c8ca103ef2b..b4b8f732c68 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -36,6 +36,10 @@ var/ratingdesc = TRUE ///If it's a grown that acts as a battery, add a wire overlay to it. var/grown_battery = FALSE + ///What charge lige sprite to use, null if no light + var/charge_light_type = "standard" + ///What connector sprite to use when in a cell charger, null if no connectors + var/connector_type = "standard" /obj/item/stock_parts/cell/get_cell() return src @@ -65,9 +69,9 @@ . = ..() if(grown_battery) . += mutable_appearance('icons/obj/power.dmi', "grown_wires") - if(charge < 0.01) + if((charge < 0.01) || !charge_light_type) return - . += mutable_appearance('icons/obj/power.dmi', "cell-o[((charge / maxcharge) >= 0.995) ? 2 : 1]") + . += mutable_appearance('icons/obj/power.dmi', "cell-[charge_light_type]-o[(percent() >= 99.5) ? 2 : 1]") /obj/item/stock_parts/cell/proc/percent() // return % charge of cell return 100*charge/maxcharge @@ -274,14 +278,6 @@ custom_materials = list(/datum/material/glass=60) chargerate = 1500 -/obj/item/stock_parts/cell/high/plus - name = "high-capacity power cell+" - desc = "Where did these come from?" - icon_state = "h+cell" - maxcharge = 15000 - chargerate = 2250 - rating = 2 - /obj/item/stock_parts/cell/high/empty/Initialize(mapload) . = ..() charge = 0 @@ -357,6 +353,8 @@ icon_state = "potato" charge = 100 maxcharge = 300 + charge_light_type = null + connector_type = null custom_materials = null grown_battery = TRUE //it has the overlays for wires custom_premium_price = PAYCHECK_ASSISTANT @@ -386,6 +384,8 @@ icon_state = "yellow slime extract" custom_materials = null maxcharge = 5000 + charge_light_type = null + connector_type = "slimecore" rating = 5 /obj/item/stock_parts/cell/beam_rifle @@ -422,6 +422,8 @@ icon_state = "crystal_cell" maxcharge = 50000 chargerate = 0 + charge_light_type = null + connector_type = "crystal" custom_materials = null grind_results = null rating = 5 diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm index d60dd9356bb..192c6f2e104 100644 --- a/code/modules/projectiles/guns/energy/laser_gatling.dm +++ b/code/modules/projectiles/guns/energy/laser_gatling.dm @@ -158,6 +158,5 @@ /obj/item/stock_parts/cell/minigun name = "gatling gun fusion core" desc = "Where did these come from?" - icon_state = "h+cell" maxcharge = 500000 chargerate = 5000 diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index c8e58f2da94..8ca7afff9ba 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -99,6 +99,8 @@ Slimecrossing Items custom_materials = null maxcharge = 50000 chargerate = 2500 + charge_light_type = null + connector_type = "slimecore" //Barrier cube - Chilling Grey /obj/item/barriercube diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 3622f50960a..2aa8873b7f4 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -325,7 +325,7 @@ C.forceMove(src) cell = C return - cell = new /obj/item/stock_parts/cell/high/plus(src) + cell = new /obj/item/stock_parts/cell/high(src) ///Adds a scanning module, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this. /obj/vehicle/sealed/mecha/proc/add_scanmod(obj/item/stock_parts/scanning_module/sm=null) diff --git a/code/modules/vehicles/mecha/combat/marauder.dm b/code/modules/vehicles/mecha/combat/marauder.dm index d7f8de4dbf4..5d0f4da0a62 100644 --- a/code/modules/vehicles/mecha/combat/marauder.dm +++ b/code/modules/vehicles/mecha/combat/marauder.dm @@ -37,6 +37,13 @@ ME.attach(src) max_ammo() +/obj/vehicle/sealed/mecha/combat/marauder/add_cell(obj/item/stock_parts/cell/C=null) + if(C) + C.forceMove(src) + cell = C + return + cell = new /obj/item/stock_parts/cell/bluespace(src) + /datum/action/vehicle/sealed/mecha/mech_smoke name = "Smoke" button_icon_state = "mech_smoke" diff --git a/icons/obj/maintenance_loot.dmi b/icons/obj/maintenance_loot.dmi index e42112753b6..09b0892b859 100644 Binary files a/icons/obj/maintenance_loot.dmi and b/icons/obj/maintenance_loot.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 015d0c84e6d..2cb18e04db3 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ