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

Merge pull request #14097 from Citadel-Station-13/silicons-patch-28

Browse Source 
i'm not sure why cargo's bird crate has every bird spawn with a headset but let's not have that
This commit is contained in:
Lin
2021-01-20 15:20:50 -06:00
committed by GitHub
parent f1f6e35804 83566cdbe3
commit d262f366e7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/parrot.dm
+11 -7
View File
@@ -83,6 +83,8 @@
//Headset for Poly to yell at engineers :) //Headset for Poly to yell at engineers :)
var/obj/item/radio/headset/ears = null 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, //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 //mobs it wants to attack or mobs that have attacked it
@@ -105,13 +107,14 @@
/mob/living/simple_animal/parrot/Initialize() /mob/living/simple_animal/parrot/Initialize()
. = ..() . = ..()
if(!ears) if(spawns_with_headset)
var/headset = pick(/obj/item/radio/headset/headset_sec, \ if(!ears)
/obj/item/radio/headset/headset_eng, \ var/headset = pick(/obj/item/radio/headset/headset_sec, \
/obj/item/radio/headset/headset_med, \ /obj/item/radio/headset/headset_eng, \
/obj/item/radio/headset/headset_sci, \ /obj/item/radio/headset/headset_med, \
/obj/item/radio/headset/headset_cargo) /obj/item/radio/headset/headset_sci, \
ears = new headset(src) /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 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") 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 gold_core_spawnable = NO_SPAWN
speak_chance = 3 speak_chance = 3
spawns_with_headset = TRUE
var/memory_saved = FALSE var/memory_saved = FALSE
var/rounds_survived = 0 var/rounds_survived = 0
var/longest_survival = 0 var/longest_survival = 0