From fea1dada3a0cedf297019960463bce6a54579fec Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Mon, 14 May 2018 22:31:05 -0700 Subject: [PATCH 1/2] Restore Pun Pun --- code/modules/mob/living/carbon/human/npcs.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index b66a0ee52ba..45de6634d61 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -5,9 +5,8 @@ item_color = "punpun" species_restricted = list("Monkey") -/mob/living/carbon/human/monkey/punpun/New() - ..() - spawn(1) - name = "Pun Pun" - real_name = name - equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform) \ No newline at end of file +/mob/living/carbon/human/monkey/punpun/Initialize(mapload) + ..(mapload, "Monkey") + name = "Pun Pun" + real_name = name + equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform) From 8a8f244d3fd1366382de17731ca9ed233eebce21 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Tue, 15 May 2018 01:15:27 -0700 Subject: [PATCH 2/2] Remove unneeded args --- code/modules/mob/living/carbon/human/npcs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index 45de6634d61..c21c1990cbe 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -6,7 +6,7 @@ species_restricted = list("Monkey") /mob/living/carbon/human/monkey/punpun/Initialize(mapload) - ..(mapload, "Monkey") + ..() name = "Pun Pun" real_name = name equip_to_slot(new /obj/item/clothing/under/punpun(src), slot_w_uniform)