cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Poly grabs the colour macro!

Browse Source
This commit is contained in:
VampyrBytes
2016-06-26 21:32:14 +01:00
parent 3e6124adad
commit 108d6aaa40
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/parrot.dm
+12 -12
View File
@@ -165,18 +165,18 @@
ears = null
update_speak()
else
to_chat(usr, "\red There is nothing to remove from its [remove_from].")
to_chat(usr, "<span class='warning'>There is nothing to remove from its [remove_from].</span>")
return
show_inv(usr)
else if(href_list["add_inv"])
var/add_to = href_list["add_inv"]
if(!usr.get_active_hand())
to_chat(usr, "\red You have nothing in your hand to put on its [add_to].")
to_chat(usr, "<span class='warning'>You have nothing in your hand to put on its [add_to].</span>")
return
switch(add_to)
if("ears")
if(ears)
to_chat(usr, "\red It's already wearing something.")
to_chat(usr, "<span class='warning'>It's already wearing something.</span>")
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -184,7 +184,7 @@
return
if( !istype(item_to_add, /obj/item/device/radio/headset) )
to_chat(usr, "\red This object won't fit.")
to_chat(usr, "<span class='warning'>This object won't fit.</span>")
return
var/obj/item/device/radio/headset/headset_to_add = item_to_add
@@ -566,7 +566,7 @@
return -1
if(held_item)
to_chat(src, "\red You are already holding the [held_item]")
to_chat(src, "<span class='warning'>You are already holding the [held_item]</span>")
return 1
for(var/obj/item/I in view(1,src))
@@ -579,10 +579,10 @@
held_item = I
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]!", "<span class='notice'>You grab the [held_item]!</span>", "You hear the sounds of wings flapping furiously.")
return held_item
to_chat(src, "\red There is nothing of interest to take.")
to_chat(src, "<span class = 'warning'>There is nothing of interest to take.</span>")
return 0
/mob/living/simple_animal/parrot/proc/steal_from_mob()
@@ -594,7 +594,7 @@
return -1
if(held_item)
to_chat(src, "\red You are already holding the [held_item]")
to_chat(src, "<span class='warning'>You are already holding the [held_item]</span>")
return 1
var/obj/item/stolen_item = null
@@ -610,10 +610,10 @@
C.unEquip(stolen_item)
held_item = stolen_item
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!", "<span class='notice'>You snag the [held_item] out of [C]'s hand!</span>", "You hear the sounds of wings flapping furiously.")
return held_item
to_chat(src, "\red There is nothing of interest to take.")
to_chat(src, "<span class='warning'>There is nothing of interest to take.</span>")
return 0
/mob/living/simple_animal/parrot/verb/drop_held_item_player()
@@ -637,7 +637,7 @@
return -1
if(!held_item)
to_chat(usr, "\red You have nothing to drop!")
to_chat(usr, "<span class='warning'>You have nothing to drop!</span>")
return 0
if(!drop_gently)
@@ -670,7 +670,7 @@
src.loc = AM.loc
icon_state = "parrot_sit"
return
to_chat(src, "\red There is no perch nearby to sit on.")
to_chat(src, "<span class='warning'>There is no perch nearby to sit on.</span>")
return
/*