Merge pull request #4426 from Heroman3003/awoo-refactor

Replaces awoo with wolfgirl

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

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)
+	allowed = list(/obj/item/weapon/melee/fluffstuff/wolfgirlsword)

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"

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

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

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -1859,11 +1859,11 @@
 			"<span class='danger'>\The [user] is falling on \the [src]! It looks like [tempgender] trying to commit suicide.</span>"))
 		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, "<span class='notice'>The [src] is now sharpened. It will cut!</span>")
 
@@ -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, "<span class='notice'>The [src] grows dull!</span>")
 	..()

vorestation.dme

@@ -2284,7 +2284,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"
@@ -2307,6 +2306,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"