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

R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate.

Browse Source
This commit is contained in:
Iamgoofball
2013-11-20 15:19:24 -08:00
parent b024087119
commit 7dcb47ec2a
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1859,12 +1859,4 @@ datum/design/cart_traitor
req_tech = list("syndicate" = 2, "powerstorage" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
<<<<<<< HEAD
<<<<<<< HEAD
build_path = "/obj/item/weapon/cartridge/syndicate"
=======
build_path = "/obj/item/weapon/cartridge/syndicate"
>>>>>>> 60f644c4014e7ae0ca8267e271c8985574039f2b
=======
build_path = "/obj/item/weapon/cartridge/syndicate"
>>>>>>> ab43cc9cd6179a50395854c59eccfb43a651641b