Skip to content
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

Merge upstream #240

Merged
merged 22 commits into from
Apr 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
57ff27c
bug fixes and code refactor for AI, malf or otherwise (#82590)
Metekillot Apr 28, 2024
74b4715
fix roleless poll ignores not working (#82911)
13spacemen Apr 28, 2024
4fce385
Automatic changelog for PR #82590 [ci skip]
comfyorange Apr 28, 2024
05dd356
Automatic changelog for PR #82911 [ci skip]
comfyorange Apr 28, 2024
88143d2
Fixes runtime in z level update (#82898)
JohnFulpWillard Apr 28, 2024
4a5cb3e
Makes the cutter lint actually work (#82913)
LemonInTheDark Apr 28, 2024
922017a
Adds tinyfans to the arrival shuttles (#82915)
improvedname Apr 28, 2024
dfc85d7
Automatic changelog for PR #82915 [ci skip]
comfyorange Apr 28, 2024
55a5a05
Fix the materials box dropping its contents on creation (#82892)
msgerbs Apr 28, 2024
7d3f376
Automatic changelog for PR #82892 [ci skip]
comfyorange Apr 28, 2024
cdd7665
Unarmed Attacks Support Multiple Verbs (#82876)
13spacemen Apr 28, 2024
84d7b0c
Automatic changelog for PR #82876 [ci skip]
comfyorange Apr 28, 2024
350a27d
Automatic changelog compile [ci skip]
actions-user Apr 29, 2024
1fb8ac6
Adds a funny scene when getting Sisyphus achievement (#82897)
intercepti0n Apr 29, 2024
d72724d
Automatic changelog for PR #82897 [ci skip]
comfyorange Apr 29, 2024
46861e4
Netguardian darkvision & visual tweaks (#82919)
Jacquerel Apr 29, 2024
4828dd8
Automatic changelog for PR #82919 [ci skip]
comfyorange Apr 29, 2024
d86a44a
Updates tips of the round to exclude mentions of virologist, and incl…
YesterdaysPromise Apr 29, 2024
18cb6a9
Automatic changelog for PR #82923 [ci skip]
comfyorange Apr 29, 2024
c761738
Eigenstasium Fix (#82930)
SyncIt21 Apr 29, 2024
a57d02b
Automatic changelog for PR #82930 [ci skip]
comfyorange Apr 29, 2024
7e94402
Use defines for spellbook categories (#82938)
larentoun Apr 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adds a funny scene when getting Sisyphus achievement (tgstation#82897)
## About The Pull Request


https://github.com/tgstation/tgstation/assets/137328283/979231c3-70cd-49dd-8d4d-2a8554adfbb3

## Why It's Good For The Game

This PR makes getting the “Ordeal of Sisyphus” extremely pointless by
teleporting carried boulder and spessman back to the Lavaland. In my
opinion, this feature is funny and suits the spirit of this achievement.

## Changelog

:cl:
add: Added a short scene when getting an Ordeal of Sisyphus achievement.
/:cl:
intercepti0n authored Apr 29, 2024
commit 1fb8ac678f5fb2de33a8a0868fcc9221eb89c069
19 changes: 19 additions & 0 deletions code/datums/components/sisyphus_awarder.dm
Original file line number Diff line number Diff line change
@@ -5,6 +5,8 @@
/datum/component/sisyphus_awarder
/// What poor sap is hauling this rock?
var/mob/living/sisyphus
/// Reference to a place where it all started.
var/turf/bottom_of_the_hill

/datum/component/sisyphus_awarder/Initialize()
if (!istype(parent, /obj/item/boulder))
@@ -30,6 +32,7 @@
RegisterSignal(the_taker, COMSIG_ENTER_AREA, PROC_REF(on_bearer_changed_area))
RegisterSignal(the_taker, COMSIG_QDELETING, PROC_REF(on_dropped))
sisyphus = the_taker
bottom_of_the_hill = get_turf(the_taker)

/// If you ever drop this shit you fail the challenge
/datum/component/sisyphus_awarder/proc/on_dropped()
@@ -45,5 +48,21 @@
return
if (entered_area.type != /area/centcom/central_command_areas/evacuation)
return // Don't istype because taking pods doesn't count

chosen_one.client?.give_award(/datum/award/achievement/misc/sisyphus, chosen_one)
play_reward_scene()

qdel(src)

/// Sends the player back to the Lavaland and plays a funny sound
/datum/component/sisyphus_awarder/proc/play_reward_scene()
if(isnull(bottom_of_the_hill))
return // This probably shouldn't happen, but...

podspawn(list(
"path" = /obj/structure/closet/supplypod/centcompod/sisyphus,
"target" = get_turf(sisyphus),
"reverse_dropoff_coords" = list(bottom_of_the_hill.x, bottom_of_the_hill.y, bottom_of_the_hill.z),
))

SEND_SOUND(sisyphus, 'sound/ambience/music/sisyphus/sisyphus.ogg')
17 changes: 17 additions & 0 deletions code/modules/cargo/supplypod.dm
Original file line number Diff line number Diff line change
@@ -99,6 +99,23 @@
delays = list(POD_TRANSIT = 20, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF

/obj/structure/closet/supplypod/centcompod/sisyphus
delays = list(POD_TRANSIT = 0, POD_FALLING = 0, POD_OPENING = 0, POD_LEAVING = 0.2)
reverse_delays = list(POD_TRANSIT = 0, POD_FALLING = 1.5 SECONDS, POD_OPENING = 0.6 SECONDS, POD_LEAVING = 0)
custom_rev_delay = TRUE
effectStealth = TRUE
reversing = TRUE
reverse_option_list = list(
"Mobs" = TRUE,
"Objects" = FALSE,
"Anchored" = FALSE,
"Underfloor" = FALSE,
"Wallmounted" = FALSE,
"Floors" = FALSE,
"Walls" = FALSE,
"Mecha" = TRUE,
)

/obj/structure/closet/supplypod/back_to_station
name = "blood-red supply pod"
desc = "An intimidating supply pod, covered in the blood-red markings"
Binary file added sound/ambience/music/sisyphus/sisyphus.ogg
Binary file not shown.