cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5714 from Cyrelius/Weapons/Armour

Browse Source 
Energy Weapons Balance Pass.
This commit is contained in:
Razgriz
2023-06-23 23:44:04 -07:00
committed by GitHub
parent c82c83a046 9dcac38f42
commit 4aaf01a5bb
11 changed files with 112 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@
icon_state = "meb_m_hi"
maxcharge = 10000
charge_amount = 20
origin_tech = list(TECH_POWER = 5, TECH_PRECURSOR = 1)
origin_tech = list(TECH_POWER = 8)
/obj/item/weapon/cell/device/giga/empty/Initialize()
. = ..()
@@ -161,10 +161,10 @@
catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_cell)
icon = 'icons/obj/abductor.dmi'
icon_state = "cell"
maxcharge = 3600
charge_amount = 180 // 5%.
maxcharge = 5000
charge_amount = 130 // 2.5%.
charge_delay = 50 // Every five seconds, bit faster than the default.
origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 5, TECH_PHORON = 5, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2)
/obj/item/weapon/cell/device/weapon/recharge/alien/update_icon()
return // No overlays please.
@@ -192,8 +192,8 @@
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6)
icon = 'icons/obj/abductor.dmi'
icon_state = "cell"
maxcharge = 4800 //10x the device version
charge_amount = 1200 //10x the device version
maxcharge = 10000
charge_amount = 500
self_recharge = TRUE
charge_delay = 50
matter = null
@@ -224,11 +224,12 @@
//YAWN Addtion
/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 = 120 // 2.5%.
maxcharge = 4800
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%.
maxcharge = 3600
charge_delay = 50
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2)
swaps_to = null
origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
/obj/item/weapon/cell/device/weapon/recharge/alien/omni/empty/Initialize()
. = ..()

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

@@ -20,7 +20,7 @@
name = "security borg rechargable D battery"
origin_tech = list(TECH_POWER = 0)
icon_state = "secborg"
maxcharge = 600 //600 max charge / 100 charge per shot = six shots
maxcharge = 2400 //who the hell thought 6 shots was enough for a dogborg taser?
matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
/obj/item/weapon/cell/secborg/empty/New()
@@ -88,7 +88,7 @@
*/
/obj/item/weapon/cell/giga
name = "giga-capacity power cell"
origin_tech = list(TECH_POWER = 6, TECH_PRECURSOR = 1)
origin_tech = list(TECH_POWER = 8)
icon_state = "meb_b_hi"
maxcharge = 40000
matter = list(MAT_STEEL = 1000, MAT_GLASS = 100)
@@ -162,7 +162,7 @@
icon_state = "yellow slime extract" //"potato_battery"
description_info = "This 'cell' holds a max charge of 20k and self recharges over time."
maxcharge = 20000
charge_amount = 1000 // 5%.
charge_amount = 500 // 2.5%.
matter = null
self_recharge = TRUE
standard_overlays = FALSE

8
modular_chomp/code/modules/research/designs/power_cells.dm
View File

@@ -57,8 +57,8 @@
/datum/design/item/powercell/giga
name = "giga-capacity"
id = "giga_cell"
req_tech = list(TECH_POWER = 6, TECH_MATERIAL = 5, TECH_PRECURSOR = 1, TECH_PHORON = 4)
materials = list(MAT_STEEL = 1000, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 100, MAT_PHORON = 1000, MAT_METALHYDROGEN = 250, MAT_DURASTEEL = 100, MAT_URANIUM = 100)
req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 5, TECH_ARCANE = 1, TECH_PHORON = 4)
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/weapon/cell/giga
category = list("Misc")
sort_string = "BAAAE"
@@ -140,8 +140,8 @@
/datum/design/item/powercell/giga_device
name = "device, giga"
id = "giga_device"
req_tech = list(TECH_POWER = 6, TECH_MATERIAL = 6, TECH_PRECURSOR = 1, TECH_PHORON = 4)
materials = list(MAT_STEEL = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_GLASS = 100, MAT_PHORON = 2000, MAT_METALHYDROGEN = 500, MAT_DURASTEEL = 200, MAT_URANIUM = 200)
req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6, TECH_ARCANE = 1, TECH_PHORON = 4)
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/weapon/cell/device/giga
category = list("Misc")
sort_string = "BAAAH"

17
modular_chomp/code/modules/research/designs/weapons.dm
View File

@@ -39,35 +39,35 @@
/datum/design/item/weapon/phase/frontier_holdout
id = "holdout frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 150, MAT_VERDANTIUM = 100, MAT_PHORON = 1000)
materials = list(MAT_STEEL = 6000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 100, MAT_PHORON = 1000)
build_path = /obj/item/weapon/gun/energy/locked/frontier/holdout
sort_string = "MACAE"
/datum/design/item/weapon/phase/frontier_phaser
id = "frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 7000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
materials = list(MAT_STEEL = 7000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
build_path = /obj/item/weapon/gun/energy/locked/frontier
sort_string = "MACAF"
/datum/design/item/weapon/phase/frontier_carbine
id = "carbine frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 8, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 6500, MAT_GLASS = 900, MAT_DURASTEEL = 150, MAT_METALHYDROGEN = 250, MAT_VERDANTIUM = 200, MAT_PHORON = 4000)
materials = list(MAT_STEEL = 6500, MAT_GLASS = 900, MAT_DURASTEEL = 150, MAT_VERDANTIUM = 200, MAT_PHORON = 4000)
build_path = /obj/item/weapon/gun/energy/locked/frontier/carbine
sort_string = "MACAG"
/datum/design/item/weapon/phase/frontier_rifle
id = "marksman rifle frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 8000, MAT_GLASS = 900, MAT_DURASTEEL = 200, MAT_METALHYDROGEN = 300, MAT_VERDANTIUM = 250, MAT_PHORON = 2000)
materials = list(MAT_STEEL = 8000, MAT_GLASS = 900, MAT_DURASTEEL = 200, MAT_VERDANTIUM = 250, MAT_PHORON = 2000)
build_path = /obj/item/weapon/gun/energy/locked/frontier/rifle
sort_string = "MACAH"
/datum/design/item/weapon/phase/frontier_handbow
id = "handbow frontier phaser"
req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
materials = list(MAT_STEEL = 5000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 1000)
materials = list(MAT_STEEL = 5000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 1000)
build_path = /obj/item/weapon/gun/energy/locked/frontier/handbow
sort_string = "MACAI"
@@ -79,3 +79,10 @@
build_path = /obj/item/weapon/gun/projectile/caseless/prototype
sort_string = "MACBA"
/datum/design/item/weapon/energy/lasercannon
desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
id = "lasercannon"
req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 6, TECH_POWER = 5)
materials = list(MAT_STEEL = 4000, MAT_GLASS = 1000, MAT_DIAMOND = 2000, MAT_TITANIUM = 4000, MAT_LEAD = 4000, MAT_URANIUM = 5000)
build_path = /obj/item/weapon/gun/energy/lasercannon
sort_string = "MAAAD"