Merge pull request #15598 from Incoming5643/ape_escape_2

Adds the new pun pun to the maps
This commit is contained in:
duncathan salt
2016-02-19 04:09:18 -06:00
8 changed files with 14 additions and 10 deletions
@@ -6,7 +6,8 @@
var/relic_hat //Note: these two are paths
var/relic_mask
var/memory_saved = 0
var/list/pet_monkey_names = list("Pun Pun", "Bubbles", "Mojo", "Forever")
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/New()
Read_Memory()
@@ -19,7 +20,10 @@
if(ancestor_chain > 1)
name += " [num2roman(ancestor_chain)]"
else
name = pick(pet_monkey_names)
if(prob(5))
name = pick(rare_pet_monkey_names)
else
name = pick(pet_monkey_names)
gender = pick(MALE, FEMALE)
..()
@@ -62,4 +66,4 @@
else
S["relic_mask"] << null
if(!dead)
memory_saved = 1
memory_saved = 1