cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 21:57:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into totallytubular

Browse Source
This commit is contained in:
Verkister
2022-12-26 21:26:16 +02:00
committed by GitHub
parent e247a7d5e3 fe364eab72
commit 0a7823f3b0
39 changed files with 96294 additions and 2866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/power/cells/device_cells.dm
+8 -7
View File
@@ -89,7 +89,7 @@
name = "giga device power cell"
desc = "A small power cell that holds a blistering amount of energy, constructed by clever scientists using secrets gleaned from alien technology."
icon_state = "meb_m_hi"
maxcharge = 6000
maxcharge = 10000
charge_amount = 20
origin_tech = list(TECH_POWER = 5, TECH_PRECURSOR = 1)
@@ -161,9 +161,10 @@
catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_cell)
icon = 'icons/obj/abductor.dmi'
icon_state = "cell"
charge_amount = 120 // 5%.
maxcharge = 3600
charge_amount = 180 // 5%.
charge_delay = 50 // Every five seconds, bit faster than the default.
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6)
origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 5, TECH_PHORON = 5, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
/obj/item/weapon/cell/device/weapon/recharge/alien/update_icon()
return // No overlays please.
@@ -224,10 +225,10 @@
/obj/item/weapon/cell/device/weapon/recharge/alien/omni
name = "omni weapon power cell"
desc = "A mix between alien technology and phoron tech. Seems to fit in almost any cell slot..."
charge_amount = 90 // 5%.
maxcharge = 1800
charge_delay = 50 SECONDS
origin_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 4, TECH_PHORON = 3)
charge_amount = 240 // 5%.
maxcharge = 4800
charge_delay = 50
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2)
/obj/item/weapon/cell/device/weapon/recharge/alien/omni/empty/Initialize()
. = ..()
modular_chomp/code/modules/power/cells/power_cells.dm
+3 -2
View File
@@ -160,8 +160,9 @@
origin_tech = list(TECH_POWER = 4, TECH_BIO = 5)
icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
icon_state = "yellow slime extract" //"potato_battery"
description_info = "This 'cell' holds a max charge of 10k and self recharges over time."
maxcharge = 10000
description_info = "This 'cell' holds a max charge of 20k and self recharges over time."
maxcharge = 20000
charge_amount = 1000 // 5%.
matter = null
self_recharge = TRUE
standard_overlays = FALSE
modular_chomp/code/modules/research/designs/power_cells.dm
+2 -2
View File
@@ -113,8 +113,8 @@
/datum/design/item/powercell/advance_device_recharge
name = "device, advanced recharging"
id = "recharging_advanced_device"
req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_PRECURSOR = 2)
materials = list(MAT_STEEL = 1500, MAT_GLASS = 100, MAT_MORPHIUM = 100, MAT_PHORON = 500, MAT_DURASTEEL = 500, MAT_URANIUM = 200, MAT_VERDANTIUM = 150)
req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 1000, MAT_GLASS = 400, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
build_path = /obj/item/weapon/cell/device/weapon/recharge
category = list("Misc")
sort_string = "BAABE"