From b3b51a7c3a57eccbf09db457c1faf8b38aa2324d Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 20 Feb 2020 21:37:15 -0500 Subject: [PATCH 1/2] New sprites for discs with unique colors Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi. Sprites from CEV-Eris. --- code/defines/obj/weapon.dm | 2 +- code/game/machinery/cloning.dm | 4 ++-- code/modules/organs/robolimbs.dm | 4 ++-- code/modules/research/research.dm | 8 ++++---- code/modules/resleeving/designer.dm | 4 ++-- icons/obj/discs.dmi | Bin 0 -> 1867 bytes 6 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 icons/obj/discs.dmi diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 197496259c..c53ffa00bd 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -212,7 +212,7 @@ /obj/item/weapon/disk name = "disk" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/discs.dmi' //VOREStation Edit /obj/item/weapon/disk/nuclear name = "nuclear authentication disk" diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 52a31d5afe..bbd53828f6 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -484,8 +484,8 @@ //TO-DO: Make the genetics machine accept them. /obj/item/weapon/disk/data name = "Cloning Data Disk" - icon = 'icons/obj/cloning.dmi' - icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. + icon = 'icons/obj/discs.dmi' //VOREStation Edit + icon_state = "data-red" //VOREStation Edit item_state = "card-id" w_class = ITEMSIZE_SMALL var/datum/dna2/record/buf = null diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index a2643f04d0..f488c4364c 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -312,8 +312,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ /obj/item/weapon/disk/limb name = "Limb Blueprints" desc = "A disk containing the blueprints for prosthetics." - icon = 'icons/obj/cloning.dmi' - icon_state = "datadisk2" + icon = 'icons/obj/discs.dmi' //VOREStation Edit + icon_state = "data-white" //VOREStation Edit var/company = "" /obj/item/weapon/disk/limb/New(var/newloc) diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 5304f8c738..3063706d1a 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -222,8 +222,8 @@ research holder datum. /obj/item/weapon/disk/tech_disk name = "technology disk" desc = "A disk for storing technology data for further research." - icon = 'icons/obj/cloning.dmi' - icon_state = "datadisk2" + icon = 'icons/obj/discs.dmi' //VOREStation Edit + icon_state = "data-blue" //VOREStation Edit item_state = "card-id" w_class = ITEMSIZE_SMALL matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10) @@ -236,8 +236,8 @@ research holder datum. /obj/item/weapon/disk/design_disk name = "component design disk" desc = "A disk for storing device design data for construction in lathes." - icon = 'icons/obj/cloning.dmi' - icon_state = "datadisk2" + icon = 'icons/obj/cloning.dmi' //VOREStation Edit + icon_state = "data-purple" //VOREStation Edit item_state = "card-id" w_class = ITEMSIZE_SMALL matter = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10) diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index d9d4073d16..2388aa94de 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -371,8 +371,8 @@ desc = "It has a small label: \n\ \"Portable Body Record Storage Disk. \n\ Insert into resleeving control console\"" - icon = 'icons/obj/cloning.dmi' - icon_state = "datadisk2" + icon = 'icons/obj/discs.dmi' + icon_state = "data-green" item_state = "card-id" w_class = ITEMSIZE_SMALL var/datum/transhuman/body_record/stored = null diff --git a/icons/obj/discs.dmi b/icons/obj/discs.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7e9eb8a4ca45bbce2ee7236b71c1365b1d9bc968 GIT binary patch literal 1867 zcmZ8d2{haJ8cnqsAsAFkEseI;QqtBkr9>>XwPJ~F7*UEU4T6fLG=D8sGt&-1TGE7i z6BBEd+LzF#dDe`r9b$X7YHX9(*Oz+l%$)bm`M&$z?|kQXe)rxqM+a+hQF&1i2qbQ6 zW9clI6M}Aq92MYs3}r?zq8+cJty)`Kmwwinp8K-hX^I=_S$Q*>GmHQLVA$b1il#$O z`8&UJx^AQ{Pq!v({n$1sE}w2_h{uc%$#zqxhwdk0%@6Y;VLYnZFF>W=Dfd{K){hGX9pLM+3cr40hfqF zdqi0VMEc``!=r-3upkgVFN?@2J+)iCo>YK(K|Am>ESw^I( z!$k;=+=%p7%QZ@KsO&ZVdO%E(;SSj-Ig{pr7<^i6>?%GM=nkwU(-jlAJXIUdAmR*g zQ=qy@TrhfkKNG&v#y0#U83r_t!H1{^e%L; zc42Dt;V(l1hH+z%4hfkeC98GT>dzkLSMHANC}S|zw-a<>sb|aR^6|&1e{Abr-1(P& zI`u>EVlK?Q_)RlekF%ZgXPrfGB3GUrpw(CyB}Yt?^N{@Ts+FFR!7I z_E~Pw7ATrs(XJQ%mgAAF);^>$pgOAL8Wc-3Gf6w)Kkcyy*#zH%>KN(GHHKk+vZ zYfwNCo^g5io1T?J(m3(_%*ck480-IQ;B68VC_8pA6$l=E8|KO0K=~9{se7ydvFao~ z5TNeC`wv8`d+>o^b<)?B6?R}?RCJ$pX#5Z!9CULL;Vn1255^#rmZsNr`k1QOn4ttV zNq2u=xVcq(B$StMuIqr~RMY*dhJhzj9$S;Nzd1i}uTy^M-cA!mV)0%{zCKKEHofJy zFr-dzr2VrC73!?hZVMt$HI$Gc1S!HNs~B_a!Qo^F^iUhd{mh^%ZhqZH)@~ z!bgN8)-E!jFDJokThxn~RiMg7Av*0&>TIdSPFeDiy00~yA3w!T(!x7}`6c%=j*U*M zW`Z;CnvXx3z%El%8Mo$#X^`xPYWUkPlE)b9w$feX!al~jmo#UQJG|#;Tm&&PjuZc@`Xkiwr@NzU}FBct+OsQN|yIU7}B9^&jjs*dqT*m7}&q3NcoYBQ~_VF4m!5 zO=An$FOBszCxCt+>6mAfcs;wZZFu8k8YZ*FV!Sf-!my1Oy z!!pLx1vz!ZYE%SA5hi0LmC?v6l-kQ7QAm>*>-A_tEvMT`z&Dh52Y^$j(g5z`5sEA> z)eraa3}p@{T+I<_Y=O<&pIm)SbopWV!~E)|4zv;V^uur2A?37s3ms_6hWjy^^+vCD zrE-(WeNEt^P!8md(2xWiT%shY<-16=H@YoCw`YIfhDb_Vm&=efVY2wAEpUJN1g(gB z@bzPCo7RU3ucnuX8&fAyz)9N?!3@1v97N5X5QGIkKV!wJ{?L=I*N62jAb%&+r{Zx z)0Jj&i5hj=+w@K=!usBfcl@3e;3OmqVM4rBihiOL2vo~x3RD|=6fhG?7b1ST^0&~< zZ#ZivdkHscn}b4^mSCSFC-(`j>lzjcdJPo}C#sodC-QCu!KNc|{PYYDfT z5Mr$CODX+0A71sKI$39a;;!!REWU6lryk1v^glLAwq9fv6fw8VdqeYY*Z=jOr?&B=#Zx-&5dOej<3 R!u7bXyRDUjWtq7z@NdtBe^CGc literal 0 HcmV?d00001 From 967fd17048e4219a967c1289ebff1634bf1735d4 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 29 Feb 2020 10:37:41 -0500 Subject: [PATCH 2/2] Rename to discs_vr.dmi and correct copypaste error --- code/defines/obj/weapon.dm | 2 +- code/game/machinery/cloning.dm | 2 +- code/modules/organs/robolimbs.dm | 2 +- code/modules/research/research.dm | 4 ++-- code/modules/resleeving/designer.dm | 2 +- icons/obj/{discs.dmi => discs_vr.dmi} | Bin 6 files changed, 6 insertions(+), 6 deletions(-) rename icons/obj/{discs.dmi => discs_vr.dmi} (100%) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index c53ffa00bd..e06bde44a7 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -212,7 +212,7 @@ /obj/item/weapon/disk name = "disk" - icon = 'icons/obj/discs.dmi' //VOREStation Edit + icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit /obj/item/weapon/disk/nuclear name = "nuclear authentication disk" diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index bbd53828f6..f7c5f5bd43 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -484,7 +484,7 @@ //TO-DO: Make the genetics machine accept them. /obj/item/weapon/disk/data name = "Cloning Data Disk" - icon = 'icons/obj/discs.dmi' //VOREStation Edit + icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit icon_state = "data-red" //VOREStation Edit item_state = "card-id" w_class = ITEMSIZE_SMALL diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index f488c4364c..4541fcfd95 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -312,7 +312,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ /obj/item/weapon/disk/limb name = "Limb Blueprints" desc = "A disk containing the blueprints for prosthetics." - icon = 'icons/obj/discs.dmi' //VOREStation Edit + icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit icon_state = "data-white" //VOREStation Edit var/company = "" diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 3063706d1a..266fd38369 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -222,7 +222,7 @@ research holder datum. /obj/item/weapon/disk/tech_disk name = "technology disk" desc = "A disk for storing technology data for further research." - icon = 'icons/obj/discs.dmi' //VOREStation Edit + icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit icon_state = "data-blue" //VOREStation Edit item_state = "card-id" w_class = ITEMSIZE_SMALL @@ -236,7 +236,7 @@ research holder datum. /obj/item/weapon/disk/design_disk name = "component design disk" desc = "A disk for storing device design data for construction in lathes." - icon = 'icons/obj/cloning.dmi' //VOREStation Edit + icon = 'icons/obj/discs_vr.dmi' //VOREStation Edit icon_state = "data-purple" //VOREStation Edit item_state = "card-id" w_class = ITEMSIZE_SMALL diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index 2388aa94de..0ecef69db0 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -371,7 +371,7 @@ desc = "It has a small label: \n\ \"Portable Body Record Storage Disk. \n\ Insert into resleeving control console\"" - icon = 'icons/obj/discs.dmi' + icon = 'icons/obj/discs_vr.dmi' icon_state = "data-green" item_state = "card-id" w_class = ITEMSIZE_SMALL diff --git a/icons/obj/discs.dmi b/icons/obj/discs_vr.dmi similarity index 100% rename from icons/obj/discs.dmi rename to icons/obj/discs_vr.dmi