forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 130
[ONLY TM] [EVENT] Escape From Tau-Kita - BETA ITERATION #2549
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Voyaker-coder
wants to merge
12
commits into
ss220club:master
Choose a base branch
from
Voyaker-coder:escape_from_tau
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
bf35b2c
begin
Voyaker-coder f18328d
fix
Voyaker-coder 729c478
fix linter
Voyaker-coder 6859227
fixes spaces
Voyaker-coder 043ecbb
parsings fix
Voyaker-coder d204a2a
fixes spaces2
Voyaker-coder 052e490
Merge branch 'master' into escape_from_tau
Voyaker-coder b5eb82d
part 2
Voyaker-coder c98205c
change map
Voyaker-coder a595ccc
Merge branch 'master' into escape_from_tau
Voyaker-coder 8cce5e2
replace map
Voyaker-coder 2157e8a
Update new_sydney.json
Voyaker-coder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| { | ||
| "version": 1, | ||
| "map_name": "New Sydney", | ||
| "map_path": "bandastation", | ||
| "map_file": "NewSydney_mini.dmm", | ||
| "fluff_name": "Новый Сидней", | ||
| "space_ruin_levels": 0, | ||
| "space_empty_levels": 0, | ||
| "main_floor": 1, | ||
| "planetary": 1, | ||
| "give_players_hooks": 1, | ||
| "shuttles": { | ||
| "ferry": "ferry_fancy", | ||
| "whiteship": "whiteship_delta" | ||
| }, | ||
| "traits": [ | ||
| { | ||
| "Up": true, | ||
| "Linkage": null, | ||
| "Baseturf": "/turf/open/misc/asteroid/lowpressure", | ||
| "Gravity": true, | ||
| "No Parallax": true | ||
| }, | ||
| { | ||
| "Down": true, | ||
| "Linkage": null, | ||
| "Baseturf": "/turf/open/misc/asteroid/lowpressure", | ||
| "Gravity": true, | ||
| "No Parallax": true | ||
| } | ||
| ], | ||
| "ignored_unit_tests": [ | ||
| "/datum/unit_test/antag_moodlets", | ||
| "/datum/unit_test/cargo_dep_order_locations", | ||
| "/datum/unit_test/maptest_job_roundstart_spawnpoints", | ||
| "/datum/unit_test/maptest_required_map_items", | ||
| "/datum/unit_test/spy_bounty", | ||
| "/datum/unit_test/space_dragon_expiration", | ||
| "/datum/unit_test/nuke_cinematic", | ||
| "/datum/unit_test/atmospherics_sanity", | ||
| "/datum/unit_test/maptest_mapload_space_verification", | ||
| "/datum/unit_test/modify_fantasy_variable", | ||
| "/datum/unit_test/create_and_destroy" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| /datum/modpack/voyaker_events | ||
| name = "Ивентовый код Воякера" | ||
| desc = "Модпак Воякера для всех ивентовых приблуд." | ||
| author = "Voyaker_RUS" | ||
|
|
||
| /datum/modpack/voyaker_events/pre_initialize() | ||
| . = ..() | ||
|
|
||
| /datum/modpack/voyaker_events/initialize() | ||
| . = ..() | ||
|
|
||
| /datum/modpack/voyaker_events/post_initialize() | ||
| . = ..() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // BEGIN_INTERNALS | ||
| // END_INTERNALS | ||
| // BEGIN_FILE_DIR | ||
| #define FILE_DIR . | ||
| // END_FILE_DIR | ||
| // BEGIN_PREFERENCES | ||
| // END_PREFERENCES | ||
| // BEGIN_INCLUDE | ||
| #include "_voyaker_events.dm" | ||
| #include "code\traders\trader_loyality.dm" | ||
| #include "code\traders\trader_quests.dm" | ||
| #include "code\traders\trader_targets.dm" | ||
| #include "code\traders\trader_vars.dm" | ||
| #include "code\ambience\ambience_landmarks.dm" | ||
| #include "code\anomalies\anomalies_controller.dm" | ||
| #include "code\anomalies\bluespace.dm" | ||
| #include "code\anomalies\grav.dm" | ||
| #include "code\anomalies\pyro.dm" | ||
| #include "code\areas\areas.dm" | ||
| #include "code\auto_cleanup\cleanup_casings.dm" | ||
| #include "code\auto_cleanup\cleanup_controller.dm" | ||
| #include "code\barricades\barricades.dm" | ||
| #include "code\cars\trucks.dm" | ||
| #include "code\cars\vehicles.dm" | ||
| #include "code\cars\vehicles_military.dm" | ||
| #include "code\city_props\city_props.dm" | ||
| #include "code\droppods\droppod_containers.dm" | ||
| #include "code\droppods\droppod_controller.dm" | ||
| #include "code\droppods\droppod_spawners.dm" | ||
| #include "code\extraction\extraction_controller.dm" | ||
| #include "code\extraction\extraction_logic.dm" | ||
| #include "code\flora\pines.dm" | ||
| #include "code\loot\loot_controller.dm" | ||
| #include "code\loot\loot_spawners.dm" | ||
| #include "code\loot_mobs\loot.dm" | ||
| #include "code\machinery\vending_traders.dm" | ||
| #include "code\mob\corpses.dm" | ||
| #include "code\mob\raid_death.dm" | ||
| #include "code\mob\raid_death_landmarks.dm" | ||
| #include "code\mobs\bigot.dm" | ||
| #include "code\mobs\bigot_controller.dm" | ||
| #include "code\mobs\forest_controller.dm" | ||
| #include "code\mobs\main_controller.dm" | ||
| #include "code\mobs\mutants_loot.dm" | ||
| #include "code\shelfs\shelfs.dm" | ||
| #include "code\tank\tank.dm" | ||
| #include "code\tents\tents.dm" | ||
| #include "code\turfs\basalt\basalt_burn.dm" | ||
| #include "code\turfs\water\water.dm" | ||
| #include "code\wooden_fence\wooden_fence.dm" | ||
| // END_INCLUDE |
58 changes: 58 additions & 0 deletions
58
modular_bandastation/voyaker_events/code/ambience/ambience_landmarks.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| GLOBAL_LIST_EMPTY(area_ambients) | ||
|
|
||
| /obj/effect/landmark/ambient_sound | ||
| name = "ambient sound" | ||
| icon = 'icons/effects/hitsplats.dmi' | ||
| icon_state = "hitsplat_heal" | ||
| var/sound_file | ||
| var/sound_range = 15 | ||
| var/min_delay = 30 SECONDS | ||
| var/max_delay = 90 SECONDS | ||
|
|
||
| /obj/effect/landmark/ambient_sound/Initialize(mapload) | ||
| . = ..() | ||
| GLOB.area_ambients += src | ||
| start_ambient() | ||
|
|
||
| /obj/effect/landmark/ambient_sound/Destroy() | ||
| GLOB.area_ambients -= src | ||
| return ..() | ||
|
|
||
| /obj/effect/landmark/ambient_sound/proc/start_ambient() | ||
| addtimer( | ||
| CALLBACK(src, PROC_REF(play_ambient)), rand(min_delay, max_delay)) | ||
|
|
||
| /obj/effect/landmark/ambient_sound/proc/play_ambient() | ||
| if(QDELETED(src)) | ||
| return | ||
| for(var/mob/M in viewers(sound_range, src)) | ||
| playsound(get_turf(src), sound_file, 50, FALSE) | ||
| start_ambient() | ||
|
|
||
| /obj/effect/landmark/ambient_sound/dark_forest | ||
| name = "Dark Forest Ambient" | ||
| sound_file = 'modular_bandastation/voyaker_events/sounds/forest_wind.ogg' | ||
| min_delay = 20 SECONDS | ||
| max_delay = 60 SECONDS | ||
| sound_range = 25 | ||
|
|
||
| /obj/effect/landmark/ambient_sound/radiation_lake | ||
| name = "Radiation Lake Ambient" | ||
| sound_file = 'modular_bandastation/voyaker_events/sounds/radiation_hum.ogg' | ||
| min_delay = 10 SECONDS | ||
| max_delay = 30 SECONDS | ||
| sound_range = 20 | ||
|
|
||
| /obj/effect/landmark/ambient_sound/hub | ||
| name = "Hub Ambient" | ||
| sound_file = 'modular_bandastation/voyaker_events/sounds/hub.ogg' | ||
| min_delay = 10 SECONDS | ||
| max_delay = 30 SECONDS | ||
| sound_range = 15 | ||
|
|
||
| /obj/effect/landmark/ambient_sound/bunker | ||
| name = "Bunker Work Ambient" | ||
| sound_file = 'modular_bandastation/voyaker_events/sounds/bunker.ogg' | ||
| min_delay = 10 SECONDS | ||
| max_delay = 50 SECONDS | ||
| sound_range = 20 |
36 changes: 36 additions & 0 deletions
36
modular_bandastation/voyaker_events/code/anomalies/anomalies_controller.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| GLOBAL_LIST_EMPTY(radiation_lake_anomaly_points) | ||
| GLOBAL_LIST_EMPTY(radiation_lake2_grav_points) | ||
| GLOBAL_LIST_EMPTY(pyro_anomaly_points) | ||
|
|
||
| /obj/effect/landmark/radiation_lake_anomaly | ||
| name = "EFTK Bluespace Anomaly Point" | ||
|
|
||
| Initialize(mapload) | ||
| . = ..() | ||
| GLOB.radiation_lake_anomaly_points += src | ||
|
|
||
| Destroy() | ||
| GLOB.radiation_lake_anomaly_points -= src | ||
| return ..() | ||
|
|
||
| /obj/effect/landmark/radiation_lake2_grav | ||
| name = "EFTK Gravity Anomaly Point" | ||
|
|
||
| Initialize(mapload) | ||
| . = ..() | ||
| GLOB.radiation_lake2_grav_points += src | ||
|
|
||
| Destroy() | ||
| GLOB.radiation_lake2_grav_points -= src | ||
| return ..() | ||
|
|
||
| /obj/effect/landmark/pyro_anomaly | ||
| name = "EFTK Pyro Anomaly Point" | ||
|
|
||
| Initialize(mapload) | ||
| . = ..() | ||
| GLOB.pyro_anomaly_points += src | ||
|
|
||
| Destroy() | ||
| GLOB.pyro_anomaly_points -= src | ||
| return ..() |
44 changes: 44 additions & 0 deletions
44
modular_bandastation/voyaker_events/code/anomalies/bluespace.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /obj/effect/anomaly/bluespace/radiation_lake | ||
| name = "unstable bluespace rift" | ||
| immortal = TRUE | ||
| lifespan = INFINITY | ||
| anomaly_core = null | ||
|
|
||
| /obj/effect/anomaly/bluespace/radiation_lake/detonate() | ||
| return | ||
|
|
||
| /obj/effect/anomaly/bluespace/radiation_lake/proc/move_to_lake() | ||
| if(!length(GLOB.radiation_lake_anomaly_points)) | ||
| return | ||
| var/obj/effect/landmark/radiation_lake_anomaly/L = pick(GLOB.radiation_lake_anomaly_points) | ||
| if(!L) | ||
| return | ||
| forceMove(get_turf(L)) | ||
|
|
||
| /obj/effect/anomaly/bluespace/radiation_lake/process() | ||
| ..() | ||
| if(!istype(get_area(src), /area/new_sydney/dark_forest/radiation_lake)) | ||
| move_to_lake() | ||
|
|
||
| /obj/effect/anomaly/bluespace/radiation_lake/anomalyEffect() | ||
| ..() | ||
| if(prob(10)) | ||
| relocate_within_lake() | ||
|
|
||
| /obj/effect/anomaly/bluespace/radiation_lake/proc/relocate_within_lake() | ||
| if(!length(GLOB.radiation_lake_anomaly_points)) | ||
| return | ||
| var/obj/effect/landmark/radiation_lake_anomaly/L = pick(GLOB.radiation_lake_anomaly_points) | ||
| if(!L) | ||
| return | ||
| var/turf/target = get_turf(L) | ||
| new /obj/effect/temp_visual/bluespace_fissure(get_turf(src)) | ||
| playsound(src, 'sound/effects/phasein.ogg', 50, TRUE) | ||
| forceMove(target) | ||
| new /obj/effect/temp_visual/bluespace_fissure(target) | ||
|
|
||
| /obj/effect/anomaly/bluespace/radiation_lake/Bumped(atom/movable/AM) | ||
| ..() | ||
| if(isliving(AM)) | ||
| var/mob/living/L = AM | ||
| L.adjust_tox_loss(5) |
35 changes: 35 additions & 0 deletions
35
modular_bandastation/voyaker_events/code/anomalies/grav.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /obj/effect/anomaly/grav/high/big/radiation_lake | ||
| name = "gravitational vortex" | ||
| immortal = TRUE | ||
| lifespan = INFINITY | ||
| anomaly_core = null | ||
|
|
||
| /obj/effect/anomaly/grav/high/big/radiation_lake/detonate() | ||
| return | ||
|
|
||
| /obj/effect/anomaly/grav/high/big/radiation_lake/anomalyEffect(seconds_per_tick) | ||
| . = ..() | ||
| if(!istype(get_area(src), /area/new_sydney/dark_forest/radiation_lake2)) | ||
| move_to_zone() | ||
| if(prob(15)) | ||
| relocate_within_zone() | ||
|
|
||
| /obj/effect/anomaly/grav/high/big/radiation_lake/proc/move_to_zone() | ||
| if(!length(GLOB.radiation_lake2_grav_points)) | ||
| return | ||
| var/obj/effect/landmark/radiation_lake2_grav/L = pick(GLOB.radiation_lake2_grav_points) | ||
| if(!L) | ||
| return | ||
| forceMove(get_turf(L)) | ||
|
|
||
| /obj/effect/anomaly/grav/high/big/radiation_lake/proc/relocate_within_zone() | ||
| if(!length(GLOB.radiation_lake2_grav_points)) | ||
| return | ||
| var/obj/effect/landmark/radiation_lake2_grav/L = pick(GLOB.radiation_lake2_grav_points) | ||
| if(!L) | ||
| return | ||
| var/turf/target = get_turf(L) | ||
| new /obj/effect/temp_visual/circle_wave/gravity(get_turf(src)) | ||
| playsound(src, 'sound/effects/magic/cosmic_energy.ogg', 50, TRUE) | ||
| forceMove(target) | ||
| new /obj/effect/temp_visual/circle_wave/gravity(target) |
52 changes: 52 additions & 0 deletions
52
modular_bandastation/voyaker_events/code/anomalies/pyro.dm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /obj/effect/anomaly/pyro/pyro_zone | ||
| name = "pyroclastic vortex" | ||
| immortal = TRUE | ||
| lifespan = INFINITY | ||
| anomaly_core = null | ||
| movement_type = FLOATING | ||
| light_range = 4 | ||
| light_power = 2 | ||
| light_color = "#FF6633" | ||
|
|
||
| /obj/effect/anomaly/pyro/pyro_zone/detonate() | ||
| return | ||
|
|
||
| /obj/effect/anomaly/pyro/pyro_zone/proc/move_to_zone() | ||
| if(!length(GLOB.pyro_anomaly_points)) | ||
| return | ||
| var/obj/effect/landmark/pyro_anomaly/L = pick(GLOB.pyro_anomaly_points) | ||
| if(!L) | ||
| return | ||
| forceMove(get_turf(L)) | ||
|
|
||
| /obj/effect/anomaly/pyro/pyro_zone/proc/relocate_within_zone() | ||
| if(!length(GLOB.pyro_anomaly_points)) | ||
| return | ||
| var/obj/effect/landmark/pyro_anomaly/L = pick(GLOB.pyro_anomaly_points) | ||
| if(!L) | ||
| return | ||
| var/turf/target = get_turf(L) | ||
| playsound(src, 'sound/effects/magic/cosmic_energy.ogg', 50, TRUE) | ||
| new /obj/effect/temp_visual/circle_wave/gravity(get_turf(src)) | ||
| forceMove(target) | ||
| new /obj/effect/temp_visual/circle_wave/gravity(target) | ||
|
|
||
| /obj/effect/anomaly/pyro/pyro_zone/anomalyEffect(seconds_per_tick) | ||
| ticks += seconds_per_tick | ||
| if(ticks >= releasedelay) | ||
| ticks -= releasedelay | ||
| var/turf/open/T = get_turf(src) | ||
| if(istype(T)) | ||
| T.atmos_spawn_air("[GAS_O2]=5;[GAS_PLASMA]=5;[TURF_TEMPERATURE(1000)]") | ||
| if(!istype(get_area(src), /area/new_sydney/pyro_zone)) | ||
| move_to_zone() | ||
| if(prob(10)) | ||
| relocate_within_zone() | ||
| return TRUE | ||
|
|
||
| /obj/effect/anomaly/pyro/pyro_zone/Bumped(atom/movable/bumpee) | ||
| . = ..() | ||
| if(isliving(bumpee)) | ||
| var/mob/living/L = bumpee | ||
| L.adjust_fire_loss(30) | ||
| L.ignite_mob() |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Предложение
В коде оставлен отладочный вывод
world.log << .... Он будет спамить в консоль сервера при каждом попадании снаряда, что может негативно сказаться на производительности. Для логирования выстрелов ниже уже вызываетсяlog_combat().Рекомендуется удалить эту строку.
References