Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Новая голова для КПБ с визорами #1472

Merged
merged 6 commits into from
Sep 6, 2024

Conversation

Sirstaniya
Copy link

Что этот PR делает

Добавляет новую голову с настраиваемыми визорами

Почему это хорошо для игры

Разнообразие

Изображения изменений

111
22222222
33
444444444
5555555

Тестирование

Локалка и скрины

Changelog

🆑
add: Добавил новую голову КПБ с настраиваемыми визорами
/:cl:

@github-actions github-actions bot added the 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! label Sep 5, 2024
@Sirstaniya Sirstaniya changed the title New Robo Head EI Новая голова для КПБ с визорами Sep 5, 2024
modular_ss220/robolimbs/code/robolimbs.dm Outdated Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Надо сложить всю оптику в один dmi, файлов уже слишком много для одного лишь вида кпб

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мы пытались, но с одного файла не читает остальные. Почему, так и не поняли

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Стоит начать с фикса пути к файлу

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Мы пробовали, но не работает. Оно видит только первый визор. В другом варианте он видит все визоры, но выбирает лишь первый. Несколько часов пробовали разные способы, сработал лишь этот

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

У нас на паре нет моделей с двумя или более визорами вообще, поэтому мы перепробовали большинство методов, остановились на этом, ведь работает

modular_ss220/robolimbs/code/robolimbs.dm Outdated Show resolved Hide resolved
@m-dzianishchyts
Copy link
Collaborator

m-dzianishchyts commented Sep 5, 2024

Стоит использовать наследование, чтобы все отобразилось, и проверить dmi других оверлеев, там есть подфикс _s

Можно применить следующий патч, скопировав содержимое в новый файл и выполнив git apply путь_к_файлу

Patch
---
 modular_ss220/robolimbs/code/robolimbs.dm     |  18 +++++++-----------
 modular_ss220/robolimbs/icons/ei_optic.dmi    | Bin 0 -> 1460 bytes
 .../mob/sprite_accessories/ipc/ei_optic.dmi   | Bin 335 -> 0 bytes
 .../sprite_accessories/ipc/ei_optic_alt.dmi   | Bin 379 -> 0 bytes
 .../sprite_accessories/ipc/ei_optic_alt2.dmi  | Bin 316 -> 0 bytes
 5 files changed, 7 insertions(+), 11 deletions(-)
 create mode 100644 modular_ss220/robolimbs/icons/ei_optic.dmi
 delete mode 100644 modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic.dmi
 delete mode 100644 modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic_alt.dmi
 delete mode 100644 modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic_alt2.dmi

diff --git a/modular_ss220/robolimbs/code/robolimbs.dm b/modular_ss220/robolimbs/code/robolimbs.dm
index 4c8384517b..f584e3a5ad 100644
--- a/modular_ss220/robolimbs/code/robolimbs.dm
+++ b/modular_ss220/robolimbs/code/robolimbs.dm
@@ -25,21 +25,17 @@
 	selectable = 0
 	has_subtypes = null
 
-/datum/sprite_accessory/body_markings/head/optics
-	icon = 'icons/mob/sprite_accessories/ipc/ei_optic.dmi'
+/datum/sprite_accessory/body_markings/head/optics/etamin
+	icon = 'modular_ss220/robolimbs/icons/ei_optic.dmi'
 	name = "EI Optics"
 	species_allowed = list("Machine")
-	icon_state = "ei_standart"
+	icon_state = "alt1"
 	models_allowed = list("Etamin Industry King Series")
 
-/datum/sprite_accessory/body_markings/head/optics/altoptic2
-	icon = 'icons/mob/sprite_accessories/ipc/ei_optic_alt.dmi'
+/datum/sprite_accessory/body_markings/head/optics/etamin/alt1
 	name = "EI Optics Alt"
-	icon_state = "altoptics1"
-	models_allowed = list("Etamin Industry King Series")
+	icon_state = "alt2"
 
