cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] New batteries (#11448)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-08-16 17:00:39 -07:00
committed by GitHub
parent ff2e896a1c
commit 9576eefb34
19 changed files with 310 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/__defines/research/techweb_nodes.dm
View File

@@ -111,6 +111,8 @@
#define TECHWEB_NODE_PARTS_HYPER "parts_hyper" #define TECHWEB_NODE_PARTS_HYPER "parts_hyper"
#define TECHWEB_NODE_PARTS_OMNI "parts_omni" #define TECHWEB_NODE_PARTS_OMNI "parts_omni"
#define TECHWEB_NODE_PARTS_UPG "parts_upg" #define TECHWEB_NODE_PARTS_UPG "parts_upg"
#define TECHWEB_NODE_PARTS_EMP_PROOF "parts_empproof"
#define TECHWEB_NODE_PARTS_RECHARGING "parts_recharging"
#define TECHWEB_NODE_PASSIVE_IMPLANTS "passive_implants" #define TECHWEB_NODE_PASSIVE_IMPLANTS "passive_implants"
#define TECHWEB_NODE_PLASMA_CONTROL "plasma_control" #define TECHWEB_NODE_PLASMA_CONTROL "plasma_control"
#define TECHWEB_NODE_PLASMA_MINING "plasma_mining" #define TECHWEB_NODE_PLASMA_MINING "plasma_mining"
@@ -139,13 +141,11 @@
#define TECHWEB_NODE_TELECOMS "telecoms" #define TECHWEB_NODE_TELECOMS "telecoms"
#define TECHWEB_NODE_UNREGULATED_BLUESPACE "unregulated_bluespace" #define TECHWEB_NODE_UNREGULATED_BLUESPACE "unregulated_bluespace"
#define TECHWEB_NODE_XENOBIOLOGY "xenobiology" #define TECHWEB_NODE_XENOBIOLOGY "xenobiology"
#define TECHWEB_NODE_TELEPORTER "teleporter"
#define TECHWEB_NODE_CONFETTI "confetti"
//CHOMPEDIT Start - Chomp Specific techwebs. //CHOMPEDIT Start - Chomp Specific techwebs.
#define TECHWEB_NODE_PHASE_WEAPONS "phase_weapons" //CHOMPEDIT ADD - Adds Phase Weaponry #define TECHWEB_NODE_PHASE_WEAPONS "phase_weapons" //CHOMPEDIT ADD - Adds Phase Weaponry
#define TECHWEB_NODE_PARTS_EMP_PROOF "parts_empproof" //CHOMPEDIT - Adds EMP-Proof Parts
#define TECHWEB_NODE_PARTS_RECHARGING "parts_recharging" //CHOMPEDIT - Adds recharging Parts
#define TECHWEB_NODE_TELEPORTER "teleporter" //CHOMPEDIT - Adds Teleporter
#define TECHWEB_NODE_CONFETTI "confetti" //CHOMPEDIT Add - Adds Confetti Cannon
#define TECHWEB_NODE_CRYOGUN "cryogun" //CHOMPEDIT Add - Adds Cryogun #define TECHWEB_NODE_CRYOGUN "cryogun" //CHOMPEDIT Add - Adds Cryogun
#define TECHWEB_NODE_CASELESS_RIFLE "caseless_rifle" //CHOMPEDIT Add - Adds Caseless Rifle #define TECHWEB_NODE_CASELESS_RIFLE "caseless_rifle" //CHOMPEDIT Add - Adds Caseless Rifle
#define TECHWEB_NODE_METAMORPHOSIS_RAY "metamorphosis_ray" //CHOMPEDIT Add - Adds Caseless Rifle #define TECHWEB_NODE_METAMORPHOSIS_RAY "metamorphosis_ray" //CHOMPEDIT Add - Adds Caseless Rifle

4
code/modules/power/cell.dm
View File

@@ -5,8 +5,8 @@
/obj/item/cell /obj/item/cell
name = "power cell" name = "power cell"
desc = "A rechargable electrochemical power cell." desc = "A rechargable electrochemical power cell."
icon = 'modular_chomp/icons/obj/power_cells.dmi' //CHOMP Edit using modular folders now icon = 'icons/obj/power_cells.dmi' //swap to 'icons/obj/power_cells_.dmi' for new sprites. //CHOMPEdit - Enable new sprites
icon_state = "b_st" //CHOMP Edit icon_state = "b_st"
item_state = "cell" item_state = "cell"
origin_tech = list(TECH_POWER = 1) origin_tech = list(TECH_POWER = 1)
force = 5.0 force = 5.0

81
code/modules/power/cells/device_cells.dm
View File

@@ -4,8 +4,7 @@
/obj/item/cell/device /obj/item/cell/device
name = "device power cell" name = "device power cell"
desc = "A small power cell designed to power handheld devices." desc = "A small power cell designed to power handheld devices."
icon = 'modular_chomp/icons/obj/power_cells.dmi' // CHOMPEdit icon_state = "m_st"
icon_state = "m_st" // CHOMPEdit
item_state = "egg6" item_state = "egg6"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
force = 0 force = 0
@@ -25,7 +24,6 @@
*/ */
/obj/item/cell/device/crap /obj/item/cell/device/crap
name = "\improper rechargable D battery" name = "\improper rechargable D battery"
icon = 'icons/obj/power_cells.dmi' // CHOMPAdd
desc = "An older, cheap power cell designed to power handheld devices. It's probably been in use for quite some time now." desc = "An older, cheap power cell designed to power handheld devices. It's probably been in use for quite some time now."
description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT
origin_tech = list(TECH_POWER = 0) origin_tech = list(TECH_POWER = 0)
@@ -46,12 +44,11 @@
/obj/item/cell/device/hyper /obj/item/cell/device/hyper
name = "hyper device power cell" name = "hyper device power cell"
desc = "A small power cell designed to power handheld devices. Has a better charge than a standard device cell." desc = "A small power cell designed to power handheld devices. Has a better charge than a standard device cell."
icon_state = "meb_m_st" // CHOMPEdit icon_state = "meb_m_st"
charge = 4800 // CHOMPEdit charge = 4800
maxcharge = 4800 // CHOMPEdit maxcharge = 4800
charge_amount = 20 // CHOMPEdit charge_amount = 20
matter = list(MAT_STEEL = 400, MAT_GLASS = 60) matter = list(MAT_STEEL = 400, MAT_GLASS = 60)
origin_tech = list(TECH_POWER = 4) // CHOMPAdd
/obj/item/cell/device/hyper/empty /obj/item/cell/device/hyper/empty
charge = 0 charge = 0
@@ -62,10 +59,9 @@
/obj/item/cell/device/empproof /obj/item/cell/device/empproof
name = "shielded device power cell" name = "shielded device power cell"
desc = "A small power cell designed to power handheld devices. Shielded from EMPs." desc = "A small power cell designed to power handheld devices. Shielded from EMPs."
icon_state = "s_st" // CHOMPEdit icon_state = "s_st"
matter = list(MAT_STEEL = 400, MAT_GLASS = 60) matter = list(MAT_STEEL = 400, MAT_GLASS = 60)
emp_proof = TRUE emp_proof = TRUE
origin_tech = list(TECH_POWER = 3) // CHOMPAdd
/obj/item/cell/device/empproof/empty /obj/item/cell/device/empproof/empty
charge = 0 charge = 0
@@ -77,12 +73,11 @@
// CHOMPEdit Start // CHOMPEdit Start
name = "advanced device power cell" //This was a yawn change. I quite like this, makes more sense. name = "advanced device power cell" //This was a yawn change. I quite like this, makes more sense.
desc = "A small upgraded power cell designed to power handheld devices." desc = "A small upgraded power cell designed to power handheld devices."
icon_state = "m_sup"
// CHOMPEdit End // CHOMPEdit End
icon_state = "m_sup"
charge = 2400 charge = 2400
maxcharge = 2400 maxcharge = 2400
charge_amount = 20 charge_amount = 20
origin_tech = list(TECH_POWER = 2) // CHOMPAdd
/obj/item/cell/device/weapon/empty /obj/item/cell/device/weapon/empty
charge = 0 charge = 0
@@ -93,13 +88,9 @@
/obj/item/cell/device/weapon/empproof /obj/item/cell/device/weapon/empproof
name = "shielded weapon power cell" name = "shielded weapon power cell"
desc = "A small power cell designed to power handheld weaponry. Shielded from EMPs." desc = "A small power cell designed to power handheld weaponry. Shielded from EMPs."
icon_state = "s_hi" // CHOMPEdit icon_state = "s_hi"
charge = 2400 // CHOMPEdit
maxcharge = 2400 // CHOMPEdit
charge_amount = 20 // CHOMPEdit
matter = list(MAT_STEEL = 400, MAT_GLASS = 60) matter = list(MAT_STEEL = 400, MAT_GLASS = 60)
emp_proof = TRUE emp_proof = TRUE
origin_tech = list(TECH_POWER = 4) // CHOMPEdit
/obj/item/cell/device/weapon/empproof/empty /obj/item/cell/device/weapon/empproof/empty
charge = 0 charge = 0
@@ -110,18 +101,18 @@
/obj/item/cell/device/weapon/recharge /obj/item/cell/device/weapon/recharge
name = "self-charging weapon power cell" name = "self-charging weapon power cell"
desc = "A small power cell designed to power handheld weaponry. This one recharges itself." desc = "A small power cell designed to power handheld weaponry. This one recharges itself."
icon_state = "meb_m_nu" // CHOMPEdit icon_state = "meb_m_nu"
matter = list(MAT_STEEL = 400, MAT_GLASS = 80) matter = list(MAT_STEEL = 400, MAT_GLASS = 80)
self_recharge = TRUE self_recharge = TRUE
charge_amount = 60 //2.5% // CHOMPEdit charge_amount = 60 //2.5% // CHOMPEdit
charge_delay = 75 charge_delay = 75
origin_tech = list(TECH_POWER = 5, TECH_ARCANE = 1) // CHOMPEdit origin_tech = list(TECH_POWER = 5, TECH_ARCANE = 1)
/* /*
* Captain's Self-charging Weapon * Captain's Self-charging Weapon
*/ */
/obj/item/cell/device/weapon/recharge/captain /obj/item/cell/device/weapon/recharge/captain
icon_state = "infinite_m" // CHOMPEdit icon_state = "infinite_m"
matter = list(MAT_STEEL = 400, MAT_GLASS = 100) matter = list(MAT_STEEL = 400, MAT_GLASS = 100)
charge_amount = 160 //Recharges a lot more quickly... charge_amount = 160 //Recharges a lot more quickly...
charge_delay = 100 //... but it takes a while to get started charge_delay = 100 //... but it takes a while to get started
@@ -149,11 +140,11 @@
catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_cell) catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_cell)
icon = 'icons/obj/abductor.dmi' icon = 'icons/obj/abductor.dmi'
icon_state = "cell" icon_state = "cell"
charge = 5000 // CHOMPEdit charge = 5000
maxcharge = 5000 // CHOMPEdit maxcharge = 5000
charge_amount = 130 // 2.5%. // CHOMPEdit charge_amount = 130
charge_delay = 50 // Every five seconds, bit faster than the default. charge_delay = 50
origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2) // CHOMPEdit origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2)
var/swaps_to = /obj/item/cell/void var/swaps_to = /obj/item/cell/void
standard_overlays = FALSE standard_overlays = FALSE
@@ -177,3 +168,43 @@
icon = 'icons/obj/power_vr.dmi' icon = 'icons/obj/power_vr.dmi'
icon_state = "cellb" icon_state = "cellb"
swaps_to = /obj/item/cell/void/hybrid swaps_to = /obj/item/cell/void/hybrid
/obj/item/cell/device/weapon/recharge/alien/omni
name = "omni weapon power cell"
desc = "A mix between alien technology and phoron-based tech. Not quite as good as a true void cell though."
charge_amount = 90 // 2.5%.
charge = 3600
maxcharge = 3600
charge_delay = 50
swaps_to = null
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
/obj/item/cell/device/weapon/recharge/alien/omni/empty
charge = 0
/*
* Giga
*/
/obj/item/cell/device/giga
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"
charge = 10000
maxcharge = 10000
charge_amount = 20
origin_tech = list(TECH_POWER = 8)
/obj/item/cell/device/giga/empty
charge = 0
/obj/item/cell/device/super
name = "super device power cell"
desc = "A small upgraded power cell designed to power handheld devices."
icon_state = "m_hy"
charge = 3600
maxcharge = 3600
charge_amount = 20
origin_tech = list(TECH_POWER = 3)
/obj/item/cell/device/super/empty
charge = 0

