From a5ada8e75e396738fb53a1cad39e7d5122f49f79 Mon Sep 17 00:00:00 2001 From: Zandario Date: Wed, 8 Nov 2023 02:58:57 -0600 Subject: [PATCH] Destroys the Universe --- citadel.dme | 6 - .../subsystem/emergency_shuttle.dm | 2 - code/controllers/subsystem/ticker.dm | 2 +- code/game/gamemodes/cult/hell_universe.dm | 74 ----------- code/game/gamemodes/cult/narsie.dm | 2 - code/game/gamemodes/cult/runes.dm | 1 - code/game/gamemodes/endgame/endgame.dm | 67 ---------- .../endgame/supermatter_cascade/blob.dm | 118 ------------------ .../endgame/supermatter_cascade/portal.dm | 93 -------------- .../endgame/supermatter_cascade/universe.dm | 118 ------------------ .../game/machinery/computer/communications.dm | 4 - code/global.dm | 2 - .../final_solutions/supermatter_cascade.dm | 13 -- code/modules/mob/animations.dm | 3 +- code/modules/power/singularity/act.dm | 1 - 15 files changed, 3 insertions(+), 503 deletions(-) delete mode 100644 code/game/gamemodes/cult/hell_universe.dm delete mode 100644 code/game/gamemodes/endgame/endgame.dm delete mode 100644 code/game/gamemodes/endgame/supermatter_cascade/blob.dm delete mode 100644 code/game/gamemodes/endgame/supermatter_cascade/portal.dm delete mode 100644 code/game/gamemodes/endgame/supermatter_cascade/universe.dm delete mode 100644 code/modules/admin/secrets/final_solutions/supermatter_cascade.dm diff --git a/citadel.dme b/citadel.dme index ce82918ea890..70942a7b3382 100644 --- a/citadel.dme +++ b/citadel.dme @@ -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" @@ -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" @@ -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" diff --git a/code/controllers/subsystem/emergency_shuttle.dm b/code/controllers/subsystem/emergency_shuttle.dm index a494a9626131..b1c07d9cc338 100644 --- a/code/controllers/subsystem/emergency_shuttle.dm +++ b/code/controllers/subsystem/emergency_shuttle.dm @@ -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 diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index fe45ad127701..3867d864a427 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -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) diff --git a/code/game/gamemodes/cult/hell_universe.dm b/code/game/gamemodes/cult/hell_universe.dm deleted file mode 100644 index 2534ccdef88d..000000000000 --- a/code/game/gamemodes/cult/hell_universe.dm +++ /dev/null @@ -1,74 +0,0 @@ -/* - -In short: - * Random gateways spawning hellmonsters - * Broken Fire Alarms - * Random tiles changing to culty tiles. - -*/ -/datum/universal_state/hell - name = "Hell Rising" - desc = "OH FUCK OH FUCK OH FUCK" - - decay_rate = 5 // 5% chance of a turf decaying on lighting update/airflow (there's no actual tick for turfs) - -/datum/universal_state/hell/OnShuttleCall(var/mob/user) - return 1 - /* - if(user) - to_chat(user, "All you hear on the frequency is static and panicked screaming. There will be no shuttle call today.") - return 0 - */ - -/datum/universal_state/hell/DecayTurf(var/turf/T) - if(!T.holy) - T.cultify() - for(var/obj/machinery/light/L in T.contents) - new /obj/structure/cult/pylon(L.loc) - qdel(L) - -// Apply changes when entering state -/datum/universal_state/hell/OnEnter() - set background = 1 -// garbage_collector.garbage_collect = 0 - - escape_list = get_area_turfs(locate(/area/hallway/secondary/exit)) - - //Separated into separate procs for profiling - AreaSet() - MiscSet() - APCSet() - OverlayAndAmbientSet() - lightsout(0,0) - - runedec += 9000 //basically removing the rune cap - - -/datum/universal_state/hell/proc/AreaSet() - for(var/area/A in GLOB.sortedAreas) - if(!istype(A,/area) || istype(A, /area/space)) - continue - - A.updateicon() - -/datum/universal_state/hell/OverlayAndAmbientSet() - spawn(0) - for(var/datum/lighting_corner/L in world) - L.update_lumcount(1, 0, 0) - for(var/turf/space/T in world) - T.color = "#FF0000" - -/datum/universal_state/hell/proc/MiscSet() - for(var/turf/simulated/floor/T in world) - if(!T.holy && prob(1)) - new /obj/effect/gateway/active/cult(T) - - for (var/obj/machinery/firealarm/alm in GLOB.machines) - if (!(alm.machine_stat & BROKEN)) - LEGACY_EX_ACT(alm, 2, null) - -/datum/universal_state/hell/proc/APCSet() - for (var/obj/machinery/power/apc/APC in GLOB.apcs) - if (!(APC.machine_stat & BROKEN) && !APC.is_critical) - APC.emagged = 1 - APC.update_icon() diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 904b870d0f84..abfa87f6cf79 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -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) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 88b6eaa9063d..00c7ab770eed 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -204,7 +204,6 @@ var/list/sacrificed = list() to_chat(world, "THE VEIL HAS BEEN SHATTERED!") SEND_SOUND(world, sound('sound/effects/weather/wind/wind_5_1.ogg')) - SetUniversalState(/datum/universal_state/hell) narsie_cometh = 1 spawn(10 SECONDS) diff --git a/code/game/gamemodes/endgame/endgame.dm b/code/game/gamemodes/endgame/endgame.dm deleted file mode 100644 index 8508557de930..000000000000 --- a/code/game/gamemodes/endgame/endgame.dm +++ /dev/null @@ -1,67 +0,0 @@ -/********************** - * ENDGAME STUFF - **********************/ - - // Universal State - // Handles stuff like space icon_state, constants, etc. - // Essentially a policy manager. Once shit hits the fan, this changes its policies. - // Called by master controller. - - // Default shit. -/datum/universal_state - // Just for reference, for now. - // Might eventually add an observatory job. - var/name = "Normal" - var/desc = "Nothing seems awry." - - // Sets world.turf, replaces all turfs of type /turf/space. - var/space_type = /turf/space - - // Replaces all turfs of type /turf/space/transit - var/transit_space_type = /turf/space/transit - - // Chance of a floor or wall getting damaged [0-100] - // Simulates stuff getting broken due to molecular bonds decaying. - var/decay_rate = 0 - -// Actually decay the turf. -/datum/universal_state/proc/DecayTurf(var/turf/T) - if(istype(T,/turf/simulated/wall)) - var/turf/simulated/wall/W=T - W.melt() - return - if(istype(T,/turf/simulated/floor)) - var/turf/simulated/floor/F=T - // Burnt? - if(!F.burnt) - F.burn_tile() - else - F.ReplaceWithLattice() - return - -// Return 0 to cause shuttle call to fail. -/datum/universal_state/proc/OnShuttleCall(var/mob/user) - return 1 - -// Processed per tick -/datum/universal_state/proc/OnTurfTick(var/turf/T) - if(decay_rate && prob(decay_rate)) - DecayTurf(T) - -// Apply changes when exiting state -/datum/universal_state/proc/OnExit() - // Does nothing by default - -// Apply changes when entering state -/datum/universal_state/proc/OnEnter() - // Does nothing by default - -/datum/universal_state/proc/OverlayAndAmbientSet() - return - -/proc/SetUniversalState(var/newstate,var/on_exit=1, var/on_enter=1) - if(on_exit) - universe.OnExit() - universe = new newstate - if(on_enter) - universe.OnEnter() diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm deleted file mode 100644 index bf31926e9224..000000000000 --- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm +++ /dev/null @@ -1,118 +0,0 @@ -// QUALITY COPYPASTA -/turf/unsimulated/wall/supermatter - name = "Bluespace" - desc = "THE END IS right now actually." - - icon = 'icons/turf/space.dmi' - icon_state = "bluespace" - - //luminosity = 5 - //l_color="#0066FF" - plane = ABOVE_LIGHTING_PLANE - - var/spawned=0 // DIR mask - var/next_check=0 - var/list/avail_dirs = list(NORTH,SOUTH,EAST,WEST) - -/turf/unsimulated/wall/supermatter/Initialize(mapload) - . = ..() - START_PROCESSING(SSturfs, src) - next_check = world.time+5 SECONDS - -/turf/unsimulated/wall/supermatter/Destroy() - STOP_PROCESSING(SSturfs, src) - return ..() - -/turf/unsimulated/wall/supermatter/process(delta_time) - // Only check infrequently. - if(next_check>world.time) return - - // No more available directions? Shut down process(). - if(avail_dirs.len==0) - STOP_PROCESSING(SSobj, src) - return 1 - - // We're checking, reset the timer. - next_check = world.time+5 SECONDS - - // Choose a direction. - var/pdir = pick(avail_dirs) - avail_dirs -= pdir - var/turf/T=get_step(src,pdir) - - // EXPAND - if(!istype(T,type)) - // Do pretty fadeout animation for 1s. - new /obj/effect/overlay/bluespacify(T) - spawn(10) - // Nom. - for(var/atom/movable/A in T) - if(A) - if(istype(A,/mob/living)) - qdel(A) - else if(istype(A,/mob)) // Observers, AI cameras. - continue - else - qdel(A) - T.ChangeTurf(type) - - if((spawned & (NORTH|SOUTH|EAST|WEST)) == (NORTH|SOUTH|EAST|WEST)) - STOP_PROCESSING(SSturfs, src) - return - -/turf/unsimulated/wall/supermatter/attack_generic(mob/user as mob) - return attack_hand(user) - -/turf/unsimulated/wall/supermatter/attack_robot(mob/user as mob) - if(Adjacent(user)) - return attack_hand(user) - else - to_chat(user, "What the fuck are you doing?") - return - -// /vg/: Don't let ghosts fuck with this. -/turf/unsimulated/wall/supermatter/attack_ghost(mob/user as mob) - . = ..() - user.examinate(src) - -/turf/unsimulated/wall/supermatter/attack_ai(mob/user as mob) - return user.examinate(src) - -/turf/unsimulated/wall/supermatter/attack_hand(mob/user, list/params) - user.visible_message("\The [user] reaches out and touches \the [src]... And then blinks out of existance.",\ - "You reach out and touch \the [src]. Everything immediately goes quiet. Your last thought is \"That was not a wise decision.\"",\ - "You hear an unearthly noise.") - - playsound(src, 'sound/effects/supermatter.ogg', 50, 1) - - Consume(user) - -/turf/unsimulated/wall/supermatter/attackby(obj/item/W as obj, mob/living/user as mob) - user.visible_message("\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ - "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ - "Everything suddenly goes silent.") - - playsound(src, 'sound/effects/supermatter.ogg', 50, 1) - Consume(W) - - -/turf/unsimulated/wall/supermatter/Bumped(atom/AM as mob|obj) - if(istype(AM, /mob/living)) - var/mob/living/M = AM - var/datum/gender/T = GLOB.gender_datums[M.get_visible_gender()] - AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [T.his] body starts to glow and catch flame before flashing into ash.",\ - "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ - "You hear an unearthly noise as a wave of heat washes over you.") - else - AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\ - "You hear a loud crack as you are washed with a wave of heat.") - - playsound(src, 'sound/effects/supermatter.ogg', 50, 1) - Consume(AM) - - -/turf/unsimulated/wall/supermatter/proc/Consume(atom/movable/AM) - if((!isobj(AM) && !ismob(AM)) || isobserver(AM)) - return - - qdel(AM) diff --git a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm deleted file mode 100644 index cad7a3f239f3..000000000000 --- a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm +++ /dev/null @@ -1,93 +0,0 @@ -/*** EXIT PORTAL ***/ - -/obj/singularity/narsie/large/exit - name = "Bluespace Rift" - desc = "NO TIME TO EXPLAIN, JUMP IN" - icon = 'icons/obj/rift.dmi' - icon_state = "rift" - - move_self = 0 - announce=0 - cause_hell=0 - - plane = ABOVE_LIGHTING_PLANE // ITS SO BRIGHT - - consume_range = 6 - -/obj/singularity/narsie/large/exit/Initialize(mapload) - . = ..() - START_PROCESSING(SSobj, src) - -/obj/singularity/narsie/large/exit/update_icon() - cut_overlays() - -/obj/singularity/narsie/large/exit/process(delta_time) - for(var/mob/M in GLOB.player_list) - if(M.client) - M.see_rift(src) - eat() - -/obj/singularity/narsie/large/exit/acquire(var/mob/food) - return - -/obj/singularity/narsie/large/exit/consume(const/atom/A) - if(!(A.singuloCanEat())) - return 0 - - if (istype(A, /mob/living/)) - var/mob/living/L = A - if(L.buckled && istype(L.buckled,/obj/structure/bed/)) - var/turf/O = L.buckled - do_teleport(O, pick(endgame_safespawns), local = FALSE) - L.loc = O.loc - else - do_teleport(L, pick(endgame_safespawns), local = FALSE) //dead-on precision - else if (istype(A, /obj/mecha/)) - do_teleport(A, pick(endgame_safespawns), local = FALSE) //dead-on precision - else if (isturf(A)) - var/turf/T = A - var/dist = get_dist(T, src) - if (dist <= consume_range && T.density) - T.density = 0 - - for (var/atom/movable/AM in T.contents) - if (AM == src) // This is the snowflake. - continue - - if (dist <= consume_range) - consume(AM) - continue - - if (dist > consume_range) - if(!(AM.singuloCanEat())) - continue - - if (101 == AM.invisibility) - continue - - spawn (0) - AM.singularity_pull(src, src.current_size) - - -/mob - //thou shall always be able to see the rift - var/image/riftimage = null - -/mob/proc/see_rift(var/obj/singularity/narsie/large/exit/R) - var/turf/T_mob = get_turf(src) - if((R.z == T_mob.z) && (get_dist(R,T_mob) <= (R.consume_range+10)) && !(R in view(T_mob))) - if(!riftimage) - riftimage = image('icons/obj/rift.dmi',T_mob,"rift",1,1) - riftimage.plane = ABOVE_LIGHTING_PLANE - riftimage.mouse_opacity = 0 - - var/new_x = 32 * (R.x - T_mob.x) + R.pixel_x - var/new_y = 32 * (R.y - T_mob.y) + R.pixel_y - riftimage.pixel_x = new_x - riftimage.pixel_y = new_y - riftimage.loc = T_mob - - SEND_IMAGE(src, riftimage) - else - if(riftimage) - qdel(riftimage) diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm deleted file mode 100644 index 4fa11ab2a52f..000000000000 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ /dev/null @@ -1,118 +0,0 @@ -var/global/universe_has_ended = 0 - - -/datum/universal_state/supermatter_cascade - name = "Supermatter Cascade" - desc = "Unknown harmonance affecting universal substructure, converting nearby matter to supermatter." - - decay_rate = 5 // 5% chance of a turf decaying on lighting update/airflow (there's no actual tick for turfs) - -/datum/universal_state/supermatter_cascade/OnShuttleCall(var/mob/user) - if(user) - to_chat(user, "All you hear on the frequency is static and panicked screaming. There will be no shuttle call today.") - return 0 - -/datum/universal_state/supermatter_cascade/DecayTurf(var/turf/T) - if(istype(T,/turf/simulated/wall)) - var/turf/simulated/wall/W=T - W.melt() - return - if(istype(T,/turf/simulated/floor)) - var/turf/simulated/floor/F=T - // Burnt? - if(!F.burnt) - F.burn_tile() - else - if(!istype(F,/turf/simulated/floor/plating)) - F.break_tile_to_plating() - return - -// Apply changes when entering state -/datum/universal_state/supermatter_cascade/OnEnter() - set background = 1 - to_chat(world, "You are blinded by a brilliant flash of energy.") - - SEND_SOUND(world, sound('sound/effects/cascade.ogg')) - - for(var/mob/M in GLOB.player_list) - M.flash_eyes() - - if(SSemergencyshuttle.can_recall()) - priority_announcement.Announce("The emergency shuttle has returned due to bluespace distortion.") - SSemergencyshuttle.recall() - - AreaSet() - MiscSet() - APCSet() - OverlayAndAmbientSet() - - // Disable Nar-Sie. - cult.allow_narsie = 0 - - PlayerSet() - - new /obj/singularity/narsie/large/exit(pick(endgame_exits)) - spawn(rand(30,60) SECONDS) - var/txt = {" -There's been a galaxy-wide electromagnetic pulse. All of our systems are heavily damaged and many personnel are dead or dying. We are seeing increasing indications of the universe itself beginning to unravel. - -[station_name()], you are the only facility nearby a bluespace rift, which is near your research outpost. You are hereby directed to enter the rift using all means necessary, quite possibly as the last of your species alive. - -You have five minutes before the universe collapses. Good l\[\[###!!!- - -AUTOMATED ALERT: Link to [command_name()] lost. - -The access requirements on the Asteroid Shuttles' consoles have now been revoked. -"} - priority_announcement.Announce(txt,"SUPERMATTER CASCADE DETECTED") - - for(var/obj/machinery/computer/shuttle_control/C in GLOB.machines) - if(istype(C, /obj/machinery/computer/shuttle_control/research) || istype(C, /obj/machinery/computer/shuttle_control/mining)) - C.req_access = list() - C.req_one_access = list() - - spawn(5 MINUTES) - SSticker.station_explosion_cinematic(0,null) // TODO: Custom cinematic - universe_has_ended = 1 - return - -/datum/universal_state/supermatter_cascade/proc/AreaSet() - for(var/area/A in GLOB.sortedAreas) - if(!istype(A,/area) || istype(A, /area/space) || istype(A,/area/beach)) - continue - - A.updateicon() - -/datum/universal_state/supermatter_cascade/OverlayAndAmbientSet() - spawn(0) - for(var/datum/lighting_corner/L in world) - if(L.z in (LEGACY_MAP_DATUM).admin_levels) - L.update_lumcount(1,1,1) - else - L.update_lumcount(0.0, 0.4, 1) - for(var/turf/space/T in world) - T.color = "#0066FF" - -/datum/universal_state/supermatter_cascade/proc/MiscSet() - for (var/obj/machinery/firealarm/alm in GLOB.machines) - if (!(alm.machine_stat & BROKEN)) - LEGACY_EX_ACT(alm, 2, null) - -/datum/universal_state/supermatter_cascade/proc/APCSet() - for (var/obj/machinery/power/apc/APC in GLOB.apcs) - if (!(APC.machine_stat & BROKEN) && !APC.is_critical) - APC.chargemode = 0 - if(APC.cell) - APC.cell.charge = 0 - APC.emagged = 1 - APC.update_icon() - -/datum/universal_state/supermatter_cascade/proc/PlayerSet() - for(var/datum/mind/M in GLOB.player_list) - if(!istype(M.current,/mob/living)) - continue - if(M.current.stat!=2) - M.current.afflict_paralyze(20 * 10) - M.current.flash_eyes() - - clear_antag_roles(M) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 365e0e483c3b..f6ce0ddaf4e4 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -474,10 +474,6 @@ if ((!( SSticker ) || !SSemergencyshuttle.location())) return - if(!universe.OnShuttleCall(usr)) - to_chat(user, "Cannot establish a bluespace connection.") - return - if(deathsquad.deployed) to_chat(user, "[(LEGACY_MAP_DATUM).boss_short] will not allow the shuttle to be called. Consider all contracts terminated.") return diff --git a/code/global.dm b/code/global.dm index f00a6bfe296d..bc4fa6cb8311 100644 --- a/code/global.dm +++ b/code/global.dm @@ -7,8 +7,6 @@ var/global/list/hud_icon_reference = list() var/global/list/global_mutations = list() // List of hidden mutation things. -var/global/datum/universal_state/universe = new - // Noises made when hit while typing. var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF") // var/station_name = "Northern Star" diff --git a/code/modules/admin/secrets/final_solutions/supermatter_cascade.dm b/code/modules/admin/secrets/final_solutions/supermatter_cascade.dm deleted file mode 100644 index 5d5aa2efd09b..000000000000 --- a/code/modules/admin/secrets/final_solutions/supermatter_cascade.dm +++ /dev/null @@ -1,13 +0,0 @@ -/datum/admin_secret_item/final_solution/supermatter_cascade - name = "Supermatter Cascade" - -/datum/admin_secret_item/final_solution/supermatter_cascade/execute(var/mob/user) - . = ..() - if(!.) - return - var/choice = input(user, "You sure you want to destroy the universe and create a large explosion at your location? Misuse of this could result in removal of flags or hilarity.") in list("NO TIME TO EXPLAIN", "Cancel") - if(choice == "NO TIME TO EXPLAIN") - explosion(get_turf(user), 8, 16, 24, 32, 1) - new /turf/unsimulated/wall/supermatter(get_turf(user)) - SetUniversalState(/datum/universal_state/supermatter_cascade) - message_admins("[key_name_admin(user)] has managed to destroy the universe with a supermatter cascade. Good job, [key_name_admin(user)]") diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm index 1089bf31a3ed..b3ba1a05f7fb 100644 --- a/code/modules/mob/animations.dm +++ b/code/modules/mob/animations.dm @@ -12,7 +12,8 @@ below 100 is not dizzy /mob/var/is_dizzy = 0 /mob/proc/make_dizzy(var/amount) - if(!istype(src, /mob/living/carbon/human)) // for the moment, only humans get dizzy + // for the moment, only humans get dizzy + if(!istype(src, /mob/living/carbon/human)) return dizziness = min(1000, dizziness + amount) // store what will be new value diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index b196d97e05a9..6bd529c1ed01 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -84,7 +84,6 @@ if(src.fingerprintshidden) prints = ", all touchers : " + src.fingerprintshidden - SetUniversalState(/datum/universal_state/supermatter_cascade) log_admin("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].") message_admins("New super singularity made by eating a SM crystal [prints]. Last touched by [src.fingerprintslast].") qdel(src)