diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 744abb85d8..b7485be674 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -13,10 +13,6 @@ mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) if(istype(H) && istype(H.tail_style, taurtype)) - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) return 1 else to_chat(H, "[no_message]") @@ -44,66 +40,20 @@ mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) if(..()) - var/datum/sprite_accessory/tail/taur/TT = H.tail_style - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/horse)) - item_state = "[icon_base]_Horse" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/wolf)) - item_state = "[icon_base]_Wolf" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/cow)) - item_state = "[icon_base]_Cow" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/lizard)) - item_state = "[icon_base]_Lizard" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/feline)) - item_state = "[icon_base]_Feline" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/drake)) - item_state = "[icon_base]_Drake" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/otie)) - item_state = "[icon_base]_Otie" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/deer)) - item_state = "[icon_base]_Deer" - if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? - slowdown = 0 - else - slowdown = initial(slowdown) - return 1 + if(!istype(H))//Error, non HUMAN. + log_runtime("[H] was not a valid human!") + return + + if(H.size_multiplier >= RESIZE_BIG) //Are they a macro? If yes, they get no slowdown. + slowdown = 0 else - to_chat(H, "[no_message]") - return 0 + slowdown = initial(slowdown) + + var/datum/sprite_accessory/tail/taur/TT = H.tail_style + item_state = "[icon_base]_[TT.icon_sprite_tag]" //icon_sprite_tag is something like "deer" + return 1 + + /obj/item/weapon/storage/backpack/saddlebag_common/robust //Shared bag for other taurs with sturdy backs name = "Robust Saddlebags" @@ -116,7 +66,7 @@ /obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs name = "Taur Duty Vest" - desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though." + desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though. Holds less than a saddle." icon = 'icons/obj/clothing/backpack_vr.dmi' icon_override = 'icons/mob/back_vr.dmi' item_state = "taurvest" @@ -145,6 +95,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "satchel-explorer" icon_state = "satchel-explorer" + /obj/item/weapon/storage/backpack/explorer name = "explorer backpack" desc = "A backpack for carrying a large number of supplies easily." @@ -152,6 +103,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "explorerpack" icon_state = "explorerpack" + /obj/item/weapon/storage/backpack/satchel/roboticist name = "roboticist satchel" desc = "A satchel for carrying a large number of spare parts easily." @@ -159,6 +111,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "satchel-robo" icon_state = "satchel-robo" + /obj/item/weapon/storage/backpack/roboticist name = "roboticist backpack" desc = "A backpack for carrying a large number of spare parts easily." @@ -166,6 +119,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "backpack-robo" icon_state = "backpack-robo" + /obj/item/weapon/storage/backpack/vietnam name = "vietnam backpack" desc = "There are tangos in the trees! We need napalm right now! Why is my gun jammed?" @@ -173,6 +127,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "nambackpack" icon_state = "nambackpack" + /obj/item/weapon/storage/backpack/russian name = "russian backpack" desc = "Useful for carrying large quantities of vodka." @@ -180,6 +135,7 @@ icon_override = 'icons/mob/back_vr.dmi' item_state = "ru_rucksack" icon_state = "ru_rucksack" + /obj/item/weapon/storage/backpack/korean name = "korean backpack" desc = "Insert witty description here." diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index 876cd4afb6..26c760efdb 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -126,6 +126,8 @@ var/icon/suit_sprites = null //File for suit sprites, if any. var/icon/under_sprites = null + var/icon_sprite_tag // This is where we put stuff like _Horse, so we can assign icons easier. + var/can_ride = 1 //whether we're real rideable taur or just in that category //Could do nested lists but it started becoming a nightmare. It'd be more fun for lookups of a_intent and m_intent, but then subtypes need to @@ -167,32 +169,38 @@ icon_state = "wolf_s" under_sprites = 'icons/mob/taursuits_wolf_vr.dmi' suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi' + icon_sprite_tag = "wolf" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" + icon_sprite_tag = "wolf" //This could be modified later. /datum/sprite_accessory/tail/taur/wolf/wolf_2c name = "Wolf dual-color (Taur)" icon_state = "wolf_s" extra_overlay = "wolf_markings" + //icon_sprite_tag = "wolf2c" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" icon_state = "fatwolf_s" extra_overlay = "fatwolf_markings" + //icon_sprite_tag = "fatwolf2c" /datum/sprite_accessory/tail/taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" icon_state = "synthwolf_s" extra_overlay = "synthwolf_markings" + //icon_sprite_tag = "synthwolf" /datum/sprite_accessory/tail/taur/naga name = "Naga (Taur)" icon_state = "naga_s" suit_sprites = 'icons/mob/taursuits_naga_vr.dmi' + //icon_sprite_tag = "naga" msg_owner_help_walk = "You carefully slither around %prey." msg_prey_help_walk = "%owner's huge tail slithers past beside you!" @@ -225,12 +233,14 @@ name = "Naga dual-color (Taur)" icon_state = "naga_s" extra_overlay = "naga_markings" + //icon_sprite_tag = "naga2c" /datum/sprite_accessory/tail/taur/horse name = "Horse (Taur)" icon_state = "horse_s" under_sprites = 'icons/mob/taursuits_horse_vr.dmi' suit_sprites = 'icons/mob/taursuits_horse_vr.dmi' + icon_sprite_tag = "horse" msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -251,11 +261,13 @@ name = "SynthHorse dual-color (Taur)" icon_state = "synthhorse_s" extra_overlay = "synthhorse_markings" + //icon_sprite_tag = "synthhorse" /datum/sprite_accessory/tail/taur/cow name = "Cow (Taur)" icon_state = "cow_s" suit_sprites = 'icons/mob/taursuits_cow_vr.dmi' + icon_sprite_tag = "cow" msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -277,6 +289,7 @@ icon_state = "deer_s" extra_overlay = "deer_markings" suit_sprites = 'icons/mob/taursuits_deer_vr.dmi' + icon_sprite_tag = "deer" msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!" msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!" @@ -297,21 +310,25 @@ name = "Lizard (Taur)" icon_state = "lizard_s" suit_sprites = 'icons/mob/taursuits_lizard_vr.dmi' + icon_sprite_tag = "lizard" /datum/sprite_accessory/tail/taur/lizard/lizard_2c name = "Lizard dual-color (Taur)" icon_state = "lizard_s" extra_overlay = "lizard_markings" + //icon_sprite_tag = "lizard2c" /datum/sprite_accessory/tail/taur/lizard/synthlizard name = "SynthLizard dual-color (Taur)" icon_state = "synthlizard_s" extra_overlay = "synthlizard_markings" + //icon_sprite_tag = "synthlizard" /datum/sprite_accessory/tail/taur/spider name = "Spider (Taur)" icon_state = "spider_s" suit_sprites = 'icons/mob/taursuits_spider_vr.dmi' + icon_sprite_tag = "spider" msg_owner_disarm_run = "You quickly push %prey to the ground with your leg!" msg_prey_disarm_run = "%owner pushes you down to the ground with their leg!" @@ -331,6 +348,7 @@ /datum/sprite_accessory/tail/taur/tents name = "Tentacles (Taur)" icon_state = "tent_s" + icon_sprite_tag = "tentacle" can_ride = 0 msg_prey_stepunder = "You run between %prey's tentacles." @@ -358,11 +376,13 @@ name = "Feline (Taur)" icon_state = "feline_s" suit_sprites = 'icons/mob/taursuits_feline_vr.dmi' + icon_sprite_tag = "feline" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" + //icon_sprite_tag = "fatfeline" /datum/sprite_accessory/tail/taur/fatfeline_wag name = "Fat Feline (Taur) (vwag)" @@ -373,22 +393,26 @@ name = "Feline dual-color (Taur)" icon_state = "feline_s" extra_overlay = "feline_markings" + //icon_sprite_tag = "feline2c" //TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" icon_state = "fatfeline_s" extra_overlay = "fatfeline_markings" + //icon_sprite_tag = "fatfeline2c" /datum/sprite_accessory/tail/taur/feline/synthfeline name = "SynthFeline dual-color (Taur)" icon_state = "synthfeline_s" extra_overlay = "synthfeline_markings" + //icon_sprite_tag = "synthfeline" /datum/sprite_accessory/tail/taur/slug name = "Slug (Taur)" icon_state = "slug_s" suit_sprites = 'icons/mob/taursuits_slug_vr.dmi' + icon_sprite_tag = "slug" msg_owner_help_walk = "You carefully slither around %prey." msg_prey_help_walk = "%owner's huge tail slithers past beside you!" @@ -420,11 +444,13 @@ /datum/sprite_accessory/tail/taur/frog name = "Frog (Taur)" icon_state = "frog_s" + icon_sprite_tag = "frog" /datum/sprite_accessory/tail/taur/thicktentacles name = "Thick Tentacles (Taur)" icon_state = "tentacle_s" can_ride = 0 + icon_sprite_tag = "thick_tentacles" msg_prey_stepunder = "You run between %prey's tentacles." msg_owner_stepunder = "%owner runs between your tentacles." @@ -452,12 +478,14 @@ icon_state = "drake_s" extra_overlay = "drake_markings" suit_sprites = 'icons/mob/taursuits_drake_vr.dmi' + icon_sprite_tag = "drake" /datum/sprite_accessory/tail/taur/otie name = "Otie (Taur)" icon_state = "otie_s" extra_overlay = "otie_markings" suit_sprites = 'icons/mob/taursuits_otie_vr.dmi' + icon_sprite_tag = "otie" /datum/sprite_accessory/tail/taur/alraune/alraune_2c name = "Alraune (dual color)" @@ -468,12 +496,14 @@ extra_overlay = "alraunecolor_markings" extra_overlay_w = "alraunecolor_closed_markings" clip_mask_state = "taur_clip_mask_alraune" + icon_sprite_tag = "alraune" /datum/sprite_accessory/tail/taur/wasp name = "Wasp (dual color)" icon_state = "wasp_s" extra_overlay = "wasp_markings" clip_mask_state = "taur_clip_mask_wasp" + icon_sprite_tag = "wasp" msg_owner_disarm_run = "You quickly push %prey to the ground with your leg!" msg_prey_disarm_run = "%owner pushes you down to the ground with their leg!" @@ -494,6 +524,7 @@ name = "Mermaid (Taur)" icon_state = "mermaid_s" can_ride = 0 + icon_sprite_tag = "mermaid" msg_owner_help_walk = "You carefully slither around %prey." msg_prey_help_walk = "%owner's huge tail slithers past beside you!" diff --git a/icons/mob/back_vr.dmi b/icons/mob/back_vr.dmi index dad66ba3c3..474731f1a1 100644 Binary files a/icons/mob/back_vr.dmi and b/icons/mob/back_vr.dmi differ