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

Destroys the Universe #6129

Merged
merged 1 commit into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,6 @@
#include "code\game\gamemodes\cult\cult.dm"
#include "code\game\gamemodes\cult\cult_items.dm"
#include "code\game\gamemodes\cult\cult_structures.dm"
#include "code\game\gamemodes\cult\hell_universe.dm"
#include "code\game\gamemodes\cult\narsie.dm"
#include "code\game\gamemodes\cult\ritual.dm"
#include "code\game\gamemodes\cult\runes.dm"
Expand All @@ -1020,10 +1019,6 @@
#include "code\game\gamemodes\cult\cultify\mob.dm"
#include "code\game\gamemodes\cult\cultify\obj.dm"
#include "code\game\gamemodes\cult\cultify\turf.dm"
#include "code\game\gamemodes\endgame\endgame.dm"
#include "code\game\gamemodes\endgame\supermatter_cascade\blob.dm"
#include "code\game\gamemodes\endgame\supermatter_cascade\portal.dm"
#include "code\game\gamemodes\endgame\supermatter_cascade\universe.dm"
#include "code\game\gamemodes\events\black_hole.dm"
#include "code\game\gamemodes\events\clang.dm"
#include "code\game\gamemodes\events\dust.dm"
Expand Down Expand Up @@ -2028,7 +2023,6 @@
#include "code\modules\admin\secrets\admin_secrets\show_signalers.dm"
#include "code\modules\admin\secrets\admin_secrets\traitors_and_objectives.dm"
#include "code\modules\admin\secrets\final_solutions\summon_narsie.dm"
#include "code\modules\admin\secrets\final_solutions\supermatter_cascade.dm"
#include "code\modules\admin\secrets\fun_secrets\break_all_lights.dm"
#include "code\modules\admin\secrets\fun_secrets\break_some_lights.dm"
#include "code\modules\admin\secrets\fun_secrets\fix_all_lights.dm"
Expand Down
2 changes: 0 additions & 2 deletions code/controllers/subsystem/emergency_shuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ SUBSYSTEM_DEF(emergencyshuttle)
priority_announcement.Announce((LEGACY_MAP_DATUM).shuttle_recall_message)

/datum/controller/subsystem/emergencyshuttle/proc/can_call()
if (!universe.OnShuttleCall(null))
return 0
if (deny_shuttle)
return 0
if (shuttle.moving_status != SHUTTLE_IDLE || !shuttle.location) //must be idle at centcom
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ SUBSYSTEM_DEF(ticker)
game_finished = (SSemergencyshuttle.returned() || mode.station_was_nuked)
mode_finished = (!post_game && mode.check_finished())
else
game_finished = (mode.check_finished() || (SSemergencyshuttle.returned() && SSemergencyshuttle.evac == 1)) || universe_has_ended
game_finished = (mode.check_finished() || (SSemergencyshuttle.returned() && SSemergencyshuttle.evac == 1))
mode_finished = game_finished

if (mode_finished)
Expand Down
74 changes: 0 additions & 74 deletions code/game/gamemodes/cult/hell_universe.dm

This file was deleted.

2 changes: 0 additions & 2 deletions code/game/gamemodes/cult/narsie.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ var/global/list/narsie_list = list()
INVOKE_ASYNC(src, PROC_REF(narsie_spawn_animation))

if(!narsie_cometh)//so we don't initiate Hell more than one time.
if(cause_hell)
SetUniversalState(/datum/universal_state/hell)
narsie_cometh = 1

spawn(10 SECONDS)
Expand Down
1 change: 0 additions & 1 deletion code/game/gamemodes/cult/runes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ var/list/sacrificed = list()
to_chat(world, "<font size='15' color='red'><b>THE VEIL HAS BEEN SHATTERED!</b></font>")
SEND_SOUND(world, sound('sound/effects/weather/wind/wind_5_1.ogg'))

SetUniversalState(/datum/universal_state/hell)
narsie_cometh = 1

spawn(10 SECONDS)
Expand Down
67 changes: 0 additions & 67 deletions code/game/gamemodes/endgame/endgame.dm

This file was deleted.

118 changes: 0 additions & 118 deletions code/game/gamemodes/endgame/supermatter_cascade/blob.dm

This file was deleted.

Loading
Loading