cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-03-18 18:46:26 -07:00
committed by GitHub
parent c0231159bc
commit d80abb7ec2
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/research/designs/mining_toys.dm
View File

@@ -49,8 +49,6 @@
build_path = /obj/item/device/depth_scanner build_path = /obj/item/device/depth_scanner
sort_string = "FBAAA" sort_string = "FBAAA"
<<<<<<< HEAD
=======
/datum/design/item/weapon/mining/upgradeAOE /datum/design/item/weapon/mining/upgradeAOE
name = "Mining Explosion Upgrade" name = "Mining Explosion Upgrade"
desc = "An area of effect upgrade for the Proto-Kinetic Accelerator." desc = "An area of effect upgrade for the Proto-Kinetic Accelerator."
@@ -59,4 +57,3 @@
materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 500, MAT_GOLD = 500, MAT_URANIUM = 2000, MAT_PHORON = 2000) materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 500, MAT_GOLD = 500, MAT_URANIUM = 2000, MAT_PHORON = 2000)
build_path = /obj/item/borg/upgrade/modkit/aoe/turfs build_path = /obj/item/borg/upgrade/modkit/aoe/turfs
sort_string = "FAAF" sort_string = "FAAF"
>>>>>>> fbc44e712e... Merge pull request #12440 from FartMaster69420/PKA-AOE