cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Player Parrots can now sit on Human's shoulders.

Browse Source
This commit is contained in:
Remie Richards
2015-10-26 02:33:44 +00:00
parent ced3f83bf9
commit 234c3b76fb
1 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/parrot.dm
+43 -1
View File
@@ -112,7 +112,8 @@
/mob/living/simple_animal/parrot/proc/steal_from_mob, \
/mob/living/simple_animal/parrot/verb/drop_held_item_player, \
/mob/living/simple_animal/parrot/proc/perch_player, \
/mob/living/simple_animal/parrot/proc/toggle_mode)
/mob/living/simple_animal/parrot/proc/toggle_mode,
/mob/living/simple_animal/parrot/proc/perch_mob_player)
/mob/living/simple_animal/parrot/death(gibbed)
@@ -120,6 +121,13 @@
held_item.loc = src.loc
held_item = null
walk(src,0)
if(buckled)
buckled.buckled_mob = null
buckled = null
pixel_x = initial(pixel_x)
pixel_y = initial(pixel_y)
..(gibbed)
/mob/living/simple_animal/parrot/Stat()
@@ -787,6 +795,39 @@
src << "<span class='warning'>There is no perch nearby to sit on!</span>"
return
/mob/living/simple_animal/parrot/proc/perch_mob_player()
set name = "Sit on Human's Shoulder"
set category = "Parrot"
set desc = "Sit on a nice comfy human being!"
if(stat || !client)
return
if(icon_state == "parrot_fly")
for(var/mob/living/carbon/human/H in view(src,1))
loc = get_turf(H)
H.buckled_mob = src
buckled = H
pixel_y = 9
pixel_x = pick(-8,8) //pick left or right shoulder
icon_state = "parrot_sit"
parrot_state = PARROT_PERCH
src << "<span class='notice'>You sit on [H]'s shoulder.</span>"
return
src << "<span class='warning'>There is nobody nearby to sit on!</span>"
else
icon_state = "parrot_fly"
parrot_state = PARROT_WANDER
if(buckled)
src << "<span class='notice'>You are no longer sitting on [buckled]'s shoulder.</span>"
buckled.buckled_mob = null
buckled = null
pixel_x = initial(pixel_x)
pixel_y = initial(pixel_y)
/mob/living/simple_animal/parrot/proc/toggle_mode()
set name = "Toggle mode"
set category = "Parrot"
@@ -801,6 +842,7 @@
else
melee_damage_upper = parrot_damage_upper
a_intent = "harm"
src << "You will now [a_intent] others..."
return
/*