54
code/modules/power/cells/power_cells.dm
View File

@@ -51,7 +51,7 @@
/obj/item/cell/high /obj/item/cell/high
name = "high-capacity power cell" name = "high-capacity power cell"
origin_tech = list(TECH_POWER = 2) origin_tech = list(TECH_POWER = 2)
icon_state = "b_hi" // CHOMPEdit icon_state = "b_hi"
charge = 10000 charge = 10000
maxcharge = 10000 maxcharge = 10000
matter = list(MAT_STEEL = 700, MAT_GLASS = 60) matter = list(MAT_STEEL = 700, MAT_GLASS = 60)
@@ -66,7 +66,7 @@
/obj/item/cell/super /obj/item/cell/super
name = "super-capacity power cell" name = "super-capacity power cell"
origin_tech = list(TECH_POWER = 5) origin_tech = list(TECH_POWER = 5)
icon_state = "b_sup" // CHOMPEdit icon_state = "b_sup"
charge = 20000 charge = 20000
maxcharge = 20000 maxcharge = 20000
matter = list(MAT_STEEL = 700, MAT_GLASS = 70) matter = list(MAT_STEEL = 700, MAT_GLASS = 70)
@@ -81,7 +81,7 @@
/obj/item/cell/robot_syndi /obj/item/cell/robot_syndi
name = "syndicate robot power cell" name = "syndicate robot power cell"
description_fluff = "Almost as good as a hyper." description_fluff = "Almost as good as a hyper."
icon_state = "b_sup" //We don't want roboticists confuse it with a low standard cell // CHOMPEdit icon_state = "b_sup" //We don't want roboticists confuse it with a low standard cell
charge = 25000 charge = 25000
maxcharge = 25000 maxcharge = 25000
robot_durability = 65 robot_durability = 65
@@ -92,7 +92,7 @@
/obj/item/cell/hyper /obj/item/cell/hyper
name = "hyper-capacity power cell" name = "hyper-capacity power cell"
origin_tech = list(TECH_POWER = 6) origin_tech = list(TECH_POWER = 6)
icon_state = "b_hy" // CHOMPEdit icon_state = "b_hy"
charge = 30000 charge = 30000
maxcharge = 30000 maxcharge = 30000
matter = list(MAT_STEEL = 700, MAT_GLASS = 80) matter = list(MAT_STEEL = 700, MAT_GLASS = 80)
@@ -106,7 +106,7 @@
*/ */
/obj/item/cell/mech /obj/item/cell/mech
name = "mecha power cell" name = "mecha power cell"
icon_state = "exs_s" // CHOMPEdit icon_state = "exs_s"
connector_type = "mech" connector_type = "mech"
charge = 15000 charge = 15000
maxcharge = 15000 maxcharge = 15000
@@ -117,7 +117,6 @@
desc = "An ancient battery design not commonly seen anymore. It looks like it'd fit inside a mech however..." desc = "An ancient battery design not commonly seen anymore. It looks like it'd fit inside a mech however..."
origin_tech = list(TECH_POWER = 0) //Litteraly an old car battery, doesn't need tech origin_tech = list(TECH_POWER = 0) //Litteraly an old car battery, doesn't need tech
icon_state = "lead" icon_state = "lead"
icon = 'icons/obj/power_cells.dmi' // CHOMPAdd
charge = 8000 charge = 8000
maxcharge = 8000 maxcharge = 8000
matter = list(MAT_STEEL = 300, MAT_GLASS = 10) matter = list(MAT_STEEL = 300, MAT_GLASS = 10)
@@ -128,7 +127,7 @@
/obj/item/cell/mech/high /obj/item/cell/mech/high
name = "high-capacity mecha power cell" name = "high-capacity mecha power cell"
origin_tech = list(TECH_POWER = 3) origin_tech = list(TECH_POWER = 3)
icon_state = "exs_m" // CHOMPEdit icon_state = "exs_m"
charge = 20000 charge = 20000
maxcharge = 20000 maxcharge = 20000
matter = list(MAT_STEEL = 800, MAT_GLASS = 80) matter = list(MAT_STEEL = 800, MAT_GLASS = 80)
@@ -136,7 +135,7 @@
/obj/item/cell/mech/super /obj/item/cell/mech/super
name = "super-capacity mecha power cell" name = "super-capacity mecha power cell"
origin_tech = list(TECH_POWER = 6) origin_tech = list(TECH_POWER = 6)
icon_state = "exs_l" // CHOMPEdit icon_state = "exs_l"
charge = 25000 charge = 25000
maxcharge = 25000 maxcharge = 25000
matter = list(MAT_STEEL = 800, MAT_GLASS = 100) matter = list(MAT_STEEL = 800, MAT_GLASS = 100)
@@ -146,7 +145,7 @@
*/ */
/obj/item/cell/infinite /obj/item/cell/infinite
name = "infinite-capacity power cell!" name = "infinite-capacity power cell!"
icon_state = "infinite_b" // CHOMPEdit icon_state = "infinite_b"
origin_tech = null origin_tech = null
charge = 30000 charge = 30000
maxcharge = 30000 //determines how badly mobs get shocked maxcharge = 30000 //determines how badly mobs get shocked
@@ -182,12 +181,10 @@
icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi' icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
icon_state = "yellow slime extract" //"potato_battery" icon_state = "yellow slime extract" //"potato_battery"
connector_type = "slime" connector_type = "slime"
// CHOMPEdit Start
description_info = "This 'cell' holds a max charge of 20k and self recharges over time." description_info = "This 'cell' holds a max charge of 20k and self recharges over time."
charge = 20000 charge = 20000
maxcharge = 20000 maxcharge = 20000
charge_amount = 500 // 2.5%. charge_amount = 500 // 2.5%.
// CHOMPEdit End
matter = null matter = null
self_recharge = TRUE self_recharge = TRUE
standard_overlays = FALSE standard_overlays = FALSE
@@ -201,7 +198,6 @@
charge = 360 // CHOMPEdit charge = 360 // CHOMPEdit
maxcharge = 360 //Emergency lights use 0.2 W per tick, meaning ~30 minutes of emergency power from a cell // CHOMPEdit maxcharge = 360 //Emergency lights use 0.2 W per tick, meaning ~30 minutes of emergency power from a cell // CHOMPEdit
matter = list(MAT_GLASS = 20) matter = list(MAT_GLASS = 20)
icon = 'icons/obj/power_cells.dmi' // CHOMPAdd
icon_state = "em_light" icon_state = "em_light"
connector_type = "emergency" connector_type = "emergency"
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
@@ -264,9 +260,9 @@
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6) origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6)
icon = 'icons/obj/abductor.dmi' icon = 'icons/obj/abductor.dmi'
icon_state = "cell" icon_state = "cell"
charge = 10000 // CHOMPEdit charge = 10000
maxcharge = 10000 // CHOMPEdit maxcharge = 10000
charge_amount = 500 // CHOMPEdit charge_amount = 500
self_recharge = TRUE self_recharge = TRUE
charge_delay = 50 charge_delay = 50
matter = null matter = null
@@ -288,3 +284,31 @@
icon = 'icons/obj/power_vr.dmi' icon = 'icons/obj/power_vr.dmi'
icon_state = "cellb" icon_state = "cellb"
swaps_to = /obj/item/cell/device/weapon/recharge/alien/hybrid swaps_to = /obj/item/cell/device/weapon/recharge/alien/hybrid
/*
* Security Borg
*/
/obj/item/cell/secborg
name = "security borg rechargable D battery"
origin_tech = list(TECH_POWER = 0)
icon_state = "secborg"
charge = 2400
maxcharge = 2400
matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
/obj/item/cell/secborg/empty
charge = 0
/*
* Giga
*/
/obj/item/cell/giga
name = "giga-capacity power cell"
origin_tech = list(TECH_POWER = 8)
icon_state = "meb_b_hi"
charge = 40000
maxcharge = 40000
matter = list(MAT_STEEL = 1000, MAT_GLASS = 100)
/obj/item/cell/giga/empty
charge = 0

