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
2021-05-27 22:39:00 -04:00
committed by GitHub
parent dc13ab6d4a
commit e33c671a92
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/research/designs/weapons_vr.dm
View File

@@ -157,12 +157,8 @@
materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "uranium" = 2000, "phoron" = 2000, "diamond" = 500) materials = list(DEFAULT_WALL_MATERIAL = 5000, "glass" = 5000, "uranium" = 2000, "phoron" = 2000, "diamond" = 500)
build_path = /obj/item/ammo_casing/microbattery/combat/stripper build_path = /obj/item/ammo_casing/microbattery/combat/stripper
sort_string = "MAVCG" sort_string = "MAVCG"
<<<<<<< HEAD
None of these for now, too. -DHA */ None of these for now, too. -DHA */
||||||| parent of 21658b8d85... Merge pull request #10401 from VOREStation/upstream-merge-8075
=======
/datum/design/item/weapon/ballistic/ammo/ptrshell /datum/design/item/weapon/ballistic/ammo/ptrshell
name = "14.5mm shell" name = "14.5mm shell"
desc = "A dense-core projectile fired from a small cannon." desc = "A dense-core projectile fired from a small cannon."
@@ -172,7 +168,6 @@ None of these for now, too. -DHA */
build_path = /obj/item/ammo_casing/a145 build_path = /obj/item/ammo_casing/a145
sort_string = "MABBD" sort_string = "MABBD"
>>>>>>> 21658b8d85... Merge pull request #10401 from VOREStation/upstream-merge-8075
/* /*
/datum/design/item/nsfw_cell/final /datum/design/item/nsfw_cell/final
name = "FINAL OPTION" name = "FINAL OPTION"