diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm index 618dcd7a12e..d96bed7d685 100644 --- a/code/modules/mob/living/carbon/monkey/punpun.dm +++ b/code/modules/mob/living/carbon/monkey/punpun.dm @@ -1,13 +1,13 @@ /mob/living/carbon/monkey/punpun //except for a few special persistence features, pun pun is just a normal monkey name = "Pun Pun" //C A N O N unique_name = 0 + /// If we had one of the rare names in a past life var/ancestor_name + /// The number of times Pun Pun has died since he was last gibbed var/ancestor_chain = 1 var/relic_hat //Note: these two are paths var/relic_mask var/memory_saved = FALSE - var/list/pet_monkey_names = list("Pun Pun", "Bubbles", "Mojo", "George", "Darwin", "Aldo", "Caeser", "Kanzi", "Kong", "Terk", "Grodd", "Mala", "Bojangles", "Coco", "Able", "Baker", "Scatter", "Norbit", "Travis") - var/list/rare_pet_monkey_names = list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky") /mob/living/carbon/monkey/punpun/Initialize() Read_Memory() @@ -15,12 +15,10 @@ name = ancestor_name if(ancestor_chain > 1) name += " \Roman[ancestor_chain]" - else - if(prob(5)) - name = pick(rare_pet_monkey_names) - else - name = pick(pet_monkey_names) - gender = pick(MALE, FEMALE) + else if(prob(10)) + name = pick(list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky")) + if(name == "Furious George") + aggressive = TRUE // Furious George is PISSED . = ..() //These have to be after the parent new to ensure that the monkey