17
code/modules/research/tg/designs/boards/boards_yw.dm
View File

@@ -1,17 +0,0 @@
/datum/design_techweb/board/teleporter_hub
name = "teleporter hub"
id = "teleporter_hub"
build_path = /obj/item/circuitboard/teleporter_hub
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/board/teleporter_station
name = "teleporter station"
id = "teleporter_station"
build_path = /obj/item/circuitboard/teleporter_station
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING

18
code/modules/research/tg/designs/boards/science.dm
View File

@@ -178,3 +178,21 @@
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH
) )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
/datum/design_techweb/board/teleporter_hub
name = "teleporter hub"
id = "teleporter_hub"
build_path = /obj/item/circuitboard/teleporter_hub
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/board/teleporter_station
name = "teleporter station"
id = "teleporter_station"
build_path = /obj/item/circuitboard/teleporter_station
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING

175
code/modules/research/tg/designs/chomp_designs.dm
View File

@@ -90,62 +90,6 @@
) )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/floor_painter
name = "Floor Painter"
id = "floor_painter"
materials = list(MAT_STEEL = 3000, MAT_GLASS = 500)
build_path = /obj/item/floor_painter
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE
/datum/design_techweb/medical_holosign
name = "Medical Holosign"
id = "medical_holosign"
materials = list(MAT_STEEL = 1000, MAT_GLASS = 500)
build_path = /obj/item/holosign_creator/medical
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL
/datum/design_techweb/atmos_holosign
name = "Atmos Holosign"
id = "atmos_holosign"
materials = list(MAT_STEEL = 1000, MAT_GLASS = 500)
build_path = /obj/item/holosign_creator/combifan
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/mail_scanner
name = "Mail Scanner"
id = "mail_scanner"
materials = list(MAT_STEEL = 500, MAT_GLASS = 500)
build_path = /obj/item/mail_scanner
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
/datum/design_techweb/borgos
name = "Borg-O's Recipe"
desc = "A recipe for the cult classic Borg-O's meal. Warning: Not suitable for organic consumption."
id = "borgos1"
materials = list(MAT_STEEL = 5000)
build_path = /obj/item/trash/rkibble
build_type = PROTOLATHE //I...I guess???
category = list(
RND_CATEGORY_EQUIPMENT
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SCIENCE
/datum/design_techweb/mindbinder /datum/design_techweb/mindbinder
name = "Mind Binder" name = "Mind Binder"
id = "mindbinder" id = "mindbinder"
@@ -157,126 +101,7 @@
) )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL
/*
//Big Cells
*/
/datum/design_techweb/potato_cell
name = "Potato Cell"
id = "potato_cell"
materials = list(MAT_STEEL = 100, MAT_GLASS = 10)
build_path = /obj/item/cell/potato
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/datum/design_techweb/giga_cell
name = "Giga-Capacity Cell"
id = "giga_cell"
materials = list(MAT_STEEL = 1000, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 100, MAT_PHORON = 1000, MAT_DURASTEEL = 100, MAT_URANIUM = 100)
build_path = /obj/item/cell/giga
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/*
//Device Cells
*/
/datum/design_techweb/cell_device_empproof
name = "Device Cell, EMP-Proof"
id = "empproof_device"
materials = list(MAT_STEEL = 350, MAT_GLASS = 25, MAT_MORPHIUM = 25, MAT_PHORON = 25)
build_path = /obj/item/cell/device/empproof
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_advance_device_empproof
name = "Device Cell, Advanced EMP-Proof"
id = "empproof_advanced_device"
materials = list(MAT_STEEL = 700, MAT_GLASS = 50, MAT_MORPHIUM = 50, MAT_PHORON = 50)
build_path = /obj/item/cell/device/weapon/empproof
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_advance_device_recharge
name = "Device Cell, Advanced Recharging"
id = "recharging_advanced_device"
materials = list(MAT_STEEL = 1000, MAT_GLASS = 400, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
build_path = /obj/item/cell/device/weapon/recharge
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_super_device
name = "Device Cell, Super"
id = "super_device"
materials = list(MAT_STEEL = 700, MAT_GLASS = 70, MAT_GOLD = 50, MAT_SILVER = 20)
build_path = /obj/item/cell/device/super
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_hype_device
name = "Device Cell, Hyper"
id = "hyper_device"
materials = list(MAT_STEEL = 1400, MAT_GLASS = 1400, MAT_GOLD = 150, MAT_SILVER = 150)
build_path = /obj/item/cell/device/hyper
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_giga_device
name = "Device Cell, Giga"
id = "giga_device"
materials = list(MAT_STEEL = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_GLASS = 100, MAT_PHORON = 2000, MAT_DURASTEEL = 200, MAT_URANIUM = 200)
build_path = /obj/item/cell/device/giga
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_omni_device
name = "Device Cell, Omni"
build_type = PROTOLATHE
id = "omni-device"
materials = list(MAT_STEEL = 1700, MAT_GLASS = 550, MAT_DURASTEEL = 230, MAT_MORPHIUM = 320, MAT_METALHYDROGEN = 600, MAT_URANIUM = 60, MAT_VERDANTIUM = 150, MAT_PHORON = 900)
build_path = /obj/item/cell/device/weapon/recharge/alien/omni
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
//Misc weapons //Misc weapons
/datum/design_techweb/confetti_cannon
name = "Confetti Cannon"
desc = "Stuff it with paper and shoot! You'll be a hit at every party."
id = "confetti_cannon"
materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000)
build_path = /obj/item/gun/launcher/confetti_cannon
build_type = PROTOLATHE
category = list(
RND_CATEGORY_TOOLS
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE
/datum/design_techweb/metamorphosisray /datum/design_techweb/metamorphosisray
name = "metamorphosis ray" name = "metamorphosis ray"

12
code/modules/research/tg/designs/misc_designs.dm
View File

@@ -132,3 +132,15 @@
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
) )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
/datum/design_techweb/borgos
name = "Borg-O's Recipe"
desc = "A recipe for the cult classic Borg-O's meal. Warning: Not suitable for organic consumption."
id = "borgos1"
materials = list(MAT_STEEL = 5000)
build_path = /obj/item/trash/rkibble
build_type = PROTOLATHE //I...I guess???
category = list(
RND_CATEGORY_EQUIPMENT
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SCIENCE

107
code/modules/research/tg/designs/stock_part_designs.dm
View File

@@ -482,3 +482,110 @@
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_EXCHANGERS
) )
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/*
//Big Cells
*/
/datum/design_techweb/potato_cell
name = "Potato Cell"
id = "potato_cell"
materials = list(MAT_STEEL = 100, MAT_GLASS = 10)
build_path = /obj/item/cell/potato
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/datum/design_techweb/giga_cell
name = "Giga-Capacity Cell"
id = "giga_cell"
materials = list(MAT_STEEL = 1000, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 100, MAT_PHORON = 1000, MAT_DURASTEEL = 100, MAT_URANIUM = 100)
build_path = /obj/item/cell/giga
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
/*
//Device Cells
*/
/datum/design_techweb/cell_device_empproof
name = "Device Cell, EMP-Proof"
id = "empproof_device"
materials = list(MAT_STEEL = 350, MAT_GLASS = 25, MAT_MORPHIUM = 25, MAT_PHORON = 25)
build_path = /obj/item/cell/device/empproof
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_advance_device_empproof
name = "Device Cell, Advanced EMP-Proof"
id = "empproof_advanced_device"
materials = list(MAT_STEEL = 700, MAT_GLASS = 50, MAT_MORPHIUM = 50, MAT_PHORON = 50)
build_path = /obj/item/cell/device/weapon/empproof
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_advance_device_recharge
name = "Device Cell, Advanced Recharging"
id = "recharging_advanced_device"
materials = list(MAT_STEEL = 1000, MAT_GLASS = 400, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
build_path = /obj/item/cell/device/weapon/recharge
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_super_device
name = "Device Cell, Super"
id = "super_device"
materials = list(MAT_STEEL = 700, MAT_GLASS = 70, MAT_GOLD = 50, MAT_SILVER = 20)
build_path = /obj/item/cell/device/super
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_hype_device
name = "Device Cell, Hyper"
id = "hyper_device"
materials = list(MAT_STEEL = 1400, MAT_GLASS = 1400, MAT_GOLD = 150, MAT_SILVER = 150)
build_path = /obj/item/cell/device/hyper
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_4
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_giga_device
name = "Device Cell, Giga"
id = "giga_device"
materials = list(MAT_STEEL = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_GLASS = 100, MAT_PHORON = 2000, MAT_DURASTEEL = 200, MAT_URANIUM = 200)
build_path = /obj/item/cell/device/giga
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/cell_omni_device
name = "Device Cell, Omni"
build_type = PROTOLATHE
id = "omni-device"
materials = list(MAT_STEEL = 1700, MAT_GLASS = 550, MAT_DURASTEEL = 230, MAT_MORPHIUM = 320, MAT_METALHYDROGEN = 600, MAT_URANIUM = 60, MAT_VERDANTIUM = 150, MAT_PHORON = 900)
build_path = /obj/item/cell/device/weapon/recharge/alien/omni
build_type = PROTOLATHE
category = list(
RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_5
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING

57
code/modules/research/tg/designs/tool_designs.dm
View File

@@ -886,3 +886,60 @@
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED
) )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/mail_scanner
name = "Mail Scanner"
id = "mail_scanner"
materials = list(MAT_STEEL = 500, MAT_GLASS = 500)
build_path = /obj/item/mail_scanner
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
/datum/design_techweb/atmos_holosign
name = "Atmos Holosign"
id = "atmos_holosign"
materials = list(MAT_STEEL = 1000, MAT_GLASS = 500)
build_path = /obj/item/holosign_creator/combifan
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design_techweb/confetti_cannon
name = "Confetti Cannon"
desc = "Stuff it with paper and shoot! You'll be a hit at every party."
id = "confetti_cannon"
materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000)
build_path = /obj/item/gun/launcher/confetti_cannon
build_type = PROTOLATHE
category = list(
RND_CATEGORY_TOOLS
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE
/datum/design_techweb/floor_painter
name = "Floor Painter"
id = "floor_painter"
materials = list(MAT_STEEL = 3000, MAT_GLASS = 500)
build_path = /obj/item/floor_painter
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE
/datum/design_techweb/medical_holosign
name = "Medical Holosign"
id = "medical_holosign"
materials = list(MAT_STEEL = 1000, MAT_GLASS = 500)
build_path = /obj/item/holosign_creator/medical
build_type = PROTOLATHE
category = list(
RND_CATEGORY_MACHINE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL

16
code/modules/research/tg/techwebs/nodes/engi_nodes.dm
View File

@@ -15,7 +15,7 @@
"device_cell", "device_cell",
"weapon_cell", "weapon_cell",
"high_mech_cell", "high_mech_cell",
"potato_cell", //CHOMPEdit Add - Adds potato cell. "potato_cell",
// "basic_scanning", // "basic_scanning",
// "condenser", // "condenser",
// "igniter", // "igniter",
@@ -58,7 +58,7 @@
"phasic_sensor", "phasic_sensor",
"ultra_micro_laser", "ultra_micro_laser",
"hyper_cell", "hyper_cell",
"super_device", //CHOMPEDIT Add - Adds super device cell. "super_device",
"hyper_device_cell", "hyper_device_cell",
"arped", "arped",
) )
@@ -80,7 +80,7 @@
"hyper_sensor", "hyper_sensor",
"hyper_micro_laser", "hyper_micro_laser",
"hyper_cell", "hyper_cell",
"hyper_device", //CHOMPEdit Add - Hyper device cell "hyper_device",
) )
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier3_any = TECHWEB_TIER_4_POINTS) discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier3_any = TECHWEB_TIER_4_POINTS)
@@ -126,8 +126,8 @@
"omni_capacitor", "omni_capacitor",
"omni_sensor", "omni_sensor",
"omni_micro_laser", "omni_micro_laser",
"giga_device", //CHOMPEdit Add - Adds Giga device cell. "giga_device",
"giga_cell", //CHOMPEdit Add - Adds Giga cell. "giga_cell",
) )
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier4_any = TECHWEB_TIER_5_POINTS) discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier4_any = TECHWEB_TIER_5_POINTS)
@@ -262,7 +262,7 @@
"advancedtscanner", "advancedtscanner",
"rapidpipedispenser", "rapidpipedispenser",
"protohypospray", "protohypospray",
"atmos_holosign", //CHOMPEdit Add - Adds atmos holosign. "atmos_holosign",
// "flatpacker", // "flatpacker",
// "rangedanalyzer", // "rangedanalyzer",
// "rtd_loaded", // "rtd_loaded",
@@ -337,7 +337,7 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
announce_channels = list(CHANNEL_ENGINEERING,CHANNEL_MEDICAL) announce_channels = list(CHANNEL_ENGINEERING,CHANNEL_MEDICAL)
/datum/techweb_node/cells_empproof //CHOMPEdit Start - EMP proof cells and Recharging Cells and teleporter /datum/techweb_node/cells_empproof
id = TECHWEB_NODE_PARTS_EMP_PROOF id = TECHWEB_NODE_PARTS_EMP_PROOF
display_name = "EMP-Proof Parts" display_name = "EMP-Proof Parts"
description = "Advanced batteries that are able to withstand strong bursts of energy without failure." description = "Advanced batteries that are able to withstand strong bursts of energy without failure."
@@ -371,7 +371,7 @@
"teleporter_station", "teleporter_station",
) )
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
announce_channels = list(CHANNEL_ENGINEERING) //CHOMPEdit End announce_channels = list(CHANNEL_ENGINEERING)
/datum/techweb_node/thermal_vision /datum/techweb_node/thermal_vision
id = TECHWEB_NODE_THERMAL_VISION id = TECHWEB_NODE_THERMAL_VISION

