mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
-New chicken sprites! Other minor tweaks to chicken code, slows them down some and notches the lay rate back a bit.
-Fixes invisible cane inhands. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5595 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -147,7 +147,7 @@
|
|||||||
desc = "A cane used by a true gentlemen. Or a clown."
|
desc = "A cane used by a true gentlemen. Or a clown."
|
||||||
icon = 'icons/obj/weapons.dmi'
|
icon = 'icons/obj/weapons.dmi'
|
||||||
icon_state = "cane"
|
icon_state = "cane"
|
||||||
item_state = "cane"
|
item_state = "stick"
|
||||||
flags = FPRINT | TABLEPASS| CONDUCT
|
flags = FPRINT | TABLEPASS| CONDUCT
|
||||||
force = 5.0
|
force = 5.0
|
||||||
throwforce = 7.0
|
throwforce = 7.0
|
||||||
|
|||||||
@@ -155,9 +155,9 @@
|
|||||||
speak = list("Cherp.","Cherp?","Chirrup.","Cheep!")
|
speak = list("Cherp.","Cherp?","Chirrup.","Cheep!")
|
||||||
speak_emote = list("cheeps")
|
speak_emote = list("cheeps")
|
||||||
emote_hear = list("cheeps")
|
emote_hear = list("cheeps")
|
||||||
emote_see = list("pecks at the ground","flaps it's tiny wings")
|
emote_see = list("pecks at the ground","flaps its tiny wings")
|
||||||
speak_chance = 2
|
speak_chance = 2
|
||||||
turns_per_move = 1
|
turns_per_move = 2
|
||||||
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
|
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
|
||||||
meat_amount = 1
|
meat_amount = 1
|
||||||
response_help = "pets the"
|
response_help = "pets the"
|
||||||
@@ -195,9 +195,9 @@ var/global/chicken_count = 0
|
|||||||
speak = list("Cluck!","BWAAAAARK BWAK BWAK BWAK!","Bwaak bwak.")
|
speak = list("Cluck!","BWAAAAARK BWAK BWAK BWAK!","Bwaak bwak.")
|
||||||
speak_emote = list("clucks","croons")
|
speak_emote = list("clucks","croons")
|
||||||
emote_hear = list("clucks")
|
emote_hear = list("clucks")
|
||||||
emote_see = list("pecks at the ground","flaps it's wings viciously")
|
emote_see = list("pecks at the ground","flaps its wings viciously")
|
||||||
speak_chance = 2
|
speak_chance = 2
|
||||||
turns_per_move = 1
|
turns_per_move = 3
|
||||||
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
|
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
|
||||||
meat_amount = 2
|
meat_amount = 2
|
||||||
response_help = "pets the"
|
response_help = "pets the"
|
||||||
@@ -206,10 +206,16 @@ var/global/chicken_count = 0
|
|||||||
attacktext = "kicks"
|
attacktext = "kicks"
|
||||||
health = 10
|
health = 10
|
||||||
var/eggsleft = 0
|
var/eggsleft = 0
|
||||||
|
var/color
|
||||||
pass_flags = PASSTABLE
|
pass_flags = PASSTABLE
|
||||||
|
|
||||||
/mob/living/simple_animal/chicken/New()
|
/mob/living/simple_animal/chicken/New()
|
||||||
..()
|
..()
|
||||||
|
if(!color)
|
||||||
|
color = pick( list("brown","black","white") )
|
||||||
|
icon_state = "chicken_[color]"
|
||||||
|
icon_living = "chicken_[color]"
|
||||||
|
icon_dead = "chicken_[color]_dead"
|
||||||
pixel_x = rand(-6, 6)
|
pixel_x = rand(-6, 6)
|
||||||
pixel_y = rand(0, 10)
|
pixel_y = rand(0, 10)
|
||||||
chicken_count += 1
|
chicken_count += 1
|
||||||
@@ -220,8 +226,9 @@ var/global/chicken_count = 0
|
|||||||
|
|
||||||
/mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
/mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
|
||||||
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) //feedin' dem chickens
|
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) //feedin' dem chickens
|
||||||
if(!stat && eggsleft < 10)
|
if(!stat && eggsleft < 8)
|
||||||
user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","You feed [O] to [name]! It clucks happily.")
|
user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
|
||||||
|
user.drop_item()
|
||||||
del(O)
|
del(O)
|
||||||
eggsleft += rand(1, 4)
|
eggsleft += rand(1, 4)
|
||||||
//world << eggsleft
|
//world << eggsleft
|
||||||
@@ -234,7 +241,7 @@ var/global/chicken_count = 0
|
|||||||
. =..()
|
. =..()
|
||||||
if(!.)
|
if(!.)
|
||||||
return
|
return
|
||||||
if(!stat && prob(5) && eggsleft > 0)
|
if(!stat && prob(3) && eggsleft > 0)
|
||||||
visible_message("[src] [pick("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")]")
|
visible_message("[src] [pick("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")]")
|
||||||
eggsleft--
|
eggsleft--
|
||||||
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = new(get_turf(src))
|
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = new(get_turf(src))
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 153 KiB After Width: | Height: | Size: 157 KiB |
Reference in New Issue
Block a user