Merge branch 'master' into protean-rework

This commit is contained in:
BlackMajor
2022-10-18 17:44:15 +13:00
committed by GitHub
302 changed files with 10544 additions and 5631 deletions

View File

@@ -475,6 +475,25 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
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'
species_cannot_use = list(SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
species_alternates = list(SPECIES_HUMAN = "Morgan Trading Co")
suggested_species = SPECIES_TESHARI
/datum/robolimb/wooden/sif
company = "Morgan Trading Co - Sif wood"
desc = "A simplistic, metal-banded, wood-panelled prosthetic. This one is covered in Sivian wood!"
icon = 'icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif.dmi'
/datum/robolimb/wooden/sif/teshari
company = "Morgan Trading Co - Sif wood - Teshari"
icon = 'icons/mob/human_races/cyberlimbs/prosthesis/wooden_sif_teshari.dmi'
species_cannot_use = list(SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_TAJ, SPECIES_SKRELL, SPECIES_ZADDAT)
species_alternates = list(SPECIES_HUMAN = "Morgan Trading Co")
suggested_species = SPECIES_TESHARI
/obj/item/weapon/disk/limb/New(var/newloc)
..()
if(company)