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

Update mechfab_designs_vr.dm merge conflict

Browse Source
This commit is contained in:
Raeschen
2023-07-02 15:40:43 +02:00
committed by GitHub
parent 879a1d4610
commit 52961b6db0
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/mecha/micro/mechfab_designs_vr.dm
View File

@@ -185,16 +185,4 @@
name = "Weasel Head" name = "Weasel Head"
id = "weasel_head" id = "weasel_head"
build_path = /obj/item/mecha_parts/micro/part/weasel_head build_path = /obj/item/mecha_parts/micro/part/weasel_head
<<<<<<< HEAD
materials = list(MAT_STEEL = 7000, MAT_GLASS = 2500) */
/datum/design/item/mecha/medigun //Who the fuck thought it was a good idea to put this here?
name = "BL-3/P directed restoration system"
desc = "A portable medical system used to treat external injuries from afar."
id = "mech_medigun"
req_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_BIO = 6)
materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 1750, MAT_DIAMOND = 1500, MAT_PHORON = 4000)
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/medigun
=======
materials = list(MAT_STEEL = 7000, MAT_GLASS = 2500) materials = list(MAT_STEEL = 7000, MAT_GLASS = 2500)
>>>>>>> ba46363f1e... Merge pull request #15097 from MisterGrimm/miscfixesandchanges