From 2ec1b145fe505b3feff28d75312282867d927687 Mon Sep 17 00:00:00 2001 From: Incoming Date: Thu, 18 Feb 2016 02:42:19 -0500 Subject: [PATCH 1/3] Adds the new pun pun to the maps --- _maps/map_files/AsteroidStation/AsteroidStation.dmm | 2 +- _maps/map_files/BirdStation/BirdStation.dmm | 2 +- _maps/map_files/DreamStation/dreamstation04.dmm | 2 +- _maps/map_files/EfficiencyStation/EfficiencyStation.dmm | 2 +- _maps/map_files/MetaStation/MetaStation.v41I.dmm | 2 +- _maps/map_files/MiniStation/MiniStation.dmm | 2 +- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 9d88ebd560a..acccb45ea4f 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -2796,7 +2796,7 @@ "bbO" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "neutral"; dir = 4},/area/hallway/primary/starboard{name = "Starboard Hallway"}) "bbP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bbQ" = (/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bbR" = (/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"bbR" = (/mob/living/carbon/monkey/punpun,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bbS" = (/obj/machinery/door/airlock/glass{desc = "The workplace of the diligent station chef, with enough ingredients to work up a masterpiece."; name = "Kitchen"; req_access_txt = "0"; req_one_access_txt = "25, 28"},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bbT" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bbU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/wood,/area/lawoffice) diff --git a/_maps/map_files/BirdStation/BirdStation.dmm b/_maps/map_files/BirdStation/BirdStation.dmm index 116be8cf121..9605ce4e6a1 100644 --- a/_maps/map_files/BirdStation/BirdStation.dmm +++ b/_maps/map_files/BirdStation/BirdStation.dmm @@ -1693,7 +1693,7 @@ "aGC" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/plasteel/whitegreen/side{icon_state = "whitegreen"; dir = 6},/area/hydroponics) "aGD" = (/obj/structure/cable/cyan{icon_state = "1-2"},/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "aGE" = (/obj/structure/table/wood,/turf/simulated/floor/wood,/area/crew_quarters/bar{name = "\improper Bar and Kitchen"}) -"aGF" = (/mob/living/carbon/monkey{name = "Pun Pun"; unique_name = 0},/turf/simulated/floor/wood,/area/crew_quarters/bar{name = "\improper Bar and Kitchen"}) +"aGF" = (/mob/living/carbon/monkey/punpun,/turf/simulated/floor/wood,/area/crew_quarters/bar{name = "\improper Bar and Kitchen"}) "aGG" = (/obj/structure/disposalpipe/segment,/obj/machinery/light,/obj/machinery/door/poddoor/shutters/preopen{id = "kitchen shutter"; name = "kitchen shutter"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/bar{name = "\improper Bar and Kitchen"}) "aGH" = (/obj/effect/landmark/start{name = "Cook"},/turf/simulated/floor/plasteel/white,/area/crew_quarters/bar{name = "\improper Bar and Kitchen"}) "aGI" = (/obj/machinery/power/apc{name = "Bar and Kitchen APC"; pixel_y = -24},/obj/structure/cable/cyan{icon_state = "0-4"},/turf/simulated/floor/plasteel/white,/area/crew_quarters/bar{name = "\improper Bar and Kitchen"}) diff --git a/_maps/map_files/DreamStation/dreamstation04.dmm b/_maps/map_files/DreamStation/dreamstation04.dmm index d307573ada5..4e97cf0c576 100644 --- a/_maps/map_files/DreamStation/dreamstation04.dmm +++ b/_maps/map_files/DreamStation/dreamstation04.dmm @@ -4091,7 +4091,7 @@ "bAI" = (/obj/machinery/smartfridge,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel/cafeteria,/area/crew_quarters/kitchen) "bAJ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/camera{c_tag = "Bar West"; dir = 4; icon_state = "camera"; network = list("SS13"); tag = ""},/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_x = -25; pixel_y = -2; tag = "WEST"},/turf/simulated/floor/plasteel/bar,/area/crew_quarters/bar) "bAK" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/turf/simulated/floor/plasteel/bar,/area/crew_quarters/bar) -"bAL" = (/obj/machinery/light{dir = 4},/obj/machinery/camera{c_tag = "Bar East"; dir = 8; icon_state = "camera"; network = list("SS13"); tag = ""},/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel/bar,/area/crew_quarters/bar) +"bAL" = (/obj/machinery/light{dir = 4},/obj/machinery/camera{c_tag = "Bar East"; dir = 8; icon_state = "camera"; network = list("SS13"); tag = ""},/mob/living/carbon/monkey/punpun,/turf/simulated/floor/plasteel/bar,/area/crew_quarters/bar) "bAM" = (/obj/machinery/atmospherics/components/unary/vent_pump{dir = 1; on = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel/darkwarning{tag = "icon-warndark (EAST)"; icon_state = "warndark"; dir = 4},/area/engine/gravity_generator) "bAN" = (/turf/simulated/floor/plasteel{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/engine/gravity_generator) "bAO" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 1; layer = 2.4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/airalarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plasteel/darkwarning{tag = "icon-warndark (WEST)"; icon_state = "warndark"; dir = 8},/area/engine/gravity_generator) diff --git a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm index 18fa19bea26..b09b229d724 100644 --- a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm +++ b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm @@ -3110,7 +3110,7 @@ "bhP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bhQ" = (/obj/structure/sink/kitchen{pixel_y = 28},/obj/machinery/camera{c_tag = "Kitchen"},/turf/simulated/floor/plasteel{icon_state = "cafeteria"},/area/crew_quarters/kitchen) "bhR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/wood,/area/crew_quarters/theatre) -"bhS" = (/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/bar{name = "\improper Maltese Falcon"}) +"bhS" = (/mob/living/carbon/monkey/punpun,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/bar{name = "\improper Maltese Falcon"}) "bhT" = (/obj/structure/bookcase/random/reference,/turf/simulated/floor/wood,/area/library) "bhU" = (/obj/structure/bookcase/random/fiction,/turf/simulated/floor/wood,/area/library) "bhV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/components/unary/vent_pump{dir = 8; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood,/area/crew_quarters/theatre) diff --git a/_maps/map_files/MetaStation/MetaStation.v41I.dmm b/_maps/map_files/MetaStation/MetaStation.v41I.dmm index 920bea2ac79..ad2a60b84bd 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41I.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41I.dmm @@ -4083,7 +4083,7 @@ "bAA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/hallway/primary/central) "bAB" = (/obj/machinery/porta_turret/ai{dir = 2},/obj/machinery/flasher{id = "AI"; pixel_x = 0; pixel_y = 24},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/turret_protected/ai) "bAC" = (/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) -"bAD" = (/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"bAD" = (/mob/living/carbon/monkey/punpun,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bAE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/landmark/start{name = "Bartender"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bAF" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock{name = "Bar Access"; req_access_txt = "25"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bAG" = (/turf/simulated/floor/wood,/area/crew_quarters/bar) diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index 231c1946603..bd29d4a7645 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -1064,7 +1064,7 @@ "ux" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "uy" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/carpet,/area/crew_quarters/bar) "uz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) -"uA" = (/obj/machinery/requests_console{department = "Bar"; departmentType = 2; pixel_x = 30; pixel_y = 0},/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) +"uA" = (/obj/machinery/requests_console{department = "Bar"; departmentType = 2; pixel_x = 30; pixel_y = 0},/mob/living/carbon/monkey/punpun,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) "uB" = (/obj/machinery/hydroponics/soil,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 1},/area/hallway/primary/central) "uC" = (/obj/machinery/hydroponics/soil,/obj/item/weapon/hatchet,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 1},/area/hallway/primary/central) "uD" = (/obj/machinery/hydroponics/soil,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 1},/area/hallway/primary/central) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 05893ad3629..0caee819b9b 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -2317,7 +2317,7 @@ "aSC" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "greencorner"},/area/bridge) "aSD" = (/obj/structure/bed/chair{dir = 1; name = "Crew Station"},/turf/simulated/floor/plasteel,/area/bridge) "aSE" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/plasteel,/area/bridge) -"aSF" = (/mob/living/carbon/monkey{name = "Pun Pun"; real_name = "Pun Pun"; unique_name = 0},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) +"aSF" = (/mob/living/carbon/monkey/punpun,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aSG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aSH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "aSI" = (/obj/machinery/door/airlock/glass{name = "Kitchen"; req_access_txt = "28"},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/kitchen) From dd8b4f5568e19733c81a1578b66595770ed1de90 Mon Sep 17 00:00:00 2001 From: Incoming Date: Thu, 18 Feb 2016 12:08:45 -0500 Subject: [PATCH 2/3] Adds a bunch of ape names from the forum/previous pull. Adds a rare pet list for some of the most supreme of meme names. --- code/modules/mob/living/carbon/monkey/punpun.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm index 737351d8f27..7e0ef1fdcda 100644 --- a/code/modules/mob/living/carbon/monkey/punpun.dm +++ b/code/modules/mob/living/carbon/monkey/punpun.dm @@ -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") + 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) ..() From 611248a4f8fcb10188da646624ad865193b89278 Mon Sep 17 00:00:00 2001 From: Incoming5643 Date: Thu, 18 Feb 2016 18:27:35 -0500 Subject: [PATCH 3/3] Fixes Travis --- code/modules/mob/living/carbon/monkey/punpun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm index 7e0ef1fdcda..2c0f533f3b1 100644 --- a/code/modules/mob/living/carbon/monkey/punpun.dm +++ b/code/modules/mob/living/carbon/monkey/punpun.dm @@ -6,7 +6,7 @@ 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", "George", "Darwin", "Aldo", "Caeser", "Kanzi", "Kong", "Terk", "Grodd", "Mala", "Bojangles", "Coco", "Able", "Baker", "Scatter") + 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() @@ -66,4 +66,4 @@ else S["relic_mask"] << null if(!dead) - memory_saved = 1 \ No newline at end of file + memory_saved = 1