From 52961b6db09d45bb594a8f2b2c110d89d867ef2c Mon Sep 17 00:00:00 2001 From: Raeschen Date: Sun, 2 Jul 2023 15:40:43 +0200 Subject: [PATCH] Update mechfab_designs_vr.dm merge conflict --- code/game/mecha/micro/mechfab_designs_vr.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/game/mecha/micro/mechfab_designs_vr.dm b/code/game/mecha/micro/mechfab_designs_vr.dm index 2e1368dd0b..795530947b 100644 --- a/code/game/mecha/micro/mechfab_designs_vr.dm +++ b/code/game/mecha/micro/mechfab_designs_vr.dm @@ -185,16 +185,4 @@ name = "Weasel Head" id = "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) ->>>>>>> ba46363f1e... Merge pull request #15097 from MisterGrimm/miscfixesandchanges