From 90871db9f271d27613ebb6da1e13ca7ea207fc5b Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sun, 13 Aug 2023 10:33:11 +0100 Subject: [PATCH] adds synthlizard prosthetics and markings from main (#5860) --- code/modules/organs/external/robolimbs.dm | 10 +-- .../markings/synth_stuff.dm | 57 ++++++++++++++++++ icons/mob/cyberlimbs/mpc/mpc.dmi | Bin 0 -> 1447 bytes .../markings/synth_stuff.dmi | Bin 3509 -> 4230 bytes 4 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 icons/mob/cyberlimbs/mpc/mpc.dmi diff --git a/code/modules/organs/external/robolimbs.dm b/code/modules/organs/external/robolimbs.dm index 6d166c1ce39..5e40b0ddc0c 100644 --- a/code/modules/organs/external/robolimbs.dm +++ b/code/modules/organs/external/robolimbs.dm @@ -162,6 +162,11 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ icon = 'icons/mob/cyberlimbs/nanotrasen/nanotrasen_main.dmi' species_alternates = list(SPECIES_TAJ = "NanoTrasen - Tajaran", SPECIES_UNATHI = "NanoTrasen - Unathi") +/datum/robolimb/mpc + company = "Moghes Prosthetics Company" + desc = "A simple robotic limb with a lizard-like design." + icon = 'icons/mob/cyberlimbs/mpc/mpc.dmi' + /datum/robolimb/nanotrasen_tajaran company = "NanoTrasen - Tajaran" species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_HUMAN, SPECIES_VOX, SPECIES_HUMAN_VATBORN, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_ZADDAT) @@ -457,7 +462,6 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ unavailable_to_build = TRUE parts = list(BP_HEAD) - /datum/robolimb/xion_monitor company = "Xion Monitor" desc = "Xion Mfg.'s unique spin on a popular prosthetic head model. It looks and minimalist and utilitarian." @@ -466,8 +470,6 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ parts = list(BP_HEAD) monitor_styles = standard_monitor_styles - - /datum/robolimb/zenghu company = "Zeng-Hu" desc = "This limb has a rubbery fleshtone covering with visible seams." @@ -476,8 +478,6 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ unavailable_to_build = TRUE skin_tone = TRUE - - /datum/robolimb/cyber_beast company = "Cyber Tech" desc = "Adjusted for deep space the material is durable, and heavy." diff --git a/code/modules/sprite_accessories/markings/synth_stuff.dm b/code/modules/sprite_accessories/markings/synth_stuff.dm index 4dbc6bc4b93..cb0b17d69d7 100644 --- a/code/modules/sprite_accessories/markings/synth_stuff.dm +++ b/code/modules/sprite_accessories/markings/synth_stuff.dm @@ -99,3 +99,60 @@ icon_state = "eboop" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) + +// synth antennae +/datum/sprite_accessory/marking/synth/antennae + name = "Synthlizard Antennae" + id = "marking_synth_antennae" + icon_state = "normal_antenna" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/synth/antennae/curled + name = "Synthlizard Curled Antennae" + id = "marking_synth_curled_antennae" + icon_state = "curled_antenna" + +/datum/sprite_accessory/marking/synth/antennae/thick + name = "Synthlizard Thick Antennae" + id = "marking_synth_thick_antennae" + icon_state = "thick_antenna" + +/datum/sprite_accessory/marking/synth/antennae/short + name = "Synthlizard Short Antennae" + id = "marking_synth_short_antennae" + icon_state = "short_antenna" + +/datum/sprite_accessory/marking/synth/antennae/sharp + name = "Synthlizard Sharp Antennae" + id = "marking_synth_sharp_antennae" + icon_state = "sharp_antenna" + +/datum/sprite_accessory/marking/synth/antennae/horn + name = "Synthlizard Horn Antennae" + id = "marking_synth_horn_antennae" + icon_state = "horns_antenna" + +/datum/sprite_accessory/marking/synth/snout + name = "Synthlizard Snout 1" + id = "marking_synth_snout_1" + icon_state = "synthliz_snout1" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/synth/snout/alt + name = "Synthlizard Snout 2" + id = "marking_synth_snout_2" + icon_state = "synthliz_snout2" + +/datum/sprite_accessory/marking/synth/snout/alt2 + name = "Synthlizard Snout 3" + id = "marking_synth_snout_3" + icon_state = "synthliz_snout3" + +/datum/sprite_accessory/marking/synth/synthliz_eyes + name = "Synthlizard Eyes" + id = "marking_synthliz_eyes" + icon_state = "synthliz_eyes" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_HEAD) diff --git a/icons/mob/cyberlimbs/mpc/mpc.dmi b/icons/mob/cyberlimbs/mpc/mpc.dmi new file mode 100644 index 0000000000000000000000000000000000000000..157df6baaaa04c7f4a65ab7f45b2e1c209384cf0 GIT binary patch literal 1447 zcmV;Y1z7rtP)%0000dP)t-sz`($% zsj1V`)8OFXj*gDS#l>P`Vmv%Nz`(!*0}b2T+tk$5udlC-!w35S0004WQchCV=-0C=2@k~<2+Fc3s*=@i25Lw;?VU=v)#R}cbyLH5FG zNv&q=-$08C)2#KsOBy#N3Nc}YY;RCt{2oX?KiHW0?eRz37)OV;Mv zSaE^&l+`R-WKVMK1$s=(bqWMIG+Q+HJVV=ik(_jFgFHYFd4RrIwMej<8Pb*)q>}*s zey1J&8Gaga4RJ&%%K!iX00000*A#)W&nL_%>${@T%ukaFC>yWnGvWeP%|z6eb15iV zz?oN+*L=ve8n0ZmNd>F|0#;0bY1T@BvSXPoC%ULSYnd9W>UBh7G1FETt@seLN4kUa z6i1P-J%3`%LPtEmNGl+g>D<#(@N24SS#QeAq~n{bD^EbRS+WL?zY~?e{F*j^=EV!Y zY&vDuojam3&>jE)00000(C^3Dt$OLzmTK!!G-(qADj(qI3yQhiotfI-P{)xA0bhI7 zYjwrHEp?M<0WA~o+^a8?fOVaCdphNt$>-#6Hq{P2^#(nA#=3=ACrV&4q*5{@FKO_Z7EmB4J-U_;WD7)DB|%XT{5xB4hm#sgsNqjc zR&_%)v$M+T1cOVO>@LsiZ+Tv=pt|Ns9zzQ&axSIY_zzWL1pH0SYv$0ohTKCYz|~tR zVA~|kvHVaI&0A*M&9-5-X{=5%xug%R@?O9_ZaYi-%%f?Xj(|-nz`P;*7q|Ne@Bz)7 z?rBs@cap#^MBi%o;vY(-_-hvNs~5!%XZoBvqzs90RR910Q~RK z`2kb7%?G__>TkQnAyrd1@~-ux=Lf9Xi}t(Kq$esz^8?mt0XC@sogXN!^8-8r&dPJd zWu5jANWX6obKVaq5)yp`Hd4SMZ3MhyHPuF(iR{;$+{u{QracCu1@xOwY5M|_9_=38 z9b3|CfRawZXnvrd0`a?0B%XrN2$0heuu1cTv5e*iD$;9+lKzsKCv+|&_Ecq5bUvb> zq>DJ4PUIod>EvH^+D=WFR{#J20000!GQs<^+upQIf`1-_xgRQJx2?H5;1$=Qeb}F5 zW!u4+1v{J#*O9ve-fkS)hy6)rTtL}|ny{~81-{s{uYK5`#H@!#-Y2i#Q4L|w{TCSb zwBO-R3D^z-OgO%*ICpKZNx1zEf0CR{feEj$d{|WnO~Fn39sVSI3IG5A000000002; zi#Akz!9E6;Uyf%eZrbngCosH?IeQptbIJ2`t8t%~Lxv>iPmuHPvYW8?6-)ITlB2n4 zzr&wEW@y51b>)1_1M*Ho`$OIm`=D=<0RX@!&41lh(bp_7peq0X002ovPDHLkV1l9f BwsHUf literal 0 HcmV?d00001 diff --git a/icons/mob/sprite_accessories/markings/synth_stuff.dmi b/icons/mob/sprite_accessories/markings/synth_stuff.dmi index b52388b9c812f8cab624cfe5858bd4407b754ae0..59859c364f672ed0a7c8f4599d0131daf8524e4c 100644 GIT binary patch literal 4230 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 SW(n*!$MlMYQN<