From a94fedc7ce240e938dbdfdc9a4d880f5dc3f21b7 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 15 Feb 2021 17:10:03 +0100 Subject: [PATCH] [MIRROR] disabled DLC only content on arena shuttle (#3407) * Give bone keys to arena shuttle victors (#56376) Now that necropolis crates require bone keys to open, the Arena Shuttle will give any survivors from the arena a bone key to open a crate with. * disabled DLC only content on arena shuttle Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> --- _maps/shuttles/emergency_arena.dmm | 20 ++++++++++---------- code/modules/admin/fun_balloon.dm | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/_maps/shuttles/emergency_arena.dmm b/_maps/shuttles/emergency_arena.dmm index 4367047174d..9919a9d0cbd 100644 --- a/_maps/shuttles/emergency_arena.dmm +++ b/_maps/shuttles/emergency_arena.dmm @@ -44,10 +44,6 @@ }, /turf/open/indestructible/necropolis/air, /area/shuttle/escape/arena) -"p" = ( -/obj/structure/healingfountain, -/turf/open/indestructible/necropolis/air, -/area/shuttle/escape/arena) "z" = ( /obj/effect/landmark/shuttle_arena_safe, /turf/open/indestructible/necropolis/air, @@ -60,6 +56,10 @@ icon_state = "cult" }, /area/shuttle/escape/arena) +"V" = ( +/obj/structure/healingfountain, +/turf/open/indestructible/necropolis/air, +/area/shuttle/escape/arena) (1,1,1) = {" g @@ -130,7 +130,7 @@ j j j h -p +V g "} (4,1,1) = {" @@ -154,7 +154,7 @@ j m j j -p +V g "} (5,1,1) = {" @@ -178,7 +178,7 @@ j j j j -p +V g "} (6,1,1) = {" @@ -226,7 +226,7 @@ j j j j -p +V g "} (8,1,1) = {" @@ -250,7 +250,7 @@ j j j j -p +V g "} (9,1,1) = {" @@ -274,7 +274,7 @@ j m j j -p +V g "} (10,1,1) = {" diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index 5790c685681..17699ba1f19 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -141,6 +141,8 @@ to_chat(L, "The battle is won. Your bloodlust subsides.", confidential = TRUE) for(var/obj/item/chainsaw/doomslayer/chainsaw in L) qdel(chainsaw) + var/obj/item/skeleton_key/key = new(L) + L.put_in_hands(key) else to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.", confidential = TRUE)