Merge pull request #2552 from Verkister/otieshitt

Small otie opdates.
This commit is contained in:
Spades
2017-12-14 08:57:39 -05:00
committed by GitHub
2 changed files with 35 additions and 7 deletions
@@ -104,9 +104,29 @@
loot_list = list(/obj/item/clothing/glasses/sunglasses/sechud,/obj/item/clothing/suit/armor/vest/alt)
vore_pounce_chance = 60 // Good boys don't do too much police brutality.
var/check_records = 1 // If true, arrests people without a record.
var/check_records = 0 // If true, arrests people without a record.
var/check_arrest = 1 // If true, arrests people who are set to arrest.
/mob/living/simple_animal/otie/friendly/security/phoron
name = "mutated guard otie"
desc = "An extra rare phoron resistant version of the VARMAcorp trained snowflake guard dogs."
icon_state = "sifguard"
icon_living = "sifguard"
icon_rest = "sifguard_rest"
icon_dead = "sifguard-dead"
melee_damage_lower = 10
melee_damage_upper = 25
// Lazy way of making sure this otie survives outside.
min_oxy = 0
max_oxy = 0
min_tox = 0
max_tox = 0
min_co2 = 0
max_co2 = 0
min_n2 = 0
max_n2 = 0
/mob/living/simple_animal/otie/PunchTarget()
if(istype(target_mob,/mob/living/simple_animal/mouse))
return EatTarget()
@@ -141,13 +161,21 @@
return found_atom
..()
/mob/living/simple_animal/otie/friendly/security/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims.
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut))
/mob/living/simple_animal/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims.
if(istype(O, /obj/item/weapon/reagent_containers/food))
qdel(O)
user << "<span class='notice'>The guard pup accepts your offer for their catch.</span>"
for(var/I in vore_organs)
var/datum/belly/B = vore_organs[I]
B.release_all_contents()
playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donut) && istype(src, /mob/living/simple_animal/otie/friendly/security))
user << "<span class='notice'>The guard pup accepts your offer for their catch.</span>"
for(var/I in vore_organs)
var/datum/belly/B = vore_organs[I]
B.release_all_contents()
return
if(prob(2)) //Small chance to get prey out from non-sec oties.
for(var/I in vore_organs)
var/datum/belly/B = vore_organs[I]
B.release_all_contents()
return
return
..()