Refactors Awoos into Wolfgirls
@@ -30,11 +30,11 @@
|
|||||||
/datum/supply_pack/recreation/wolfgirl_cosplay_crate
|
/datum/supply_pack/recreation/wolfgirl_cosplay_crate
|
||||||
name = "Wolfgirl Cosplay Crate"
|
name = "Wolfgirl Cosplay Crate"
|
||||||
contains = list(
|
contains = list(
|
||||||
/obj/item/clothing/head/fluff/awoo = 1,
|
/obj/item/clothing/head/fluff/wolfgirl = 1,
|
||||||
/obj/item/clothing/shoes/fluff/awoo = 1,
|
/obj/item/clothing/shoes/fluff/wolfgirl = 1,
|
||||||
/obj/item/clothing/under/fluff/awoo = 1,
|
/obj/item/clothing/under/fluff/wolfgirl = 1,
|
||||||
/obj/item/weapon/melee/fluffstuff/awoosword = 1,
|
/obj/item/weapon/melee/fluffstuff/wolfgirlsword = 1,
|
||||||
/obj/item/weapon/shield/fluff/awooshield = 1
|
/obj/item/weapon/shield/fluff/wolfgirlshield = 1
|
||||||
)
|
)
|
||||||
cost = 50
|
cost = 50
|
||||||
containertype = /obj/structure/closet/crate
|
containertype = /obj/structure/closet/crate
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
icon_state = "eshield0" // eshield1 for expanded
|
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')
|
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"
|
name = "Autumn Shield"
|
||||||
desc = "A shiny silvery shield with a large red leaf symbol in the center."
|
desc = "A shiny silvery shield with a large red leaf symbol in the center."
|
||||||
icon = 'icons/obj/weapons_vr.dmi'
|
icon = 'icons/obj/weapons_vr.dmi'
|
||||||
icon_state = "awooshield"
|
icon_state = "wolfgirlshield"
|
||||||
slot_flags = SLOT_BACK | SLOT_OCLOTHING
|
slot_flags = SLOT_BACK | SLOT_OCLOTHING
|
||||||
force = 5.0
|
force = 5.0
|
||||||
throwforce = 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')
|
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")
|
attack_verb = list("shoved", "bashed")
|
||||||
var/cooldown = 0 //shield bash cooldown. based on world.time
|
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)
|
||||||
@@ -122,7 +122,7 @@
|
|||||||
/obj/structure/largecrate/animal/wolfgirl
|
/obj/structure/largecrate/animal/wolfgirl
|
||||||
name = "Wolfgirl Crate"
|
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."
|
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
|
/obj/structure/largecrate/animal/fennec
|
||||||
name = "Fennec Crate"
|
name = "Fennec Crate"
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
/mob/living/simple_animal/retaliate/awoo
|
/mob/living/simple_animal/retaliate/wolfgirl
|
||||||
name = "wolfgirl"
|
name = "wolfgirl"
|
||||||
desc = "AwooOOOOoooo!"
|
desc = "AwooOOOOoooo!"
|
||||||
tt_desc = "Homo lupus"
|
tt_desc = "Homo lupus"
|
||||||
icon = 'icons/mob/vore.dmi'
|
icon = 'icons/mob/vore.dmi'
|
||||||
icon_state = "awoo"
|
icon_state = "wolfgirl"
|
||||||
icon_living = "awoo"
|
icon_living = "wolfgirl"
|
||||||
icon_dead = "awoo-dead"
|
icon_dead = "wolfgirl-dead"
|
||||||
|
|
||||||
faction = "awoo"
|
faction = "wolfgirl"
|
||||||
maxHealth = 30
|
maxHealth = 30
|
||||||
health = 30
|
health = 30
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
var/loopstop = 0 //To prevent circular awoooos.
|
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)
|
if(world.time - loopstop < 5 SECONDS)
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
..()
|
..()
|
||||||
|
|
||||||
// Activate Noms!
|
// Activate Noms!
|
||||||
/mob/living/simple_animal/retaliate/awoo
|
/mob/living/simple_animal/retaliate/wolfgirl
|
||||||
vore_active = 1
|
vore_active = 1
|
||||||
vore_pounce_chance = 40
|
vore_pounce_chance = 40
|
||||||
vore_icons = SA_ICON_LIVING
|
vore_icons = SA_ICON_LIVING
|
||||||
@@ -25,36 +25,36 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
//Natje: Awen Henry
|
//Natje: Awen Henry
|
||||||
/obj/item/clothing/head/fluff/awoo
|
/obj/item/clothing/head/fluff/wolfgirl
|
||||||
name = "Wolfgirl Hat"
|
name = "Wolfgirl Hat"
|
||||||
desc = "An odd, small hat with two strings attached to it."
|
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 = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||||
|
|
||||||
//Natje: Awen Henry
|
//Natje: Awen Henry
|
||||||
/obj/item/clothing/shoes/fluff/awoo
|
/obj/item/clothing/shoes/fluff/wolfgirl
|
||||||
name = "Red Sandals"
|
name = "Red Sandals"
|
||||||
desc = "A pair of sandals that make you want to awoo!"
|
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 = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||||
|
|
||||||
//Natje: Awen Henry
|
//Natje: Awen Henry
|
||||||
/obj/item/clothing/under/fluff/awoo
|
/obj/item/clothing/under/fluff/wolfgirl
|
||||||
name = "Wolfgirl Clothes"
|
name = "Wolfgirl Clothes"
|
||||||
desc = "A set of clothes almost identical to those Wolf Girls always wear..."
|
desc = "A set of clothes almost identical to those Wolf Girls always wear..."
|
||||||
|
|
||||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
icon_state = "awoouni"
|
icon_state = "wolfgirluni"
|
||||||
worn_state = "awoouni_mob"
|
worn_state = "wolfgirluni_mob"
|
||||||
rolled_sleeves = 0
|
rolled_sleeves = 0
|
||||||
rolled_down = 0
|
rolled_down = 0
|
||||||
|
|
||||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
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
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
|
||||||
|
|
||||||
//SpoopyLizz: Roiz Lizden
|
//SpoopyLizz: Roiz Lizden
|
||||||
|
|||||||
@@ -1859,11 +1859,11 @@
|
|||||||
"<span class='danger'>\The [user] is falling on \the [src]! It looks like [tempgender] trying to commit suicide.</span>"))
|
"<span class='danger'>\The [user] is falling on \the [src]! It looks like [tempgender] trying to commit suicide.</span>"))
|
||||||
return (BRUTELOSS|FIRELOSS)
|
return (BRUTELOSS|FIRELOSS)
|
||||||
|
|
||||||
/obj/item/weapon/melee/fluffstuff/awoosword
|
/obj/item/weapon/melee/fluffstuff/wolfgirlsword
|
||||||
name = "Wolfgirl Sword Replica"
|
name = "Wolfgirl Sword Replica"
|
||||||
desc = "A replica of a large, scimitar-like sword with a dull edge. Ceremonial... until it isn't."
|
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 = 'icons/obj/weapons_vr.dmi'
|
||||||
icon_state = "awoosword"
|
icon_state = "wolfgirlsword"
|
||||||
slot_flags = SLOT_BACK | SLOT_OCLOTHING
|
slot_flags = SLOT_BACK | SLOT_OCLOTHING
|
||||||
active_force = 15
|
active_force = 15
|
||||||
active_throwforce = 7
|
active_throwforce = 7
|
||||||
@@ -1875,16 +1875,16 @@
|
|||||||
w_class = ITEMSIZE_SMALL
|
w_class = ITEMSIZE_SMALL
|
||||||
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
|
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')
|
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"
|
var/active_state = "wolfgirlsword"
|
||||||
allowed = list(/obj/item/weapon/shield/fluff/awooshield)
|
allowed = list(/obj/item/weapon/shield/fluff/wolfgirlshield)
|
||||||
damtype = HALLOSS
|
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))
|
if(!istype(loc,/mob))
|
||||||
deactivate(user)
|
deactivate(user)
|
||||||
|
|
||||||
/obj/item/weapon/melee/fluffstuff/awoosword/activate(mob/living/user)
|
/obj/item/weapon/melee/fluffstuff/wolfgirlsword/activate(mob/living/user)
|
||||||
if(!active)
|
if(!active)
|
||||||
to_chat(user, "<span class='notice'>The [src] is now sharpened. It will cut!</span>")
|
to_chat(user, "<span class='notice'>The [src] is now sharpened. It will cut!</span>")
|
||||||
|
|
||||||
@@ -1896,7 +1896,7 @@
|
|||||||
damtype = BRUTE
|
damtype = BRUTE
|
||||||
|
|
||||||
|
|
||||||
/obj/item/weapon/melee/fluffstuff/awoosword/deactivate(mob/living/user)
|
/obj/item/weapon/melee/fluffstuff/wolfgirlsword/deactivate(mob/living/user)
|
||||||
if(active)
|
if(active)
|
||||||
to_chat(user, "<span class='notice'>The [src] grows dull!</span>")
|
to_chat(user, "<span class='notice'>The [src] grows dull!</span>")
|
||||||
..()
|
..()
|
||||||
@@ -1942,7 +1942,7 @@
|
|||||||
|
|
||||||
icon = 'icons/vore/custom_items_vr.dmi'
|
icon = 'icons/vore/custom_items_vr.dmi'
|
||||||
icon_state = "penlightlynn"
|
icon_state = "penlightlynn"
|
||||||
|
|
||||||
//Knightfall5:Ashley Kifer
|
//Knightfall5:Ashley Kifer
|
||||||
/obj/item/clothing/accessory/medal/nobel_science/fluff/ashley
|
/obj/item/clothing/accessory/medal/nobel_science/fluff/ashley
|
||||||
name = "nobel sciences award"
|
name = "nobel sciences award"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 186 KiB After Width: | Height: | Size: 186 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 194 KiB After Width: | Height: | Size: 194 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
@@ -2263,7 +2263,6 @@
|
|||||||
#include "code\modules\mob\living\simple_animal\slime\life.dm"
|
#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\slime.dm"
|
||||||
#include "code\modules\mob\living\simple_animal\slime\subtypes.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\bee.dm"
|
||||||
#include "code\modules\mob\living\simple_animal\vore\carp.dm"
|
#include "code\modules\mob\living\simple_animal\vore\carp.dm"
|
||||||
#include "code\modules\mob\living\simple_animal\vore\catgirl.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.dm"
|
||||||
#include "code\modules\mob\living\simple_animal\vore\solargrub_larva.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\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\zz_vore_overrides.dm"
|
||||||
#include "code\modules\mob\living\simple_animal\vore\shadekin\_defines.dm"
|
#include "code\modules\mob\living\simple_animal\vore\shadekin\_defines.dm"
|
||||||
#include "code\modules\mob\living\simple_animal\vore\shadekin\ability_objects.dm"
|
#include "code\modules\mob\living\simple_animal\vore\shadekin\ability_objects.dm"
|
||||||
|
|||||||