shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update parrot.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-30 14:18:02 -05:00
committed by GitHub
parent c14fd6741c
commit d4cdba3297
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/parrot.dm
-4
View File
@@ -1003,9 +1003,6 @@
loc = H
H.ContractDisease(P)
parrot_interest = null
<<<<<<< HEAD
H.visible_message("<span class='danger'>[src] dive bombs into [H]'s chest and vanishes!</span>", "<span class='userdanger'>[src] dive bombs into your chest, vanishing! This can't be good!</span>")
=======
H.visible_message("<span class='danger'>[src] dive bombs into [H]'s chest and vanishes!</span>", "<span class='userdanger'>[src] dive bombs into your chest, vanishing! This can't be good!</span>")
@@ -1026,4 +1023,3 @@
/mob/living/simple_animal/parrot/clock_hawk/ratvar_act()
return
>>>>>>> 60d3ce5... Adds Nars-Ian and clock hawks (#30856)