diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 7a0932829f3..38cb0271196 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -49,7 +49,7 @@ ) slowdown = 1 armor_type = /datum/armor/suit_space - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDESEXTOY|HIDETAIL //SKYRAT EDIT CHANGE - ADDED HIDETAIL. ADDED HIDESEXTOY TO PREVENT VISUAL BUGS. + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDESEXTOY|HIDETAIL|HIDETAUR //SKYRAT EDIT CHANGE - ADDED HIDETAIL, HIDETAUR. ADDED HIDESEXTOY TO PREVENT VISUAL BUGS. cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT_OFF heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index d4064218a07..6cbbe623557 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -29,7 +29,7 @@ ) slowdown = 1 armor_type = /datum/armor/utility_fire - flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL + flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL|HIDETAUR // SKYRAT EDIT ADDITION - HIDETAIL, HIDETAUR clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT @@ -78,7 +78,7 @@ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS - flags_inv = HIDESHOES|HIDEJUMPSUIT + flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETAUR|HIDETAIL // NOVA EDIT ADDITION - HIDETAUR, HIDETAIL /* * Bomb protection @@ -124,7 +124,7 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 2 armor_type = /datum/armor/utility_bomb_suit - flags_inv = HIDEJUMPSUIT|HIDETAIL // SKYRAT EDIT ADDITION - HIDETAIL + flags_inv = HIDEJUMPSUIT|HIDETAIL|HIDETAUR // SKYRAT EDIT ADDITION - HIDETAIL, HIDETAUR heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/modular_skyrat/master_files/code/modules/clothing/taur_sprites/suit.dm b/modular_skyrat/master_files/code/modules/clothing/taur_sprites/suit.dm new file mode 100644 index 00000000000..b93a74dc4cb --- /dev/null +++ b/modular_skyrat/master_files/code/modules/clothing/taur_sprites/suit.dm @@ -0,0 +1,76 @@ +/obj/item/clothing/suit/space/eva + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + +/obj/item/clothing/suit/space/eva/plasmaman + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + +/obj/item/clothing/suit/space/syndicate/contract + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + +/obj/item/clothing/suit/clockwork + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + flags_inv = HIDETAUR + +/obj/item/clothing/suit/chaplainsuit/armor/clock + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + flags_inv = HIDETAUR + +/obj/item/clothing/suit/clockwork/speed + worn_icon_taur_snake = null + +/obj/item/clothing/suit/clockwork/cloak + worn_icon_taur_snake = null + +/obj/item/clothing/suit/hooded/explorer + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' // very good sprite, but slightly outdated + flags_inv = HIDETAUR + +/obj/item/clothing/suit/hooded/explorer/syndicate + worn_icon_taur_snake = null + worn_icon_taur_paw = null + +/obj/item/clothing/suit/hooded/berserker + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + flags_inv = HIDETAUR + +/obj/item/clothing/suit/utility/bomb_suit // strangely, this isnt based off the carbon sprite, but is way better + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + worn_icon_taur_hoof = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_hoof.dmi' + +/obj/item/clothing/suit/utility/bomb_suit/white + worn_icon_taur_hoof = null + +/obj/item/clothing/suit/utility/bomb_suit/security + worn_icon_taur_hoof = null + +/obj/item/clothing/suit/utility/fire/firefighter // outdated but similar sprites, still pretty good + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + +/obj/item/clothing/suit/utility/fire/atmos + worn_icon_taur_snake = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_snake.dmi' + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + +/obj/item/clothing/suit/apron + worn_icon_taur_paw = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi' + worn_icon_taur_hoof = 'modular_skyrat/master_files/icons/mob/clothing/suit_taur_hoof.dmi' + +/obj/item/clothing/suit/apron/surgical + worn_icon_taur_paw = null + +/obj/item/clothing/suit/apron/chef + worn_icon_taur_paw = null + +/obj/item/clothing/suit/apron/overalls + worn_icon_taur_paw = null + worn_icon_taur_hoof = null + +/obj/item/clothing/suit/apron/waders + worn_icon_taur_paw = null + worn_icon_taur_hoof = null diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit_taur_hoof.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit_taur_hoof.dmi index 0235f12784e..29502ab9992 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit_taur_hoof.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit_taur_hoof.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi index cbf409192e4..d2a6aa65a26 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit_taur_paw.dmi differ diff --git a/tgstation.dme b/tgstation.dme index a4d6ea21925..b2e79ec76a4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6589,6 +6589,7 @@ #include "modular_skyrat\master_files\code\modules\clothing\suits\labcoat.dm" #include "modular_skyrat\master_files\code\modules\clothing\suits\skinsuits.dm" #include "modular_skyrat\master_files\code\modules\clothing\suits\wintercoats.dm" +#include "modular_skyrat\master_files\code\modules\clothing\taur_sprites\suit.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\_under.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\accessories.dm" #include "modular_skyrat\master_files\code\modules\clothing\under\akula_jobs.dm"