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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-27 19:17:19 -04:00
committed by GitHub
parent 318ac12a29
commit b441ed93f5
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@
charge = 0 charge = 0
update_icon() update_icon()
<<<<<<< HEAD
/obj/item/weapon/cell/device/super /obj/item/weapon/cell/device/super
name = "super device power cell" name = "super device power cell"
desc = "A small upgraded power cell designed to power handheld devices." desc = "A small upgraded power cell designed to power handheld devices."
@@ -70,12 +69,9 @@
update_icon() update_icon()
//CHOMP Add end //CHOMP Add end
||||||| parent of 226802ff73... Merge pull request #11701 from Hatterhat/tg-ka
=======
/obj/item/weapon/cell/device/weapon/empproof /obj/item/weapon/cell/device/weapon/empproof
emp_proof = TRUE emp_proof = TRUE
>>>>>>> 226802ff73... Merge pull request #11701 from Hatterhat/tg-ka
/obj/item/weapon/cell/device/weapon/recharge /obj/item/weapon/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."