-/datum/sprite_accessory/body_markings/head/optics/altoptic3
-	icon = 'icons/mob/sprite_accessories/ipc/ei_optic_alt2.dmi'
+/datum/sprite_accessory/body_markings/head/optics/etamin/alt2
 	name = "EI Optics Alt 2"
-	icon_state = "altoptics2"
-	models_allowed = list("Etamin Industry King Series") 
+	icon_state = "alt3"
diff --git a/modular_ss220/robolimbs/icons/ei_optic.dmi b/modular_ss220/robolimbs/icons/ei_optic.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..c824845ce267e66ec2cc29a885df21fcb9e6ac0f
GIT binary patch
literal 1460
zcmeAS@N?(olHy`uVBq!ia0vp^4?viM4M<AqW<3N_4OJl#B`&GO$wiq3C7Jno3=9=>
zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5
zQiwvZrs47<2Kyp9yNy*huaH>M-EF*9!_Zvxl%MBW&owNDyd^xP4K1CFU17?fwn|N2
z78-f*>Uq{T&J4XwwkvL?H@;(FV0rK9;uumf=j~lXKjlafhl`0<IHh0s-Tbe2gHto7
zVZuxK2rU<**4M@RPd``bE2x#*rx$(qQuPlYV9)pyEzj_7CWE4i14pdrgUgpE>rarj
zH|(F9_V4-m`KjkNHN8LccooC_`}f!X{CK$%2xk0TBy-+&o#E@B->a&tSNCt2a{c=C
z_Wfml|E}k{Apc<XOykJhd;9DEuj}71XRq-`SplbT))%rLAmXd<P7L2rt`^P;w7cSL
z|NKj5X09=NfAyX~7*Le|pE^%T4SUN3uxmI4oS4XEUU<h4ev5N^x#*Rfe~;LN&HCw;
z{&QU{V_$s58;9AYGxokw`|;-S<K$m;hYEWm&)4^tvF^CVUAHw=ReOWXvu!{4I2Oh-
zuG_|cuItVEv~ww2E7yOk`qMZ2A4gT2{eg?`GF`t(-r(m@yw3;<HA>tG^l3>(!}o3T
z-@Sa9Idk)x2kOr@UOLks!CIctkX(M}jKi_w^;_oW0Ufq=`t<29e{&u;O|$(U=l<rD
z#UJGtXIS-C>$FS0KlJ#h!9Rw_g-gqyo+?w@yvFE#VOycG#QNhOE6&b7w_cgQOkeN)
zq1CxOdb#OFpRKgd{4Q!!He-{oW8bs<YsBh16T^%6=Qrq0`@>P?9~OOc50mz$?;GU>
zoZdAE2r0C%a40f5d63Pt3T-eBPyYMF^xyiaWvc5Qh<y*9r*&ZC*0gVRheWr1j#;y9
z%@Q*+(X;pbE56j7y3DfU?oG4Pg1;a16<8jQ2rK%z_w?sA3D%P%)6V=h`OUc9`gU4e
zdMoeV>Bc>-Q?>6-^u9gw%${=>Kii#^{qShsH{qy>f3KdId8XpsW!4PGC$+n`nkW2b
zR4mzLt#C((5^sP5V&Q70EmNOwj=tmXep>c}L$dSvH-B5SbJ8DK+~+D-)3EE!BkBIl
z;ZAp(-uk3Prrvw}Yr1Xa<BfLbxwaYK{9GKan=UE7W&XR(GmQ=3f8O~@dBxX=_`A2N
zbfWe#JDsR=;MmDbK{%tv6fi-bvfJ@CZ`bMM%6X!Hj_8EV{Qj-<$K1I!+8gJvI@vW*
zYSY5_uZ#=6{P{B{?mjSwBW2Wf)*r&VnZs|go1fcw*FWODcg#Uxnp{_StnxPhiP+EQ
g1qzN+n4*617fKa-hVm*J0gGV<Pgg&ebxsLQ0DWyo4gdfE

literal 0
HcmV?d00001

diff --git a/modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic.dmi b/modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic.dmi
deleted file mode 100644
index 82432b7bef13337b50c4667b6663a1c609d19fa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?K3?%mjbVdLvo&cW^*Z=?j%gf7)iHQLPJ}f=G
z3P>@Q1o;IsI6S+N2ISOKg+!FNq!uR^WfqiV=I1dmRLltuD<~@c{w28J<JTuz-nv@n
z&YTb45NdGI_`xHc^FEp<8H##(cUTw)8DBQ`Qke5-(ve9a3c;GD#&Rdld3)+;1wMM@
zb5ci(E%WIkA8oHQzO9>rgNlW;9etQ(on;jglMXCh^WfEUrfmWY<?@R1H}iro0^O16
z>Eaj?(fan9BVU68k4xZ{?n;xsV;5sQ#8Z;e0zEwb<X`s;HPfB8sr|9?j>UFQCt4kw
zZnDL28}B#aq7&aMq?l)Trfp_7ef6j0xp_}5bAxD#S@nfQ=i=XOQ{3;suqNUAVZQ(T
dZ`l8wVJ>v!eQPUZ%?h-X!PC{xWt~$(69BmWf$jhR

diff --git a/modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic_alt.dmi b/modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic_alt.dmi
deleted file mode 100644
index 13af744ee2355ed6e297f19deff686bdadac521a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?K3?%mjbVdLvo&cW^*Z=?j%gf7)iHQLPJ}f=G
z3P>@Q1o;IsI6S+N2ISOKg+!FNq!uR^WfqiV=I1dmRLltuD<~@c{w28J<JTuz-nv@n
z&YTb45NdGI_`xHc^FEp<8H##(cUTw)8DBQ`Qke5-(ve9a3c;F&%T@L-P%++l!=tm?
zSatIXi6xV}jn`@znv0(D^E~UhhQ*M#gr~HjrIT^`rl!^Nxo_ApxaliQD}ALD2z19(
zPZ!6Kh}Pr;37H1L_6Fvj^DPUPGKNM}G0n2M%_wk^M?CGA!9#{s29DYWGMt5S%RXpG
zur6+x#h{$;#443g)3h`CJ>x7J^9X(6m>CJ*mhWMZWL=yfa)Bw~iSLR7j1uz`?rpi#
zpmzQ_gOcRKLoC_#r?@8s8gRKW>M|Vs)R=H@%5I?KJqD$j4-QR9|9|mQqDYSc1H;_K
WBHh9(ET#h;$l&Sf=d#Wzp$Pz4c#XpV

diff --git a/modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic_alt2.dmi b/modular_ss220/robolimbs/icons/mob/sprite_accessories/ipc/ei_optic_alt2.dmi
deleted file mode 100644
index 1862a431f9365bce4e63da48eb70ddcad69267a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?K3?%mjbVdLvo&cW^*Z=?j%gf7)iHQLPJ}f=G
z3P>@Q1o;IsI6S+N2ISONg+!FNq!uR^WfqiV=I1dmRLltuD<~@c{w28J<JTuz-nv@n
z&YTb45NdGI_`xHc^FEp<8H##(cUTw)8DBQ`Qke5-(ve9a3c;GD#&-J`s2E$?87@EK
z(b;XRx_O1fl9}DcYc&kbMNj#8p7mVAV#r&<Q`*qd$vAye)9U%$H@q13Pf%RX&>#I2
z=#*ej7srr@*5m{UJ%=i$Sq!%s1y1(p*>JfX)R3rjc+WVCp`5uR#YtR_b#a17k4?f(
zM&E|>j4notxci#|4Y=IoChTrdJ8+LdY37Aicc32DBTNkUTshV+msI2h8qeVA>gTe~
HDWM4fhfZ!)
---

Кажется теперь похоже на правду.
m-dzianishchyts

This comment was marked as outdated.

Copy link
Collaborator

@AyIong AyIong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Выглядит ок

@AyIong AyIong merged commit 2ea64f4 into ss220club:master Sep 6, 2024
11 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 📜 CL валиден
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants