From e90c9566ac5c9f178191c97871d986dd8bfe73aa Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sat, 9 Nov 2024 11:53:22 -0700 Subject: [PATCH] forever halloween --- .../cow_tails.dm} | 2 +- .../pig_ears.dm} | 2 +- .../pig_accessories/pig_snouts.dm | 9 +++++++++ .../porcine_accessories/porcine_snouts.dm | 9 --------- .../accessories/icons/lizard/lizard_frills.dmi | Bin 763 -> 765 bytes .../accessories/icons/lizard/lizard_horns.dmi | Bin 806 -> 809 bytes .../bovine_tails.dmi => cow/cow_tails.dmi} | Bin .../porcine_ears.dmi => pig/pig_ears.dmi} | Bin .../porcine_snouts.dmi => pig/pig_snouts.dmi} | Bin tgstation.dme | 6 +++--- 10 files changed, 14 insertions(+), 14 deletions(-) rename modular_doppler/modular_customization/accessories/code/non_species_specific/{bovine_accessories/bovine_tails.dm => cow_accessories/cow_tails.dm} (83%) rename modular_doppler/modular_customization/accessories/code/non_species_specific/{porcine_accessories/porcine_ears.dm => pig_accessories/pig_ears.dm} (75%) create mode 100644 modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm delete mode 100644 modular_doppler/modular_customization/accessories/code/non_species_specific/porcine_accessories/porcine_snouts.dm rename modular_doppler/modular_customization/accessories/icons/non_species_specific/{bovine/bovine_tails.dmi => cow/cow_tails.dmi} (100%) rename modular_doppler/modular_customization/accessories/icons/non_species_specific/{porcine/porcine_ears.dmi => pig/pig_ears.dmi} (100%) rename modular_doppler/modular_customization/accessories/icons/non_species_specific/{porcine/porcine_snouts.dmi => pig/pig_snouts.dmi} (100%) diff --git a/modular_doppler/modular_customization/accessories/code/non_species_specific/bovine_accessories/bovine_tails.dm b/modular_doppler/modular_customization/accessories/code/non_species_specific/cow_accessories/cow_tails.dm similarity index 83% rename from modular_doppler/modular_customization/accessories/code/non_species_specific/bovine_accessories/bovine_tails.dm rename to modular_doppler/modular_customization/accessories/code/non_species_specific/cow_accessories/cow_tails.dm index 3f2f637bed8ab..6700d75f6aa52 100644 --- a/modular_doppler/modular_customization/accessories/code/non_species_specific/bovine_accessories/bovine_tails.dm +++ b/modular_doppler/modular_customization/accessories/code/non_species_specific/cow_accessories/cow_tails.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/tails/deer/cow name = "Cow (Short)" icon_state = "cows" - icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/bovine/bovine_tails.dmi' + icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi' /datum/sprite_accessory/tails/deer/cow/long name = "Cow (Long)" diff --git a/modular_doppler/modular_customization/accessories/code/non_species_specific/porcine_accessories/porcine_ears.dm b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_ears.dm similarity index 75% rename from modular_doppler/modular_customization/accessories/code/non_species_specific/porcine_accessories/porcine_ears.dm rename to modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_ears.dm index 33aa491dbcfcf..0300685cd53c0 100644 --- a/modular_doppler/modular_customization/accessories/code/non_species_specific/porcine_accessories/porcine_ears.dm +++ b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_ears.dm @@ -1,4 +1,4 @@ /datum/sprite_accessory/ears_more/deer/pig name = "Floppy" icon_state = "floppy" - icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_ears.dmi' + icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi' diff --git a/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm new file mode 100644 index 0000000000000..67aaf30950e62 --- /dev/null +++ b/modular_doppler/modular_customization/accessories/code/non_species_specific/pig_accessories/pig_snouts.dm @@ -0,0 +1,9 @@ +/datum/sprite_accessory/snouts/pig + icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi' + name = "Pig" + icon_state = "pig" + +/datum/sprite_accessory/snouts/pig/boar + name = "Pig + Tusks" + icon_state = "boar" + diff --git a/modular_doppler/modular_customization/accessories/code/non_species_specific/porcine_accessories/porcine_snouts.dm b/modular_doppler/modular_customization/accessories/code/non_species_specific/porcine_accessories/porcine_snouts.dm deleted file mode 100644 index accb52111a854..0000000000000 --- a/modular_doppler/modular_customization/accessories/code/non_species_specific/porcine_accessories/porcine_snouts.dm +++ /dev/null @@ -1,9 +0,0 @@ -/datum/sprite_accessory/snouts/porcine - icon = 'modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_snouts.dmi' - name = "Porcine" - icon_state = "pig" - -/datum/sprite_accessory/snouts/porcine/boar - name = "Porcine + Tusks" - icon_state = "boar" - diff --git a/modular_doppler/modular_customization/accessories/icons/lizard/lizard_frills.dmi b/modular_doppler/modular_customization/accessories/icons/lizard/lizard_frills.dmi index 8ac09aa9f71892b9cb812e2688181130123d2afa..5bf72cac7ad7900e1fc6cc169e38b3d4c878070c 100644 GIT binary patch delta 69 zcmV-L0J{JC1^oq(PXVNnPYn diff --git a/modular_doppler/modular_customization/accessories/icons/lizard/lizard_horns.dmi b/modular_doppler/modular_customization/accessories/icons/lizard/lizard_horns.dmi index d5381a2cb61325a8c34eec784b8f28c147ca1c1e..c8773aa9281be8c4547824603469ef6f2d264c89 100644 GIT binary patch delta 188 zcmV;t07L(#2B`*+B!8!RR9JLGWpiV4X>fFDZ*Bkpc$}rnu?oU46ouhAd5TNBi`K4L zq*Xe!g1CoZuT3CH%gt3^-=UzBl;U;{{9g`-`qXq#wT*ltB{xP;P;RzTyj;%~6zmHr zEV{w+d=eW*P>^L(^o|lJ*hz6G6L8+2U@{(=aj^^9juewlb}=N@$IH39eoeVxT$ntr qM7IZd>{lW(VWlu}@JN3kUHoD>)LjKt+sHT0u!P7mo3t;n(NzM0CRSzu delta 185 zcmV;q07n0*2Brp(B!8rOR9JLGWpiV4X>fFDZ*Bkpc$}TfK?=e!5QX7&a*Cndi`H(l zP*S8qdxa3}*aVWaOh&!Fi-NAC)ZKgVe0C}oq~L@sPj`uY|1itup`xQW~z n6mZx?$i_{*O=Cd%lbGrkDxv8$=&qG-9c+MXL4hy@vD8%p+xS~< diff --git a/modular_doppler/modular_customization/accessories/icons/non_species_specific/bovine/bovine_tails.dmi b/modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi similarity index 100% rename from modular_doppler/modular_customization/accessories/icons/non_species_specific/bovine/bovine_tails.dmi rename to modular_doppler/modular_customization/accessories/icons/non_species_specific/cow/cow_tails.dmi diff --git a/modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_ears.dmi b/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi similarity index 100% rename from modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_ears.dmi rename to modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_ears.dmi diff --git a/modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_snouts.dmi b/modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi similarity index 100% rename from modular_doppler/modular_customization/accessories/icons/non_species_specific/porcine/porcine_snouts.dmi rename to modular_doppler/modular_customization/accessories/icons/non_species_specific/pig/pig_snouts.dmi diff --git a/tgstation.dme b/tgstation.dme index 75614e7f93c39..d8b19d727820c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6876,7 +6876,6 @@ #include "modular_doppler\modular_customization\accessories\code\non_species_specific\avian_accessories\avian_snout.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\avian_accessories\avian_tail.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\avian_accessories\avian_wings.dm" -#include "modular_doppler\modular_customization\accessories\code\non_species_specific\bovine_accessories\bovine_tails.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\canine_accessories\canine_body_markings.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\canine_accessories\canine_ears.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\canine_accessories\canine_snout.dm" @@ -6884,6 +6883,7 @@ #include "modular_doppler\modular_customization\accessories\code\non_species_specific\cervid_accessories\cervid_ears.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\cervid_accessories\cervid_horns.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\cervid_accessories\cervid_tail.dm" +#include "modular_doppler\modular_customization\accessories\code\non_species_specific\cow_accessories\cow_tails.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\feline_accessories\feline_ears.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\feline_accessories\feline_snout.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\feline_accessories\feline_tail.dm" @@ -6892,8 +6892,8 @@ #include "modular_doppler\modular_customization\accessories\code\non_species_specific\leporid_accessories\leporid_tail.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_ears.dm" #include "modular_doppler\modular_customization\accessories\code\non_species_specific\murid_accessories\murid_tail.dm" -#include "modular_doppler\modular_customization\accessories\code\non_species_specific\porcine_accessories\porcine_ears.dm" -#include "modular_doppler\modular_customization\accessories\code\non_species_specific\porcine_accessories\porcine_snouts.dm" +#include "modular_doppler\modular_customization\accessories\code\non_species_specific\pig_accessories\pig_ears.dm" +#include "modular_doppler\modular_customization\accessories\code\non_species_specific\pig_accessories\pig_snouts.dm" #include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_body_markings.dm" #include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_ears.dm" #include "modular_doppler\modular_customization\accessories\code\ramatan_accessories\ramatan_frills.dm"