cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update robolimbs.dm

Browse Source
This commit is contained in:
C.L
2022-10-07 21:49:09 -04:00
committed by GitHub
parent 0a229ee339
commit 52d0acb115
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/robolimbs.dm
+6 -10
View File
@@ -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)