2
code/modules/research/tg/techwebs/nodes/medbay_nodes.dm
View File

@@ -84,7 +84,7 @@
"organ_ripper", "organ_ripper",
"bone_clamp", "bone_clamp",
"roller_bed", "roller_bed",
"medical_holosign", //CHOMPEDIT Add - Medical Holosign "medical_holosign",
// "smoke_machine", // "smoke_machine",
// "healthanalyzer_advanced", // "healthanalyzer_advanced",
// "mod_health_analyzer", // "mod_health_analyzer",

12
code/modules/research/tg/techwebs/nodes/service_nodes.dm
View File

@@ -10,8 +10,8 @@
"ear_translator", "ear_translator",
"walkpod", "walkpod",
"juke_remote", "juke_remote",
"mail_scanner", //CHOMPEdit Add - Adds Mail Scanner "mail_scanner",
"floor_painter", //CHOMPEdit Add - Adds Floor Painter "floor_painter",
// "fax", // "fax",
// "sec_pen", // "sec_pen",
// "handlabel", // "handlabel",
@@ -244,8 +244,8 @@
"fryer_board", "fryer_board",
"cerealmaker_board", "cerealmaker_board",
"candymachine_board", "candymachine_board",
"food_replicator", //CHOMPEDIT Add - Adds Food Replicator "food_replicator", //CHOMPEDIT Enable - Adds Food Replicator
"borgos1", //CHOMPEDIT Add - Adds Borgos "borgos1",
// "range", // "range",
// "souppot", // "souppot",
// "processor", // "processor",
@@ -263,7 +263,7 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
announce_channels = list(CHANNEL_SERVICE) announce_channels = list(CHANNEL_SERVICE)
/datum/techweb_node/confetti_cannon //CHOMPEdit Start - Adds Confetti Cannon /datum/techweb_node/confetti_cannon
id = TECHWEB_NODE_CONFETTI id = TECHWEB_NODE_CONFETTI
display_name = "Confetti Cannon" display_name = "Confetti Cannon"
description = "Less explosive than fireworks yet more messy!" description = "Less explosive than fireworks yet more messy!"
@@ -272,4 +272,4 @@
"confetti_cannon", "confetti_cannon",
) )
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
announce_channels = list(CHANNEL_COMMON) //CHOMPEdit End - Adds Confetti Cannon announce_channels = list(CHANNEL_COMMON)

