cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parrots now pick up any item you can fit in your pocket (w_class <= 2)

Browse Source 
Regular parrots now spawn with a random headset.

Fixed a typo in the regular parrot's description.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4938 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-10-23 01:43:04 +00:00
parent 38e4b2e059
commit c932037fba
1 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
code/modules/mob/living/simple_animal/parrot.dm
View File

@@ -27,7 +27,7 @@
/mob/living/simple_animal/parrot /mob/living/simple_animal/parrot
name = "\improper Parrot" name = "\improper Parrot"
desc = "The parrot squacks, \"It's a Parrot! BAWWK!\"" desc = "The parrot squaks, \"It's a Parrot! BAWWK!\""
icon = 'icons/mob/animal.dmi' icon = 'icons/mob/animal.dmi'
icon_state = "parrot_fly" icon_state = "parrot_fly"
icon_living = "parrot_fly" icon_living = "parrot_fly"
@@ -78,28 +78,28 @@
/obj/machinery/suit_storage_unit, /obj/machinery/telecomms, \ /obj/machinery/suit_storage_unit, /obj/machinery/telecomms, \
/obj/machinery/teleport) /obj/machinery/teleport)
//Parrots are kleptomaniacs. These vars a used for just that.. holding items and storing a list of items the parrot wants to steal. //Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
var/obj/item/held_item = null var/obj/item/held_item = null
var/list/desired_items = list(/obj/item/weapon/reagent_containers/food/snacks/cracker/, \
/obj/item/smallDelivery, /obj/item/weapon/gift, \
/obj/item/weapon/soap, /obj/item/toy, \
/obj/item/weapon/coin, /obj/item/weapon/stamp, \
/obj/item/weapon/grenade, /obj/item/device/radio/headset, \
/obj/item/device/flash, /obj/item/device/soulstone, \
/obj/item/device/assembly, /obj/item/weapon/bananapeel, \
/obj/item/weapon/book, /obj/item/weapon/caution, \
/obj/item/weapon/cigpacket, /obj/item/weapon/handcuffs,\
/obj/item/weapon/pen, /obj/item/weapon/pinpointer)
/mob/living/simple_animal/parrot/New() /mob/living/simple_animal/parrot/New()
..() ..()
if(!ears)
var/headset = pick(/obj/item/device/radio/headset/headset_sec, \
/obj/item/device/radio/headset/headset_eng, \
/obj/item/device/radio/headset/headset_med, \
/obj/item/device/radio/headset/headset_sci, \
/obj/item/device/radio/headset/heads/qm)
ears = new headset(src)
parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var
verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \ verbs.Add(/mob/living/simple_animal/parrot/proc/steal_from_ground, \
/mob/living/simple_animal/parrot/proc/steal_from_mob, \ /mob/living/simple_animal/parrot/proc/steal_from_mob, \
/mob/living/simple_animal/parrot/verb/drop_held_item_player, \ /mob/living/simple_animal/parrot/verb/drop_held_item_player, \
/mob/living/simple_animal/parrot/proc/perch_player) /mob/living/simple_animal/parrot/proc/perch_player)
/mob/living/simple_animal/parrot/Die() /mob/living/simple_animal/parrot/Die()
if(held_item) if(held_item)
held_item.loc = src.loc held_item.loc = src.loc
@@ -518,17 +518,19 @@
/mob/living/simple_animal/parrot/proc/search_for_item() /mob/living/simple_animal/parrot/proc/search_for_item()
for(var/atom/movable/AM in view(src)) for(var/atom/movable/AM in view(src))
for(var/path in desired_items) //Skip items we already stole or are wearing or are too big
if(parrot_perch && AM.loc == parrot_perch.loc || AM.loc == src) //Skip items we already stole or are wearing if(parrot_perch && AM.loc == parrot_perch.loc || AM.loc == src)
continue continue
if(istype(AM, path)) if(istype(AM, /obj/item))
return AM var/obj/item/I = AM
if(I.w_class < 2)
return I
if(iscarbon(AM)) if(iscarbon(AM))
var/mob/living/carbon/C = AM var/mob/living/carbon/C = AM
if(istype(C.l_hand, path) || istype(C.r_hand, path)) if(C.l_hand.w_class <= 2 || C.r_hand.w_class <= 2)
return C return C
return null return null
/mob/living/simple_animal/parrot/proc/search_for_perch() /mob/living/simple_animal/parrot/proc/search_for_perch()
@@ -545,17 +547,19 @@
if(istype(AM, perch_path)) if(istype(AM, perch_path))
return AM return AM
for(var/item_path in desired_items) //Skip items we already stole or are wearing or are too big
if(parrot_perch && AM.loc == parrot_perch.loc || AM.loc == src) //Skip items we already stole or are wearing if(parrot_perch && AM.loc == parrot_perch.loc || AM.loc == src)
continue continue
if(istype(AM, item_path)) if(istype(AM, /obj/item))
var/obj/item/I = AM
if(I.w_class <= 2)
return I
if(iscarbon(AM))
var/mob/living/carbon/C = AM
if(C.l_hand.w_class <= 2 || C.r_hand.w_class <= 2)
return AM return AM
if(iscarbon(AM))
var/mob/living/carbon/C = AM
if(istype(C.l_hand, item_path) || istype(C.r_hand, item_path))
return AM
return null return null
@@ -575,18 +579,17 @@
return 1 return 1
for(var/obj/item/I in view(1,src)) for(var/obj/item/I in view(1,src))
for(var/path in desired_items) //Make sure we're not already holding it and it's small enough
//Make sure it's the proper item and we're not holding it if(I.loc != src && I.w_class <= 2)
if(istype(I, path) && I.loc != src)
//If we have a perch and the item is sitting on it, continue //If we have a perch and the item is sitting on it, continue
if(!client && parrot_perch && I.loc == parrot_perch) if(!client && parrot_perch && I.loc == parrot_perch)
continue continue
held_item = I held_item = I
I.loc = src I.loc = src
visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
return held_item return held_item
src << "\red There is nothing of interest to take." src << "\red There is nothing of interest to take."
return 0 return 0
@@ -606,19 +609,18 @@
var/obj/item/stolen_item = null var/obj/item/stolen_item = null
for(var/mob/living/carbon/C in view(1,src)) for(var/mob/living/carbon/C in view(1,src))
for(var/path in desired_items) if(C.l_hand.w_class <= 2)
if(istype(C.l_hand, path)) stolen_item = C.l_hand
stolen_item = C.l_hand
if(istype(C.r_hand, path)) if(C.r_hand.w_class > 2)
stolen_item = C.r_hand stolen_item = C.r_hand
if(stolen_item) if(stolen_item)
C.u_equip(stolen_item) C.u_equip(stolen_item)
held_item = stolen_item held_item = stolen_item
stolen_item.loc = src stolen_item.loc = src
visible_message("[src] grabs the [held_item] out of [C]'s hand!", "\blue You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") visible_message("[src] grabs the [held_item] out of [C]'s hand!", "\blue You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
return held_item return held_item
src << "\red There is nothing of interest to take." src << "\red There is nothing of interest to take."
return 0 return 0