From b28f378f8c77ffd7f188716b010e0e4dca384f07 Mon Sep 17 00:00:00 2001 From: ConsumoFurioso Date: Mon, 9 Mar 2026 18:34:01 -0700 Subject: [PATCH 1/4] Vox Rouma Uniform A test in implementing clothing for Vox. I've made a sprite for the Rouma_Work uniform in the SRM. --- code/modules/clothing/factions/srm.dm | 3 ++- icons/mob/clothing/faction/srm/vox.dmi | Bin 0 -> 1294 bytes shiptest.dme | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 icons/mob/clothing/faction/srm/vox.dmi diff --git a/code/modules/clothing/factions/srm.dm b/code/modules/clothing/factions/srm.dm index 94093b6202..28e3d16510 100644 --- a/code/modules/clothing/factions/srm.dm +++ b/code/modules/clothing/factions/srm.dm @@ -9,7 +9,8 @@ item_state = "rouma_work" icon = 'icons/obj/clothing/faction/srm/uniforms.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/srm/uniforms.dmi' - supports_variations = KEPORI_VARIATION + supports_variations = KEPORI_VARIATION | VOX_VARIATION + vox_override_icon = 'icons/mob/clothing/faction/srm/vox.dmi' ////////////////// //Armored suits// diff --git a/icons/mob/clothing/faction/srm/vox.dmi b/icons/mob/clothing/faction/srm/vox.dmi new file mode 100644 index 0000000000000000000000000000000000000000..93c8a85da3e9a8a9546b75f2b88f47c69f5b3097 GIT binary patch literal 1294 zcmV+p1@ZccP)V=-0C)i%jIjN)m_$VjyWk=ygf>Boe!#>#@m`LnnY`#Xch10h zH{WU=NLz>QWbj&9DoCGIRFRXasUp%(%J!c!KrS z+|ME5UNWpt;=Z^GvV&Z8~@4>$4&FjU4CJ}%%ECZ9*96H=-0)k9Fb+PYiu-jQ^jYz+nHLwb)x1|Uu9gzF%zQ~|xi3vQ7R?)TC&V!(3& z!Y!27hwvU00F6oj8VLSofEEDo`2-OFlB}iAg?f$!1%Tw@?E!BMOuDQ9ecn<9(3=Dz z#e|3UzTq#B4=@=7{?>0kkPL!=%6cQp^WF@AP~L+8z{+=L7|beRS<1Yw?B4|zyax*$ zrnI>%$zbJ=9SfrO>6sVN=JxH;ujOxzwWs^|KR?hyDCn2%-q({zV(bn_Fq8|@m zMt${js{;D;e%e&>rS~jvYn?X%VDRot!sDfd4}W*nz?o=v{7HJ;abR!b+Of;srU1}; zp08VT3(5ETN^tK%lhAcxIAPLZ77z#k$=_CMYrvR)Fk%J(cK2Glnt%{f$SMe40Z1~1 zWD@{Z3UI7dKr^wis?7qB5Rh~jJ$UJC^!DE4^xn_Ps9N$_C5V9vRl&h;LEP~)xTUR@ z{9LKWdFQK=e5|GcFuB;_*zu4oQwD*GV1-l(g02Fy70`^aX0Njf!R%|O%KHW{}fAh!RN*@kGHTeP zI#LUj{BdeiW3m&f@uIQ2jBo)4xm!{15Q=ycGx1vzW@LL07*qoM6N<$ Ef;pC6hX4Qo literal 0 HcmV?d00001 diff --git a/shiptest.dme b/shiptest.dme index e384448bc2..b1b2622ba2 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -336,7 +336,6 @@ #include "code\_onclick\hud\screen_objects.dm" #include "code\_onclick\hud\screentip.dm" #include "code\_onclick\hud\storage.dm" -#include "code\~PENTEST\~pentest.dme" #include "code\controllers\admin.dm" #include "code\controllers\controller.dm" #include "code\controllers\failsafe.dm" @@ -3732,6 +3731,4 @@ #include "interface\menu.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" -#include "_maps\PentestMaps\~pentest.dme" -#include "modular_pentest\~pentest.dme" // END_INCLUDE From 944982d57b9643711a0f75a28b32ac3a51ded8c2 Mon Sep 17 00:00:00 2001 From: ConsumoFurioso Date: Mon, 9 Mar 2026 18:48:42 -0700 Subject: [PATCH 2/4] Readding Code to shiptest.dme I guess VSCode ripped a few things out so hopefully this fixes it! --- shiptest.dme | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shiptest.dme b/shiptest.dme index b1b2622ba2..8ab2a8fece 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -336,6 +336,7 @@ #include "code\_onclick\hud\screen_objects.dm" #include "code\_onclick\hud\screentip.dm" #include "code\_onclick\hud\storage.dm" +#inlcude "code\~PENTEST\~pentest.dme" #include "code\controllers\admin.dm" #include "code\controllers\controller.dm" #include "code\controllers\failsafe.dm" @@ -3731,4 +3732,6 @@ #include "interface\menu.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" +#include "_maps\PentestMaps\~pentest.dme" +#include "modular_pentest\~pentest.dme" // END_INCLUDE From f8c981f5e009c5cfe995c7e0408588351f22200a Mon Sep 17 00:00:00 2001 From: "Ossa88 (SYNAPSE)" Date: Mon, 9 Mar 2026 22:02:17 -0700 Subject: [PATCH 3/4] Fix typo in include directive for pentest.dme --- shiptest.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shiptest.dme b/shiptest.dme index 8ab2a8fece..e384448bc2 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -336,7 +336,7 @@ #include "code\_onclick\hud\screen_objects.dm" #include "code\_onclick\hud\screentip.dm" #include "code\_onclick\hud\storage.dm" -#inlcude "code\~PENTEST\~pentest.dme" +#include "code\~PENTEST\~pentest.dme" #include "code\controllers\admin.dm" #include "code\controllers\controller.dm" #include "code\controllers\failsafe.dm" From 2b9ecf2f335601ff3977da041a6be179d7a2ecbf Mon Sep 17 00:00:00 2001 From: ConsumoFurioso Date: Mon, 9 Mar 2026 22:08:36 -0700 Subject: [PATCH 4/4] Icon state change Changed icon state from "rouma_Work" to "rouma_work" --- icons/mob/clothing/faction/srm/vox.dmi | Bin 1294 -> 1294 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/clothing/faction/srm/vox.dmi b/icons/mob/clothing/faction/srm/vox.dmi index 93c8a85da3e9a8a9546b75f2b88f47c69f5b3097..e4bc2ea88fcf798eaf7d0e767197e85190412b3a 100644 GIT binary patch delta 113 zcmV-%0FM8T3XTepJ7x-iAQS*+-&Z_pkD`c{mMEg3ejx-cB}{l){(jnacf;j4O!Kng zxGwNYa@yY5V^fsCf)-vS>3}JzPvxW3EjZ7;jF^#q4BvyLD+4ApxfmN@2XP}4SCHeh TjsN=t=Rh1^$*m$Sv7v1QQt30& delta 113 zcmV-%0FM8T3XTepJ7x|*FcbjizOQ&;7ed5h5h4awqcmx0Bh}=!_