BIN
icons/obj/power_cells.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
icons/obj/power_cells_old.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

44
modular_chomp/code/modules/power/cells/device_cells.dm
View File

@@ -1,44 +0,0 @@
/*
* Giga
*/
/obj/item/cell/device/giga
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"
charge = 10000
maxcharge = 10000
charge_amount = 20
origin_tech = list(TECH_POWER = 8)
/obj/item/cell/device/giga/empty
charge = 0
/obj/item/cell/device/super
name = "super device power cell"
desc = "A small upgraded power cell designed to power handheld devices."
icon_state = "m_hy"
charge = 3600
maxcharge = 3600
charge_amount = 20
origin_tech = list(TECH_POWER = 3)
/obj/item/cell/device/super/empty
charge = 0
/obj/item/cell/void/hybrid
icon = 'icons/obj/power_vr.dmi'
icon_state = "cellb"
swaps_to = /obj/item/cell/device/weapon/recharge/alien/hybrid
/obj/item/cell/device/weapon/recharge/alien/omni
name = "omni weapon power cell"
desc = "A mix between alien technology and phoron-based tech. Not quite as good as a true void cell though."
charge_amount = 90 // 2.5%.
charge = 3600
maxcharge = 3600
charge_delay = 50
swaps_to = null
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
/obj/item/cell/device/weapon/recharge/alien/omni/empty
charge = 0

