From 52d0acb115aa8791ae8a34291b4d006fd86a54e9 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Fri, 7 Oct 2022 21:49:09 -0400 Subject: [PATCH] Update robolimbs.dm --- code/modules/organs/robolimbs.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index ed8cd23251..ff8d1dd5c7 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -468,9 +468,13 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ parts = list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) modular_bodyparts = MODULAR_BODYPART_PROSTHETIC -<<<<<<< HEAD /obj/item/weapon/disk/limb -======= + name = "Limb Blueprints" + desc = "A disk containing the blueprints for prosthetics." + icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit + icon_state = "data-white" //VOREStation Edit + var/company = "" + /datum/robolimb/wooden/teshari company = "Morgan Trading Co - Teshari" icon = 'icons/mob/human_races/cyberlimbs/prosthesis/wooden_teshari.dmi' @@ -490,14 +494,6 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ species_alternates = list(SPECIES_HUMAN = "Morgan Trading Co") suggested_species = SPECIES_TESHARI -/obj/item/disk/limb ->>>>>>> df3ecd3a45f... Merge pull request #8713 from Greenjoe12345/woodlimb - name = "Limb Blueprints" - desc = "A disk containing the blueprints for prosthetics." - icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit - icon_state = "data-white" //VOREStation Edit - var/company = "" - /obj/item/weapon/disk/limb/New(var/newloc) ..() if(company)