Fixes compile issues with vore code (#362)

* Fixes compile issues with vore code

* Update voreconstants.dm

* Update resize_vr.dm

* Update tgstation.dme

* Update parrot.dm

* Update pet.dm

* Update fox.dm

* Update mouse.dm

* Update farm_animals.dm

* Update dog.dm

* Update cat.dm

* Update monkey.dm

* Update alien.dm

* Update vore_vr.dm

* Update vorepanel_vr.dm

* Update bellymodes_vr.dm

* Update belly_vr.dm

* Update living_vr.dm

* Update voreconstants.dm

* Update fox.dm
This commit is contained in:
Poojawa
2017-04-14 19:39:08 -05:00
committed by GitHub
parent 412b8da82e
commit 884fb45516
18 changed files with 187 additions and 171 deletions
@@ -29,6 +29,7 @@
var/leaping = 0
gib_type = /obj/effect/decal/cleanable/xenoblood/xgibs
unique_name = 1
devourable = TRUE
var/static/regex/alien_name_regex = new("alien (larva|sentinel|drone|hunter|praetorian|queen)( \\(\\d+\\))?")
@@ -14,6 +14,7 @@
unique_name = 1
bodyparts = list(/obj/item/bodypart/chest/monkey, /obj/item/bodypart/head/monkey, /obj/item/bodypart/l_arm/monkey,
/obj/item/bodypart/r_arm/monkey, /obj/item/bodypart/r_leg/monkey, /obj/item/bodypart/l_leg/monkey)
devourable = TRUE
@@ -29,6 +29,7 @@
var/turns_since_scan = 0
var/mob/living/simple_animal/mouse/movement_target
gold_core_spawnable = 2
devourable = TRUE
/mob/living/simple_animal/pet/cat/Initialize()
..()
@@ -12,6 +12,7 @@
see_in_dark = 5
speak_chance = 1
turns_per_move = 10
devourable = TRUE
//Corgis and pugs are now under one dog subtype
@@ -28,6 +28,7 @@
stop_automated_movement_when_pulled = 1
blood_volume = BLOOD_VOLUME_NORMAL
var/obj/item/udder/udder = null
devourable = TRUE
/mob/living/simple_animal/hostile/retaliate/goat/Initialize()
udder = new()
@@ -105,6 +106,7 @@
var/obj/item/udder/udder = null
gold_core_spawnable = 2
blood_volume = BLOOD_VOLUME_NORMAL
devourable = TRUE
/mob/living/simple_animal/cow/Initialize()
udder = new()
@@ -180,6 +182,7 @@
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
gold_core_spawnable = 2
devourable = TRUE
/mob/living/simple_animal/chick/Initialize()
..()
@@ -235,6 +238,7 @@
var/list/validColors = list("brown","black","white")
gold_core_spawnable = 2
var/static/chicken_count = 0
devourable = TRUE
/mob/living/simple_animal/chicken/Initialize()
..()
@@ -18,6 +18,46 @@
response_disarm = "gently pushes aside"
response_harm = "kicks"
gold_core_spawnable = 2
devourable = TRUE
var/mob/living/simple_animal/mouse/movement_target
var/turns_since_scan = 0
/mob/living/simple_animal/pet/fox/Life()
//MICE!
if((src.loc) && isturf(src.loc))
if(!stat && !resting && !buckled)
for(var/mob/living/simple_animal/mouse/M in view(1,src))
if(!M.stat && Adjacent(M))
emote("me", 1, "splats \the [M]!")
M.splat()
movement_target = null
stop_automated_movement = 0
break
for(var/obj/item/toy/cattoy/T in view(1,src))
if (T.cooldown < (world.time - 400))
emote("me", 1, "bats \the [T] around with its paw!")
T.cooldown = world.time
..()
if(!stat && !resting && !buckled)
turns_since_scan++
if(turns_since_scan > 5)
walk_to(src,0)
turns_since_scan = 0
if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
movement_target = null
stop_automated_movement = 0
if( !movement_target || !(movement_target.loc in oview(src, 3)) )
movement_target = null
stop_automated_movement = 0
for(var/mob/living/simple_animal/mouse/snack in oview(src,3))
if(isturf(snack.loc) && !snack.stat)
movement_target = snack
break
if(movement_target)
stop_automated_movement = 1
walk_to(src,movement_target,0,3)
//Captain fox
/mob/living/simple_animal/pet/fox/Renault
@@ -24,6 +24,7 @@
var/body_color //brown, gray and white, leave blank for random
gold_core_spawnable = 2
var/chew_probability = 1
devourable = TRUE
/mob/living/simple_animal/mouse/Initialize()
..()
@@ -5,6 +5,7 @@
var/image/collar = null
var/image/pettag = null
blood_volume = BLOOD_VOLUME_NORMAL
devourable = TRUE
/mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar)
@@ -59,6 +59,7 @@
mob_size = MOB_SIZE_SMALL
movement_type = FLYING
gold_core_spawnable = 2
devourable = TRUE
var/parrot_damage_upper = 10
var/parrot_state = PARROT_WANDER //Hunt for a perch when created