From 83566cdbe3fb89c39755a3fb16cc40a199a0a663 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Tue, 19 Jan 2021 05:23:43 -0700 Subject: [PATCH] Update parrot.dm --- .../mob/living/simple_animal/parrot.dm | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 6e02944885..d146bb855f 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -83,6 +83,8 @@ //Headset for Poly to yell at engineers :) var/obj/item/radio/headset/ears = null + /// spawns with headset + var/spawns_with_headset = FALSE //The thing the parrot is currently interested in. This gets used for items the parrot wants to pick up, mobs it wants to steal from, //mobs it wants to attack or mobs that have attacked it @@ -105,13 +107,14 @@ /mob/living/simple_animal/parrot/Initialize() . = ..() - if(!ears) - var/headset = pick(/obj/item/radio/headset/headset_sec, \ - /obj/item/radio/headset/headset_eng, \ - /obj/item/radio/headset/headset_med, \ - /obj/item/radio/headset/headset_sci, \ - /obj/item/radio/headset/headset_cargo) - ears = new headset(src) + if(spawns_with_headset) + if(!ears) + var/headset = pick(/obj/item/radio/headset/headset_sec, \ + /obj/item/radio/headset/headset_eng, \ + /obj/item/radio/headset/headset_med, \ + /obj/item/radio/headset/headset_sci, \ + /obj/item/radio/headset/headset_cargo) + ears = new headset(src) parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var @@ -881,6 +884,7 @@ speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE") gold_core_spawnable = NO_SPAWN speak_chance = 3 + spawns_with_headset = TRUE var/memory_saved = FALSE var/rounds_survived = 0 var/longest_survival = 0 @@ -1189,4 +1193,4 @@ icon_state = "mtoo-flap" icon_living = "mtoo-flap" icon_dead = "mtoo-dead" - icon_sit = "mtoo_sit" \ No newline at end of file + icon_sit = "mtoo_sit"