cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-04-17 23:37:32 -04:00
committed by GitHub
parent 66853c1f0f
commit ae1ac229d4
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,18 +13,11 @@
matter = list(MAT_STEEL = 350, MAT_GLASS = 50) matter = list(MAT_STEEL = 350, MAT_GLASS = 50)
preserve_item = 1 preserve_item = 1
<<<<<<< HEAD
//Yawn Changes //Yawn Changes
/obj/item/weapon/cell/device/weapon //Aka adv /obj/item/weapon/cell/device/weapon //Aka adv
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"
=======
/obj/item/weapon/cell/device/weapon
name = "weapon power cell"
desc = "A small power cell designed to power handheld weaponry."
icon_state = "weapon_cell" icon_state = "weapon_cell"
>>>>>>> 03b55b548a... Merge pull request #12761 from GhostActual/energen_batteries
maxcharge = 2400 maxcharge = 2400
charge_amount = 20 charge_amount = 20
origin_tech = list(TECH_POWER = 2) origin_tech = list(TECH_POWER = 2)