28
modular_chomp/code/modules/power/cells/power_cells.dm
View File

@@ -1,28 +0,0 @@
/*
* Security Borg
*/
/obj/item/cell/secborg
name = "security borg rechargable D battery"
origin_tech = list(TECH_POWER = 0)
icon_state = "secborg"
charge = 2400
maxcharge = 2400 //who the hell thought 6 shots was enough for a dogborg taser?
matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
/obj/item/cell/secborg/empty
charge = 0
/*
* Giga
*/
/obj/item/cell/giga
name = "giga-capacity power cell"
origin_tech = list(TECH_POWER = 8)
icon_state = "meb_b_hi"
charge = 40000
maxcharge = 40000
matter = list(MAT_STEEL = 1000, MAT_GLASS = 100)
/obj/item/cell/giga/empty
charge = 0

BIN
modular_chomp/icons/obj/power_cells.dmi
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

3
vorestation.dme
View File

@@ -4460,7 +4460,6 @@
#include "code\modules\research\tg\designs\weapon_designs.dm" #include "code\modules\research\tg\designs\weapon_designs.dm"
#include "code\modules\research\tg\designs\boards\atmos.dm" #include "code\modules\research\tg\designs\boards\atmos.dm"
#include "code\modules\research\tg\designs\boards\boards_ch.dm" #include "code\modules\research\tg\designs\boards\boards_ch.dm"
#include "code\modules\research\tg\designs\boards\boards_yw.dm"
#include "code\modules\research\tg\designs\boards\cargo.dm" #include "code\modules\research\tg\designs\boards\cargo.dm"
#include "code\modules\research\tg\designs\boards\engineering.dm" #include "code\modules\research\tg\designs\boards\engineering.dm"
#include "code\modules\research\tg\designs\boards\kitchen.dm" #include "code\modules\research\tg\designs\boards\kitchen.dm"
@@ -5270,8 +5269,6 @@
#include "modular_chomp\code\modules\planet\tyr.dm" #include "modular_chomp\code\modules\planet\tyr.dm"
#include "modular_chomp\code\modules\planet\smokestar\turf.dm" #include "modular_chomp\code\modules\planet\smokestar\turf.dm"
#include "modular_chomp\code\modules\player_tips\player_tips_list.dm" #include "modular_chomp\code\modules\player_tips\player_tips_list.dm"
#include "modular_chomp\code\modules\power\cells\device_cells.dm"
#include "modular_chomp\code\modules\power\cells\power_cells.dm"
#include "modular_chomp\code\modules\projectiles\gun.dm" #include "modular_chomp\code\modules\projectiles\gun.dm"
#include "modular_chomp\code\modules\projectiles\mob.dm" #include "modular_chomp\code\modules\projectiles\mob.dm"
#include "modular_chomp\code\modules\projectiles\projectile.dm" #include "modular_chomp\code\modules\projectiles\projectile.dm"