Minor Event Stuff

This commit is contained in:
Unknown
2019-09-30 20:11:49 -04:00
parent a09507114f
commit 0ba3f037f5
5 changed files with 41 additions and 3 deletions

View File

@@ -10,6 +10,8 @@ var/list/shell_module_types = list(
"Standard", "Service", "Clerical" "Standard", "Service", "Clerical"
) )
var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals
var/global/list/acceptable_fruit_types= list( var/global/list/acceptable_fruit_types= list(
"ambrosia", "ambrosia",
"apple", "apple",

View File

@@ -55,3 +55,22 @@
do_noeffect_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0) do_noeffect_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0)
else else
do_noeffect_teleport(M, target, 1) ///You will appear adjacent to the beacon 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

View File

@@ -91,6 +91,10 @@
/obj/item/weapon/towel/random, /obj/item/weapon/towel/random,
/obj/item/weapon/towel/random, /obj/item/weapon/towel/random,
/obj/item/weapon/extinguisher/mini, /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, /turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod) /area/survivalpod)
"i" = ( "i" = (
@@ -403,16 +407,17 @@
/area/survivalpod) /area/survivalpod)
"R" = ( "R" = (
/obj/machinery/iv_drip, /obj/machinery/iv_drip,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"S" = (
/obj/effect/floor_decal/industrial/loading{ /obj/effect/floor_decal/industrial/loading{
dir = 1 dir = 1
}, },
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"S" = (
/obj/machinery/light{ /obj/machinery/light{
icon_state = "tube1"; icon_state = "tube1";
dir = 4 dir = 4
}, },
/obj/machinery/chemical_dispenser/ert,
/turf/simulated/shuttle/floor/voidcraft/light, /turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod) /area/survivalpod)
"T" = ( "T" = (

View File

@@ -892,6 +892,11 @@
/obj/item/weapon/rig/ert/assetprotection, /obj/item/weapon/rig/ert/assetprotection,
/obj/item/weapon/rig/ert/assetprotection, /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{ /turf/unsimulated/floor{
icon_state = "dark" icon_state = "dark"
}, },
@@ -1365,6 +1370,10 @@
pixel_x = 1; pixel_x = 1;
pixel_y = 9 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{ /turf/unsimulated/floor{
icon_state = "dark" icon_state = "dark"
}, },
@@ -1525,6 +1534,7 @@
/obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas,
/obj/effect/floor_decal/industrial/outline/blue, /obj/effect/floor_decal/industrial/outline/blue,
/obj/item/weapon/storage/box/traumainjectors,
/turf/unsimulated/floor{ /turf/unsimulated/floor{
icon_state = "dark" icon_state = "dark"
}, },

View File

@@ -300,6 +300,8 @@
docking_controller_tag = "specops_shuttle_hatch" docking_controller_tag = "specops_shuttle_hatch"
web_master_type = /datum/shuttle_web_master/specialops web_master_type = /datum/shuttle_web_master/specialops
can_rename = FALSE can_rename = FALSE
can_cloak = TRUE
cloaked = FALSE
/datum/shuttle_web_master/specialops /datum/shuttle_web_master/specialops
destination_class = /datum/shuttle_destination/specialops destination_class = /datum/shuttle_destination/specialops