diff --git a/code/modules/clothing/head/misc_special_vr.dm b/code/modules/clothing/head/misc_special_vr.dm new file mode 100644 index 0000000000..1d1a8cb91d --- /dev/null +++ b/code/modules/clothing/head/misc_special_vr.dm @@ -0,0 +1,4 @@ +/obj/item/clothing/head/cone + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' + ) \ No newline at end of file diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index a243216c4d..d71f4698a6 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -129,3 +129,8 @@ icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "beret_talon_officer" item_state = "baret_talon_command" + +/obj/item/clothing/head/cowboy + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' + ) diff --git a/code/modules/clothing/masks/gasmask_vr.dm b/code/modules/clothing/masks/gasmask_vr.dm index cdc7d52e0c..a569b615bf 100644 --- a/code/modules/clothing/masks/gasmask_vr.dm +++ b/code/modules/clothing/masks/gasmask_vr.dm @@ -17,4 +17,9 @@ icon = 'icons/inventory/face/item_vr.dmi' icon_override = 'icons/inventory/face/mob_vr.dmi' body_parts_covered = FACE|EYES - flags_inv = HIDEEARS|HIDEEYES|HIDEFACE \ No newline at end of file + flags_inv = HIDEEARS|HIDEEYES|HIDEFACE + +/obj/item/clothing/mask/gas/plaguedoctor + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi' + ) \ No newline at end of file diff --git a/code/modules/clothing/masks/miscellaneous_vr.dm b/code/modules/clothing/masks/miscellaneous_vr.dm new file mode 100644 index 0000000000..7792ecc8e3 --- /dev/null +++ b/code/modules/clothing/masks/miscellaneous_vr.dm @@ -0,0 +1,4 @@ +/obj/item/clothing/mask/emotions + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi' + ) \ No newline at end of file diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 054f9dd110..24e0cdddbf 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -28,6 +28,9 @@ /obj/item/clothing/head/wizard/fake/realistic/colorable desc = "A cool-looking 'magic' hat." icon_state = "wizard-white" + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi' + ) /obj/item/clothing/head/wizard/marisa name = "Witch Hat" diff --git a/icons/inventory/face/mob_vr_teshari.dmi b/icons/inventory/face/mob_vr_teshari.dmi index 5a549885c7..4bf3353c7a 100644 Binary files a/icons/inventory/face/mob_vr_teshari.dmi and b/icons/inventory/face/mob_vr_teshari.dmi differ diff --git a/icons/inventory/head/mob_vr_teshari.dmi b/icons/inventory/head/mob_vr_teshari.dmi index 4ebb53d2d8..7616f26095 100644 Binary files a/icons/inventory/head/mob_vr_teshari.dmi and b/icons/inventory/head/mob_vr_teshari.dmi differ diff --git a/modular_chomp/code/modules/clothing/face/gasmask.dm b/modular_chomp/code/modules/clothing/face/gasmask.dm deleted file mode 100644 index c53ca33f7a..0000000000 --- a/modular_chomp/code/modules/clothing/face/gasmask.dm +++ /dev/null @@ -1,15 +0,0 @@ -/obj/item/clothing/mask/gas/plaguedoctor/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi' - -/obj/item/clothing/mask/gas/plaguedoctor/gold/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi' \ No newline at end of file diff --git a/modular_chomp/code/modules/clothing/face/miscellaneous.dm b/modular_chomp/code/modules/clothing/face/miscellaneous.dm deleted file mode 100644 index 6b1070e0c7..0000000000 --- a/modular_chomp/code/modules/clothing/face/miscellaneous.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/item/clothing/mask/emotions/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/face/mob_teshari.dmi' \ No newline at end of file diff --git a/modular_chomp/code/modules/clothing/head/misc.dm b/modular_chomp/code/modules/clothing/head/misc.dm deleted file mode 100644 index bc713aeede..0000000000 --- a/modular_chomp/code/modules/clothing/head/misc.dm +++ /dev/null @@ -1,97 +0,0 @@ -//PLEASE give me a better way to do this -/obj/item/clothing/head/cone/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/wizard/fake/realistic/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/wizard/fake/realistic/colorable/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/rattan/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/dark/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/ranger/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/black/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/fancy/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/rustler/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/bandit/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - -/obj/item/clothing/head/cowboy/wide/New() - . = ..() - var/shtfound = sprite_sheets.Find(SPECIES_TESHARI) - if(shtfound) - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - else - sprite_sheets[SPECIES_TESHARI] = 'modular_chomp/icons/inventory/head/mob_teshari.dmi' - diff --git a/vorestation.dme b/vorestation.dme index 31f04c782d..7b144a8f5b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2108,6 +2108,7 @@ #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_ch.dm" #include "code\modules\clothing\head\misc_special.dm" +#include "code\modules\clothing\head\misc_special_vr.dm" #include "code\modules\clothing\head\misc_vr.dm" #include "code\modules\clothing\head\pilot_helmet.dm" #include "code\modules\clothing\head\pilot_helmet_vr.dm" @@ -2121,6 +2122,7 @@ #include "code\modules\clothing\masks\gasmask_vr.dm" #include "code\modules\clothing\masks\hailer.dm" #include "code\modules\clothing\masks\miscellaneous.dm" +#include "code\modules\clothing\masks\miscellaneous_vr.dm" #include "code\modules\clothing\masks\shiny_vr.dm" #include "code\modules\clothing\masks\tesh_synth_facemask.dm" #include "code\modules\clothing\masks\voice.dm" @@ -4516,9 +4518,6 @@ #include "modular_chomp\code\modules\client\preferences_spawnpoints.dm" #include "modular_chomp\code\modules\client\preference_setup\global\setting_datums.dm" #include "modular_chomp\code\modules\clothing\clothing.dm" -#include "modular_chomp\code\modules\clothing\face\gasmask.dm" -#include "modular_chomp\code\modules\clothing\face\miscellaneous.dm" -#include "modular_chomp\code\modules\clothing\head\misc.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\clockwork_ch.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\rig.dm" #include "modular_chomp\code\modules\datums\supplypacks\contraband.dm"