mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-23 12:06:22 +01:00
Parrot adjustments. (#4350)
* Parrot adjustments. * Adds galactic common to languages. * Update parrot.dm * Update parrot.dm * fixes
This commit is contained in:
@@ -29,8 +29,8 @@
|
||||
|
||||
|
||||
/mob/living/simple_animal/parrot
|
||||
name = "\improper Parrot"
|
||||
desc = "The parrot squaks, \"It's a Parrot! BAWWK!\""
|
||||
name = "parrot"
|
||||
desc = "The parrot squawks, \"It's a parrot! BAWWK!\""
|
||||
icon = 'icons/mob/animal.dmi'
|
||||
icon_state = "parrot_fly"
|
||||
icon_living = "parrot_fly"
|
||||
@@ -47,9 +47,9 @@
|
||||
stop_automated_movement = 1
|
||||
universal_speak = 1
|
||||
|
||||
has_langs = list("Bird")
|
||||
has_langs = list("Bird", "Galactic Common")
|
||||
speak_chance = 2
|
||||
speak = list("Hi","Hello!","Cracker?","BAWWWWK george mellons griffing me")
|
||||
speak = list("Hi","Hello!","Cracker?","Bawk!")
|
||||
speak_emote = list("squawks","says","yells")
|
||||
emote_hear = list("squawks","bawks")
|
||||
emote_see = list("flutters its wings")
|
||||
@@ -160,19 +160,19 @@
|
||||
if(copytext(possible_phrase,1,3) in department_radio_keys)
|
||||
possible_phrase = copytext(possible_phrase,3,length(possible_phrase))
|
||||
else
|
||||
usr << "<font color='red'>There is nothing to remove from its [remove_from].</font>"
|
||||
to_chat(usr, "<font color='red'>There is nothing to remove from its [remove_from].</font>")
|
||||
return
|
||||
|
||||
//Adding things to inventory
|
||||
else if(href_list["add_inv"])
|
||||
var/add_to = href_list["add_inv"]
|
||||
if(!usr.get_active_hand())
|
||||
usr << "<font color='red'>You have nothing in your hand to put on its [add_to].</font>"
|
||||
to_chat(usr, "<font color='red'>You have nothing in your hand to put on its [add_to].</font>")
|
||||
return
|
||||
switch(add_to)
|
||||
if("ears")
|
||||
if(ears)
|
||||
usr << "<font color='red'>It's already wearing something.</font>"
|
||||
to_chat(usr, "<font color='red'>It's already wearing something.</font>")
|
||||
return
|
||||
else
|
||||
var/obj/item/item_to_add = usr.get_active_hand()
|
||||
@@ -180,7 +180,7 @@
|
||||
return
|
||||
|
||||
if( !istype(item_to_add, /obj/item/device/radio/headset) )
|
||||
usr << "<font color='red'>This object won't fit.</font>"
|
||||
to_chat(usr, "<font color='red'>This object won't fit.</font>")
|
||||
return
|
||||
|
||||
var/obj/item/device/radio/headset/headset_to_add = item_to_add
|
||||
@@ -188,7 +188,7 @@
|
||||
usr.drop_item()
|
||||
headset_to_add.forceMove(src)
|
||||
src.ears = headset_to_add
|
||||
usr << "You fit the headset onto [src]."
|
||||
to_chat(usr, "You fit the headset onto [src].")
|
||||
|
||||
clearlist(available_channels)
|
||||
for(var/ch in headset_to_add.channels)
|
||||
@@ -209,7 +209,7 @@
|
||||
available_channels.Add(":q")
|
||||
|
||||
if(headset_to_add.translate_binary)
|
||||
available_channels.Add(":b")
|
||||
available_channels.Add("#b")
|
||||
else
|
||||
..()
|
||||
|
||||
@@ -572,7 +572,7 @@
|
||||
return -1
|
||||
|
||||
if(held_item)
|
||||
src << "<font color='red'>You are already holding the [held_item]</font>"
|
||||
to_chat(src, "<font color='red'>You are already holding the [held_item]</font>")
|
||||
return 1
|
||||
|
||||
for(var/obj/item/I in view(1,src))
|
||||
@@ -588,7 +588,7 @@
|
||||
visible_message("[src] grabs the [held_item]!", "<font color='blue'>You grab the [held_item]!</font>", "You hear the sounds of wings flapping furiously.")
|
||||
return held_item
|
||||
|
||||
src << "<font color='red'>There is nothing of interest to take.</font>"
|
||||
to_chat(src, "<font color='red'>There is nothing of interest to take.</font>")
|
||||
return 0
|
||||
|
||||
/mob/living/simple_animal/parrot/proc/steal_from_mob()
|
||||
@@ -600,7 +600,7 @@
|
||||
return -1
|
||||
|
||||
if(held_item)
|
||||
src << "<font color='red'>You are already holding the [held_item]</font>"
|
||||
to_chat(src, "<font color='red'>You are already holding the [held_item]</font>")
|
||||
return 1
|
||||
|
||||
var/obj/item/stolen_item = null
|
||||
@@ -619,7 +619,7 @@
|
||||
visible_message("[src] grabs the [held_item] out of [C]'s hand!", "<font color='blue'>You snag the [held_item] out of [C]'s hand!</font>", "You hear the sounds of wings flapping furiously.")
|
||||
return held_item
|
||||
|
||||
src << "<font color='red'>There is nothing of interest to take.</font>"
|
||||
to_chat(src, "<font color='red'>There is nothing of interest to take.</font>")
|
||||
return 0
|
||||
|
||||
/mob/living/simple_animal/parrot/verb/drop_held_item_player()
|
||||
@@ -643,7 +643,7 @@
|
||||
return -1
|
||||
|
||||
if(!held_item)
|
||||
usr << "<font color='red'>You have nothing to drop!</font>"
|
||||
to_chat(usr, "<font color='red'>You have nothing to drop!</font>")
|
||||
return 0
|
||||
|
||||
if(!drop_gently)
|
||||
@@ -651,11 +651,11 @@
|
||||
var/obj/item/weapon/grenade/G = held_item
|
||||
G.forceMove(src.loc)
|
||||
G.prime()
|
||||
src << "You let go of the [held_item]!"
|
||||
to_chat(src, "You let go of the [held_item]!")
|
||||
held_item = null
|
||||
return 1
|
||||
|
||||
src << "You drop the [held_item]."
|
||||
to_chat(src, "You drop the [held_item].")
|
||||
|
||||
held_item.forceMove(src.loc)
|
||||
held_item = null
|
||||
@@ -676,7 +676,7 @@
|
||||
src.forceMove(AM.loc)
|
||||
icon_state = "parrot_sit"
|
||||
return
|
||||
src << "<font color='red'>There is no perch nearby to sit on.</font>"
|
||||
to_chat(src, "<font color='red'>There is no perch nearby to sit on.</font>")
|
||||
return
|
||||
|
||||
/*
|
||||
@@ -760,4 +760,4 @@
|
||||
parrot_interest = user
|
||||
parrot_state = PARROT_SWOOP | PARROT_ATTACK //Attack other animals regardless
|
||||
icon_state = "parrot_fly"
|
||||
return success
|
||||
return success
|
||||
|
||||
Reference in New Issue
Block a user