From 482977e23d2c8ca8a670edae90a963ae1a5d9741 Mon Sep 17 00:00:00 2001 From: Ian Johnston Date: Thu, 5 Sep 2024 23:12:50 -0300 Subject: [PATCH 1/2] test commit to add a branch --- .../Customization/vox_scars.rsi/meta.json | 27 ++++++++++++++++++ .../vox_scars.rsi/roadrash_l_head.png | Bin 0 -> 223 bytes 2 files changed, 27 insertions(+) create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/roadrash_l_head.png diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json new file mode 100644 index 00000000000000..725fbb6a0dbb29 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/vox_scars.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "heart_l_arm", + "directions": 4 + }, + { + "name": "heart_r_arm", + "directions": 4 + }, + { + "name": "hive_s", + "directions": 4 + }, + { + "name": "nightling_s", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/roadrash_l_head.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/roadrash_l_head.png new file mode 100644 index 0000000000000000000000000000000000000000..0ff82bbaf26d13c97ce4b376bd4e4bbe73fa1997 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1M1^9%xo;Yy=$TV_rcnYMLN`m}?|1&(@Zr}yvaTa()7BevL9RXp+soH$f zK*11C7srqY_qW#!xfm3ATmp;#d!N3+YAleX{(t)6Un$n%Hf#(F7-Rz0KGR~pQ*1c* z*5;oV-o0gD5MgLwVhCUmPIzj}tgv5%ZU2ORo(379;17n58#9jZf41Z?-3m0H!PC{x JWt~$(69C9LLYn{p literal 0 HcmV?d00001 From 9ffb94bb2ae37731625c54a56a2f90389fbc2001 Mon Sep 17 00:00:00 2001 From: Ian Johnston Date: Sat, 7 Sep 2024 01:54:57 -0300 Subject: [PATCH 2/2] Added a bunch of facial scars to Vox --- Resources/Locale/en-US/markings/vox_scars.ftl | 20 ++++ .../Mobs/Customization/Markings/vox_scars.yml | 98 ++++++++++++++++++ .../vox_scars.rsi/bigslash_l_head.png | Bin 0 -> 156 bytes .../vox_scars.rsi/bigslash_r_head.png | Bin 0 -> 147 bytes .../vox_scars.rsi/claw_torso.png | Bin 0 -> 173 bytes .../Customization/vox_scars.rsi/meta.json | 28 +++-- .../vox_scars.rsi/roadrash_l_head.png | Bin 223 -> 225 bytes .../vox_scars.rsi/roadrash_r_head.png | Bin 0 -> 231 bytes .../vox_scars.rsi/slash_l_head.png | Bin 0 -> 141 bytes .../vox_scars.rsi/slash_r_head.png | Bin 0 -> 140 bytes 10 files changed, 138 insertions(+), 8 deletions(-) create mode 100644 Resources/Locale/en-US/markings/vox_scars.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/bigslash_l_head.png create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/bigslash_r_head.png create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/claw_torso.png create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/roadrash_r_head.png create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/slash_l_head.png create mode 100644 Resources/Textures/Mobs/Customization/vox_scars.rsi/slash_r_head.png diff --git a/Resources/Locale/en-US/markings/vox_scars.ftl b/Resources/Locale/en-US/markings/vox_scars.ftl new file mode 100644 index 00000000000000..0e7ecb6f52c23e --- /dev/null +++ b/Resources/Locale/en-US/markings/vox_scars.ftl @@ -0,0 +1,20 @@ +marking-ScarsVoxRoadrashLeftHead-roadrash_l_head = Vox Left Head Scar (Road rash) +marking-ScarsVoxRoadrashLeftHead = Vox Left Head Scar (Road rash) + +marking-ScarsVoxRoadrashRightHead-roadrash_r_head = Vox Right Head Scar (Road rash) +marking-ScarsVoxRoadrashRightHead = Vox Right Head Scar (Road rash) + +marking-ScarsVoxBigslashLeftHead-bigslash_l_head = Vox Left Head Scar (Big Slash) +marking-ScarsVoxBigslashLeftHead = Vox Right Head Scar (Road rash) + +marking-ScarsVoxBigslashRightHead-roadrash_r_head = Vox Right Head Scar (Big Slash) +marking-ScarsVoxBigslashRightHead = Vox Right Head Scar (Big Slash) + +marking-ScarsVoxSlashLeftHead-slash_l_head = Vox Left Head Scar (Slash) +marking-ScarsVoxSlashLeftHead = Vox Left Head Scar (Slash) + +marking-ScarsVoxSlashRightHead-slash_r_head = Vox Right Head Scar (Slash) +marking-ScarsVoxSlashRightHead = Vox Right Head Scar (Slash) + +marking-ScarsVoxClawTorso-claw_torso = Vox Chest Scar (Claw) +marking-ScarsVoxClawTorso = Vox Chest Scar (Claw) \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml new file mode 100644 index 00000000000000..0f6bec207f5f0b --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_scars.yml @@ -0,0 +1,98 @@ +- type: marking + id: ScarsVoxRoadrashLeftHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:SimpleColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: roadrash_l_head + +- type: marking + id: ScarsVoxRoadrashRightHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:SimpleColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: roadrash_r_head + +- type: marking + id: ScarsVoxBigslashLeftHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:SimpleColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: bigslash_l_head + +- type: marking + id: ScarsVoxBigslashRightHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:SimpleColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: bigslash_r_head + +- type: marking + id: ScarsVoxSlashLeftHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:SimpleColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: slash_l_head + +- type: marking + id: ScarsVoxSlashRightHead + bodyPart: Head + markingCategory: Head + speciesRestriction: [Vox] + coloring: + default: + type: + !type:SimpleColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: slash_r_head + +- type: marking + id: ScarsVoxClawTorso + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Vox] + coloring: + default: + type: + !type:SimpleColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_scars.rsi + state: claw_torso + diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/bigslash_l_head.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/bigslash_l_head.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0ec2653cfe59a7042db499bce19bb712434fb6 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|!aQ9ZLn`LH zz3Iq%z<`JOzz23=wN^nH$@Z1O;ZOM*b?s#t4^(HbefQ38?&FR#b0Te&7Oi?VO@6Np wP%jW1n7(S&al1?5`!0sJ-AgU01PlIH&)zAjI7=mpGZn=5boFyt=akR{0Pbfpo&W#< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vox_scars.rsi/bigslash_r_head.png b/Resources/Textures/Mobs/Customization/vox_scars.rsi/bigslash_r_head.png new file mode 100644 index 0000000000000000000000000000000000000000..c72729356d6bc434ccbcd7b64cc9f826119608fa GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|d_7$pLn`LH zz3Iry;K;$^_^10Ir_lw&ggeWIY=L1H-D!!h1l9u{g-xiDBJ2nU_G$Y)==*kcv5PZyn@4tRTR0pnHm5 zOvmqng*${!E$BO~K252<*L6ZVmxZo&g{&Zh_|>T5lD5RY!}hycg1oLpZJtt;%~^h? zK3?`h)alg7IKl5Ma}E_UyFHi4JEjga9R%uEZ2fk}^XiTF539vKzA}B`_k8J#ZMnfu z-aU(PIIsIr#5XPN-ETQT!PmQveN=oL_$j-D53Dck8)HncU&PJ%x12$IPgg&ebxsLQ E0HZlqt^fc4 delta 206 zcmaFJc%N~CWIZzj1H;_yjcNS%G}E0G|-o z6DLjpnMMu{Pk|IuNswRge}<>q4ZMIn&H|6fVg?4jBOuH;Rhv&5C>Y}D;usR){`Q(7 z7lR^?OJMPT@6$I}jRlg_|4%>sE5$n8#+{8}0fS7y+GkqKcZv?rdxp)FnGH9xvX_&KfcK6M4Q<*lKUwl3NHCVA<^OBlpOU-OnHc7t(Q$ika7ME3 zwDO9q8IdbqO?kNg=Ie{r0bZU;O7G+>pI@=wzh`Fsf%9kOYQFsiS^xnb!td0cuX<(s z!^?fg)_eP=O+H@uCU}1Q;q{lU-23J9PHwHKpy0}_US65=O9#Nl#Zlmvv4FO#tYuEI$AM literal 0 HcmV?d00001