From 0ba3f037f54403f5289df19f2c9de427bbbe8c34 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 30 Sep 2019 20:11:49 -0400 Subject: [PATCH 1/2] Minor Event Stuff --- code/global_vr.dm | 2 ++ code/modules/multiz/structures_vr.dm | 19 +++++++++++++++++++ maps/submaps/shelters/shelter_4.dmm | 11 ++++++++--- maps/tether/tether-10-colony.dmm | 10 ++++++++++ maps/tether/tether_shuttles.dm | 2 ++ 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/code/global_vr.dm b/code/global_vr.dm index 355bcf73783..0f3212ff7aa 100644 --- a/code/global_vr.dm +++ b/code/global_vr.dm @@ -10,6 +10,8 @@ var/list/shell_module_types = list( "Standard", "Service", "Clerical" ) +var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals + var/global/list/acceptable_fruit_types= list( "ambrosia", "apple", diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm index b66c148e3b7..833d4ef3460 100644 --- a/code/modules/multiz/structures_vr.dm +++ b/code/modules/multiz/structures_vr.dm @@ -55,3 +55,22 @@ do_noeffect_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0) else do_noeffect_teleport(M, target, 1) ///You will appear adjacent to the beacon + +/obj/structure/portal_gateway + name = "portal" + desc = "Looks unstable. Best to test it with the clown." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "portal" + density = 1 + unacidable = 1//Can't destroy energy portals. + anchored = 1 + +/obj/structure/portal_gateway/Bumped(mob/M as mob|obj) + if(istype(M,/mob) && !(istype(M,/mob/living))) + return //do not send ghosts, zshadows, ai eyes, etc + var/obj/effect/landmark/dest = pick(eventdestinations) + if(dest) + M << 'sound/effects/phasein.ogg' + playsound(src, 'sound/effects/phasein.ogg', 100, 1) + M.forceMove(dest.loc) + return diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm index a0c0419103c..3d0bd7f299e 100644 --- a/maps/submaps/shelters/shelter_4.dmm +++ b/maps/submaps/shelters/shelter_4.dmm @@ -91,6 +91,10 @@ /obj/item/weapon/towel/random, /obj/item/weapon/towel/random, /obj/item/weapon/extinguisher/mini, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod) "i" = ( @@ -403,16 +407,17 @@ /area/survivalpod) "R" = ( /obj/machinery/iv_drip, -/turf/simulated/shuttle/floor/voidcraft/light, -/area/survivalpod) -"S" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 }, +/turf/simulated/shuttle/floor/voidcraft/light, +/area/survivalpod) +"S" = ( /obj/machinery/light{ icon_state = "tube1"; dir = 4 }, +/obj/machinery/chemical_dispenser/ert, /turf/simulated/shuttle/floor/voidcraft/light, /area/survivalpod) "T" = ( diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 6b701f3a56e..98f06d80fac 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -892,6 +892,11 @@ /obj/item/weapon/rig/ert/assetprotection, /obj/item/weapon/rig/ert/assetprotection, /obj/item/weapon/rig/ert/assetprotection, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1365,6 +1370,10 @@ pixel_x = 1; pixel_y = 9 }, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1525,6 +1534,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/effect/floor_decal/industrial/outline/blue, +/obj/item/weapon/storage/box/traumainjectors, /turf/unsimulated/floor{ icon_state = "dark" }, diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index 568a97c1d82..de4368e73e9 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -300,6 +300,8 @@ docking_controller_tag = "specops_shuttle_hatch" web_master_type = /datum/shuttle_web_master/specialops can_rename = FALSE + can_cloak = TRUE + cloaked = FALSE /datum/shuttle_web_master/specialops destination_class = /datum/shuttle_destination/specialops From 44dec4048dfe4bfc15425fa0fd68c6fade808e36 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 30 Sep 2019 20:13:44 -0400 Subject: [PATCH 2/2] Updates Survival Box Contents --- maps/submaps/shelters/shelter_4.dmm | 4 +++- maps/tether/tether-10-colony.dmm | 24 ++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm index 3d0bd7f299e..c5fbcb5007c 100644 --- a/maps/submaps/shelters/shelter_4.dmm +++ b/maps/submaps/shelters/shelter_4.dmm @@ -241,7 +241,9 @@ /obj/item/weapon/gun/projectile/pistol, /obj/item/clothing/accessory/storage/black_vest, /obj/item/weapon/material/knife/tacknife/survival, -/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, /turf/simulated/floor/carpet/bcarpet, /area/survivalpod) "C" = ( diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 98f06d80fac..b28f538ceba 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -16608,12 +16608,24 @@ /area/centcom/control) "Fo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/survival/comp, -/obj/item/weapon/storage/box/survival/comp, -/obj/item/weapon/storage/box/survival/comp, -/obj/item/weapon/storage/box/survival/comp, -/obj/item/weapon/storage/box/survival/comp, -/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, +/obj/item/weapon/storage/box/survival/comp{ + starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi) + }, /turf/unsimulated/floor{ icon_state = "dark" },