diff --git a/code/modules/awaymissions/egg_event.dm b/code/modules/awaymissions/egg_event.dm new file mode 100644 index 00000000000..0740d594c55 --- /dev/null +++ b/code/modules/awaymissions/egg_event.dm @@ -0,0 +1,98 @@ +//Everything in this file is as it is intentionally and should not be messed with, removed, or changed. +/proc/egg_interdict(mob/living/to_teleport, turf/teleport_destination) + if(rand(1,1000) != 66) + return FALSE + if(!isturf(teleport_destination)) + return FALSE + if(!isliving(to_teleport)) + return FALSE + if(!to_teleport.ckey) + return FALSE + var/turf/egg_destination + for(var/obj/effect/landmark/egg_teleport/E in GLOB.landmarks_list) + if(!istype(E, /obj/effect/landmark/egg_teleport)) + continue + egg_destination = get_turf(E) + break + if(!egg_destination) + return FALSE + var/datum/modifier/egg_interdiction/our_modifier = to_teleport.add_modifier(/datum/modifier/egg_interdiction) //This modifier keeps track of where we were going so we can end up there when we leave the egg room + our_modifier.interdiction_destination = teleport_destination + to_teleport.forceMove(egg_destination) + return TRUE + +/datum/modifier/egg_interdiction + var/turf/interdiction_destination + +/datum/modifier/egg_interdiction/expire(silent) + interdiction_destination = null + ..() + +/obj/effect/landmark/egg_teleport + icon = 'icons/obj/food.dmi' + icon_state = "egg" + color = "#FDFFD1" + +/obj/effect/egg_returner + icon = 'icons/obj/food.dmi' + icon_state = "egg" + color = "#c23f71" + anchored = TRUE + unacidable = TRUE + simulated = FALSE + invisibility = INVISIBILITY_MAXIMUM + +/obj/effect/egg_returner/Crossed(O) + . = ..() + + if(!isliving(O)) + return + var/mob/living/L = O + var/datum/modifier/egg_interdiction/E = L.get_modifier_of_type(/datum/modifier/egg_interdiction) + if(E) + L.forceMove(E.interdiction_destination) + else + L.forceMove(get_turf(pick(GLOB.latejoin))) //If we somehow ended up here without the modifier that keeps track of where we came from then let's just go back to spawn + + E.expire() + +/area/egg_tree_zone + name = "Unregistered" + icon = 'icons/effects/effects.dmi' + icon_state = "glitch" + dynamic_lighting = FALSE + +/area/egg_tree_zone/man + enter_message = span_cult("(Well. There is a man here. He looks at you like you're a bit lost.)") //The spaces in this line are intentional. + var/list/visitors = list() + +/area/egg_tree_zone/man/Entered(mob/M) + if(!M.ckey) + return + if("[M.real_name] - [M.ckey]" in visitors) + return + . = ..() + if(isliving(M)) + var/mob/living/L = M + + var/obj/item/reagent_containers/food/snacks/egg/E = new(get_turf(L)) + if(L.put_in_any_hand_if_possible(E, TRUE)) + to_chat(L ,span_cult("(The man smiles and hands you what you've been looking for.)")) + to_chat(L ,span_boldannounce("* You got an egg.")) + visitors += "[L.real_name] - [L.ckey]" + else + to_chat(L ,span_cult("(The man looks at your hands... It looks like he has something he wants to give to you...)")) + +/obj/structure/flora/tree/egg_tree + icon = 'icons/obj/flora/egg_tree.dmi' + icon_state = "tree" + base_state = "tree" + pixel_x = -64 + mouse_opacity = FALSE + indestructable = TRUE + plane = MOB_PLANE + layer = MOB_LAYER + +/turf/unsimulated/white + icon = 'icons/effects/effects.dmi' + icon_state = "white" diff --git a/code/modules/awaymissions/redgate.dm b/code/modules/awaymissions/redgate.dm index 64d387d5aa6..20c6ae0fe1f 100644 --- a/code/modules/awaymissions/redgate.dm +++ b/code/modules/awaymissions/redgate.dm @@ -74,6 +74,8 @@ to_chat(M, span_notice("The redgate refused your pulled item.")) else playsound(src,'sound/effects/ominous-hum-2.ogg', 100,1) + if(egg_interdict(M, ourturf)) + return M.forceMove(ourturf) //Let's just do forcemove, I don't really want people teleporting to weird places if they have bluespace stuff else to_chat(M, span_notice("Something blocks your way.")) diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm index c6d7def9afb..9ce5323b38e 100644 --- a/code/modules/multiz/ladders.dm +++ b/code/modules/multiz/ladders.dm @@ -149,6 +149,8 @@ if(!A.CanPass(M, M.loc, 1.5, 0)) to_chat(M, span_notice("\The [A] is blocking \the [src].")) return FALSE + if(egg_interdict(M, T)) + return return M.forceMove(T) //VOREStation Edit - Fixes adminspawned ladders /obj/structure/ladder/CanPass(obj/mover, turf/source, height, airflow) diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index f8e80db5107..61f8f323ef2 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -130,6 +130,8 @@ if(prob(sendfailchance)) user.forceMove(pick(trange(24,user))) else + if(egg_interdict(user, ToTurf)) + return user.forceMove(ToTurf) var/vore_happened = FALSE if(can_dropnom && living_user.can_be_drop_pred) diff --git a/icons/obj/flora/egg_tree.dmi b/icons/obj/flora/egg_tree.dmi new file mode 100644 index 00000000000..1a697815a2f Binary files /dev/null and b/icons/obj/flora/egg_tree.dmi differ diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm index c1a84308aba..292fae59036 100644 --- a/maps/groundbase/gb-misc.dmm +++ b/maps/groundbase/gb-misc.dmm @@ -1512,6 +1512,14 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm3) +"eG" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + density = 1; + color = "#000000"; + opacity = 1 + }, +/area/egg_tree_zone) "eH" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2416,6 +2424,55 @@ /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm6) +"hG" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#000000" + }, +/area/egg_tree_zone) +"hH" = ( +/obj/effect/egg_returner, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#000000" + }, +/area/egg_tree_zone) +"hI" = ( +/obj/effect/egg_returner, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hJ" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hK" = ( +/obj/effect/landmark/egg_teleport, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hL" = ( +/obj/structure/flora/tree/egg_tree{ + pixel_x = -45; + pixel_y = -3 + }, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hM" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone/man) "hX" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/pirate, @@ -8859,23 +8916,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG ap ap ap @@ -9001,23 +9058,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -9143,23 +9200,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -9285,23 +9342,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -9427,23 +9484,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -9569,23 +9626,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -9711,23 +9768,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hJ +hJ +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -9853,23 +9910,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hM +hJ +hJ +hJ +hG +hG +hG +hG +hG +hG +hH +eG ap ap ap @@ -9995,23 +10052,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hM +hL +hJ +hJ +hJ +hJ +hK +hJ +hJ +hJ +hI +eG ap ap ap @@ -10137,23 +10194,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hM +hJ +hJ +hJ +hG +hG +hG +hG +hG +hG +hH +eG ap ap ap @@ -10279,23 +10336,23 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hJ +hJ +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -10421,23 +10478,23 @@ aI aI aI ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -10563,23 +10620,23 @@ lp lp lp xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -10705,23 +10762,23 @@ lp lp lp xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -10847,23 +10904,23 @@ lp lp lp xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -10989,23 +11046,23 @@ lp lp lp xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -11131,23 +11188,23 @@ lp lp lp xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG ap ap ap diff --git a/maps/stellar_delight/ship_misc.dmm b/maps/stellar_delight/ship_misc.dmm index b9f3819ad40..85d21cd8522 100644 --- a/maps/stellar_delight/ship_misc.dmm +++ b/maps/stellar_delight/ship_misc.dmm @@ -1512,6 +1512,14 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm3) +"eG" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + density = 1; + color = "#000000"; + opacity = 1 + }, +/area/egg_tree_zone) "eH" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2420,6 +2428,55 @@ /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm6) +"hG" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#000000" + }, +/area/egg_tree_zone) +"hH" = ( +/obj/effect/egg_returner, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#000000" + }, +/area/egg_tree_zone) +"hI" = ( +/obj/effect/egg_returner, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hJ" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hK" = ( +/obj/effect/landmark/egg_teleport, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hL" = ( +/obj/structure/flora/tree/egg_tree{ + pixel_x = -45; + pixel_y = -3 + }, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"hM" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone/man) "hX" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/pirate, @@ -20625,23 +20682,23 @@ Qh sj sj xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG ap ap ap @@ -20767,23 +20824,23 @@ oR sj sj xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -20909,23 +20966,23 @@ sj sj sj xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -21051,23 +21108,23 @@ sj sj sj xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -21193,23 +21250,23 @@ sj sj sj xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -21335,23 +21392,23 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -21477,23 +21534,23 @@ BV BV BV xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hJ +hJ +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -21619,23 +21676,23 @@ Dh JQ BV xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hM +hJ +hJ +hJ +hG +hG +hG +hG +hG +hG +hH +eG ap ap ap @@ -21761,23 +21818,23 @@ Yn wf BV xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hM +hL +hJ +hJ +hJ +hJ +hK +hJ +hJ +hJ +hI +eG ap ap ap @@ -21903,23 +21960,23 @@ Yn wf BV xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hM +hJ +hJ +hJ +hG +hG +hG +hG +hG +hG +hH +eG ap ap ap @@ -22045,23 +22102,23 @@ OU uh BV xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hJ +hJ +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -22187,23 +22244,23 @@ BV BV BV xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -22329,23 +22386,23 @@ BV BV BV xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -22471,23 +22528,23 @@ BV BV Xq xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -22613,23 +22670,23 @@ BV BV jS xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -22755,23 +22812,23 @@ BV BV fl xp -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +hG +eG ap ap ap @@ -22897,23 +22954,23 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG +eG ap ap ap diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 9d54050109c..aa2b15c2241 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -28,6 +28,14 @@ "ae" = ( /turf/unsimulated/mineral/virgo3b, /area/space) +"af" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + density = 1; + color = "#000000"; + opacity = 1 + }, +/area/egg_tree_zone) "ag" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -54,6 +62,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"ai" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#000000" + }, +/area/egg_tree_zone) "aj" = ( /obj/machinery/light{ dir = 1 @@ -579,6 +593,13 @@ /obj/effect/landmark/costume/elpresidente, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_game_room) +"bP" = ( +/obj/effect/egg_returner, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#000000" + }, +/area/egg_tree_zone) "bQ" = ( /turf/space/internal_edge/left, /area/space) @@ -1149,6 +1170,13 @@ /obj/structure/closet/alien, /turf/simulated/shuttle/floor/alien, /area/unknown/dorm6) +"dD" = ( +/obj/effect/egg_returner, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) "dE" = ( /turf/space/internal_edge/bottomright, /area/space) @@ -1594,12 +1622,41 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fg" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"fh" = ( +/obj/effect/landmark/egg_teleport, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) "fi" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) +"fj" = ( +/obj/structure/flora/tree/egg_tree{ + pixel_x = -45; + pixel_y = -3 + }, +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone) +"fk" = ( +/turf/unsimulated/white{ + mouse_opacity = 0; + color = "#b52d54" + }, +/area/egg_tree_zone/man) "fn" = ( /obj/structure/holostool, /obj/effect/floor_decal/carpet{ @@ -19449,23 +19506,23 @@ RT gD fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af ap ap ap @@ -19591,23 +19648,23 @@ gD gD fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -19733,23 +19790,23 @@ gD gD fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -19875,23 +19932,23 @@ gD xc fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -20017,23 +20074,23 @@ gD Fk fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -20159,23 +20216,23 @@ gD nI fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -20301,23 +20358,23 @@ aL aL ar ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +fg +fg +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -20443,23 +20500,23 @@ aI aI aI ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +fk +fg +fg +fg +ai +ai +ai +ai +ai +ai +bP +af ap ap ap @@ -20585,23 +20642,23 @@ hx hx hx fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +fk +fj +fg +fg +fg +fg +fh +fg +fg +fg +dD +af ap ap ap @@ -20727,23 +20784,23 @@ hy hJ hO fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +fk +fg +fg +fg +ai +ai +ai +ai +ai +ai +bP +af ap ap ap @@ -20869,23 +20926,23 @@ hz hK hP fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +fg +fg +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -21011,23 +21068,23 @@ hz hK hP fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -21153,23 +21210,23 @@ hA hL hQ fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -21295,23 +21352,23 @@ hx hx hx fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -21437,23 +21494,23 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -21579,23 +21636,23 @@ hB hD hD fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +ai +af ap ap ap @@ -21721,23 +21778,23 @@ hC hC hC fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af ap ap ap diff --git a/vorestation.dme b/vorestation.dme index 0a38cdff4fc..eacb3996f87 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2397,6 +2397,7 @@ #include "code\modules\autowiki\page\techweb.dm" #include "code\modules\awaymissions\bluespaceartillery.dm" #include "code\modules\awaymissions\corpse.dm" +#include "code\modules\awaymissions\egg_event.dm" #include "code\modules\awaymissions\exile.dm" #include "code\modules\awaymissions\gateway.dm" #include "code\modules\awaymissions\gateway_vr.dm"