diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index 007f3d2d88..23b377afa0 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -30,11 +30,11 @@ /datum/supply_pack/recreation/wolfgirl_cosplay_crate name = "Wolfgirl Cosplay Crate" contains = list( - /obj/item/clothing/head/fluff/awoo = 1, - /obj/item/clothing/shoes/fluff/awoo = 1, - /obj/item/clothing/under/fluff/awoo = 1, - /obj/item/weapon/melee/fluffstuff/awoosword = 1, - /obj/item/weapon/shield/fluff/awooshield = 1 + /obj/item/clothing/head/fluff/wolfgirl = 1, + /obj/item/clothing/shoes/fluff/wolfgirl = 1, + /obj/item/clothing/under/fluff/wolfgirl = 1, + /obj/item/weapon/melee/fluffstuff/wolfgirlsword = 1, + /obj/item/weapon/shield/fluff/wolfgirlshield = 1 ) cost = 50 containertype = /obj/structure/closet/crate diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index 28d06044cf..4d0440e564 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -5,11 +5,11 @@ icon_state = "eshield0" // eshield1 for expanded item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi') -/obj/item/weapon/shield/fluff/awooshield +/obj/item/weapon/shield/fluff/wolfgirlshield name = "Autumn Shield" desc = "A shiny silvery shield with a large red leaf symbol in the center." icon = 'icons/obj/weapons_vr.dmi' - icon_state = "awooshield" + icon_state = "wolfgirlshield" slot_flags = SLOT_BACK | SLOT_OCLOTHING force = 5.0 throwforce = 5.0 @@ -18,4 +18,4 @@ item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', slot_back_str = 'icons/vore/custom_items_vr.dmi', slot_wear_suit_str = 'icons/vore/custom_items_vr.dmi') attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time - allowed = list(/obj/item/weapon/melee/fluffstuff/awoosword) \ No newline at end of file + allowed = list(/obj/item/weapon/melee/fluffstuff/wolfgirlsword) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 7226e19208..e45ce509d2 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -122,7 +122,7 @@ /obj/structure/largecrate/animal/wolfgirl name = "Wolfgirl Crate" desc = "A sketchy looking crate with airholes that shakes and thuds every now and then. Someone seems to be demanding they be let out." - starts_with = list(/mob/living/simple_animal/retaliate/awoo) + starts_with = list(/mob/living/simple_animal/retaliate/wolfgirl) /obj/structure/largecrate/animal/fennec name = "Fennec Crate" diff --git a/code/modules/mob/living/simple_animal/vore/awoo.dm b/code/modules/mob/living/simple_animal/vore/wolfgirl.dm similarity index 84% rename from code/modules/mob/living/simple_animal/vore/awoo.dm rename to code/modules/mob/living/simple_animal/vore/wolfgirl.dm index fbd6d8dac5..b0a3d8a156 100644 --- a/code/modules/mob/living/simple_animal/vore/awoo.dm +++ b/code/modules/mob/living/simple_animal/vore/wolfgirl.dm @@ -1,13 +1,13 @@ -/mob/living/simple_animal/retaliate/awoo +/mob/living/simple_animal/retaliate/wolfgirl name = "wolfgirl" desc = "AwooOOOOoooo!" tt_desc = "Homo lupus" icon = 'icons/mob/vore.dmi' - icon_state = "awoo" - icon_living = "awoo" - icon_dead = "awoo-dead" + icon_state = "wolfgirl" + icon_living = "wolfgirl" + icon_dead = "wolfgirl-dead" - faction = "awoo" + faction = "wolfgirl" maxHealth = 30 health = 30 @@ -47,7 +47,7 @@ var/loopstop = 0 //To prevent circular awoooos. -/mob/living/simple_animal/retaliate/awoo/hear_say() +/mob/living/simple_animal/retaliate/wolfgirl/hear_say() if(world.time - loopstop < 5 SECONDS) return else @@ -55,7 +55,7 @@ ..() // Activate Noms! -/mob/living/simple_animal/retaliate/awoo +/mob/living/simple_animal/retaliate/wolfgirl vore_active = 1 vore_pounce_chance = 40 vore_icons = SA_ICON_LIVING diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 8163c861f4..b0c7ec96ef 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -25,36 +25,36 @@ */ //Natje: Awen Henry -/obj/item/clothing/head/fluff/awoo +/obj/item/clothing/head/fluff/wolfgirl name = "Wolfgirl Hat" desc = "An odd, small hat with two strings attached to it." - icon_state = "awoohat" + icon_state = "wolfgirlhat" icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_onmob_vr.dmi' //Natje: Awen Henry -/obj/item/clothing/shoes/fluff/awoo +/obj/item/clothing/shoes/fluff/wolfgirl name = "Red Sandals" desc = "A pair of sandals that make you want to awoo!" - icon_state = "awoosandals" + icon_state = "wolfgirlsandals" icon = 'icons/vore/custom_clothes_vr.dmi' icon_override = 'icons/vore/custom_onmob_vr.dmi' //Natje: Awen Henry -/obj/item/clothing/under/fluff/awoo +/obj/item/clothing/under/fluff/wolfgirl name = "Wolfgirl Clothes" desc = "A set of clothes almost identical to those Wolf Girls always wear..." icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "awoouni" - worn_state = "awoouni_mob" + icon_state = "wolfgirluni" + worn_state = "wolfgirluni_mob" rolled_sleeves = 0 rolled_down = 0 icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "awoouni_mob" + item_state = "wolfgirluni_mob" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //SpoopyLizz: Roiz Lizden diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index e527479b2d..cdd2bb770f 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1859,11 +1859,11 @@ "\The [user] is falling on \the [src]! It looks like [tempgender] trying to commit suicide.")) return (BRUTELOSS|FIRELOSS) -/obj/item/weapon/melee/fluffstuff/awoosword +/obj/item/weapon/melee/fluffstuff/wolfgirlsword name = "Wolfgirl Sword Replica" desc = "A replica of a large, scimitar-like sword with a dull edge. Ceremonial... until it isn't." icon = 'icons/obj/weapons_vr.dmi' - icon_state = "awoosword" + icon_state = "wolfgirlsword" slot_flags = SLOT_BACK | SLOT_OCLOTHING active_force = 15 active_throwforce = 7 @@ -1875,16 +1875,16 @@ w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', slot_back_str = 'icons/vore/custom_items_vr.dmi', slot_wear_suit_str = 'icons/vore/custom_items_vr.dmi') - var/active_state = "awoosword" - allowed = list(/obj/item/weapon/shield/fluff/awooshield) + var/active_state = "wolfgirlsword" + allowed = list(/obj/item/weapon/shield/fluff/wolfgirlshield) damtype = HALLOSS -/obj/item/weapon/melee/fluffstuff/awoosword/dropped(var/mob/user) +/obj/item/weapon/melee/fluffstuff/wolfgirlsword/dropped(var/mob/user) ..() if(!istype(loc,/mob)) deactivate(user) -/obj/item/weapon/melee/fluffstuff/awoosword/activate(mob/living/user) +/obj/item/weapon/melee/fluffstuff/wolfgirlsword/activate(mob/living/user) if(!active) to_chat(user, "The [src] is now sharpened. It will cut!") @@ -1896,7 +1896,7 @@ damtype = BRUTE -/obj/item/weapon/melee/fluffstuff/awoosword/deactivate(mob/living/user) +/obj/item/weapon/melee/fluffstuff/wolfgirlsword/deactivate(mob/living/user) if(active) to_chat(user, "The [src] grows dull!") ..() @@ -1942,7 +1942,7 @@ icon = 'icons/vore/custom_items_vr.dmi' icon_state = "penlightlynn" - + //Knightfall5:Ashley Kifer /obj/item/clothing/accessory/medal/nobel_science/fluff/ashley name = "nobel sciences award" diff --git a/icons/mob/items/lefthand_melee_vr.dmi b/icons/mob/items/lefthand_melee_vr.dmi index 00e1b0d013..9605154645 100644 Binary files a/icons/mob/items/lefthand_melee_vr.dmi and b/icons/mob/items/lefthand_melee_vr.dmi differ diff --git a/icons/mob/items/righthand_melee_vr.dmi b/icons/mob/items/righthand_melee_vr.dmi index 13b75e1c32..e669f0cc84 100644 Binary files a/icons/mob/items/righthand_melee_vr.dmi and b/icons/mob/items/righthand_melee_vr.dmi differ diff --git a/icons/mob/vore.dmi b/icons/mob/vore.dmi index c4feff1d98..0357739b9c 100644 Binary files a/icons/mob/vore.dmi and b/icons/mob/vore.dmi differ diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi index 9535528b7e..5bf8071324 100644 Binary files a/icons/obj/weapons_vr.dmi and b/icons/obj/weapons_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index bd68e5fc27..73e5e7f363 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index efe71b4224..aa2910fb65 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ diff --git a/icons/vore/custom_onmob_vr.dmi b/icons/vore/custom_onmob_vr.dmi index f2913f743a..3b41ff2020 100644 Binary files a/icons/vore/custom_onmob_vr.dmi and b/icons/vore/custom_onmob_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index de26117640..2875d2260e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2263,7 +2263,6 @@ #include "code\modules\mob\living\simple_animal\slime\life.dm" #include "code\modules\mob\living\simple_animal\slime\slime.dm" #include "code\modules\mob\living\simple_animal\slime\subtypes.dm" -#include "code\modules\mob\living\simple_animal\vore\awoo.dm" #include "code\modules\mob\living\simple_animal\vore\bee.dm" #include "code\modules\mob\living\simple_animal\vore\carp.dm" #include "code\modules\mob\living\simple_animal\vore\catgirl.dm" @@ -2286,6 +2285,7 @@ #include "code\modules\mob\living\simple_animal\vore\solargrub.dm" #include "code\modules\mob\living\simple_animal\vore\solargrub_larva.dm" #include "code\modules\mob\living\simple_animal\vore\wolf.dm" +#include "code\modules\mob\living\simple_animal\vore\wolfgirl.dm" #include "code\modules\mob\living\simple_animal\vore\zz_vore_overrides.dm" #include "code\modules\mob\living\simple_animal\vore\shadekin\_defines.dm" #include "code\modules\mob\living\simple_animal\vore\shadekin\ability_objects.dm"