From 2ad5c8ac7e21b958f2935be257a2ccc66ed2fdae Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 29 May 2017 09:15:08 -0500 Subject: [PATCH 1/3] Fixes doubled post-round end time. --- code/controllers/subsystem/ticker.dm.rej | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 code/controllers/subsystem/ticker.dm.rej diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej new file mode 100644 index 0000000000..24900fe503 --- /dev/null +++ b/code/controllers/subsystem/ticker.dm.rej @@ -0,0 +1,10 @@ +diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) +@@ -832,7 +832,7 @@ SUBSYSTEM_DEF(ticker) + to_chat(world, "Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]") + + var/start_wait = world.time +- UNTIL(round_end_sound_sent && (world.time - start_wait) > (delay * 2)) //don't wait forever ++ UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever + sleep(delay - (world.time - start_wait)) + + if(delay_end && !skip_delay) From a821d90a37e2d09634765a3719b2d4bf17d4a0f3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 30 May 2017 15:54:42 -0500 Subject: [PATCH 2/3] commit --- code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c839c7c33d..0d1eaadc08 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -857,7 +857,7 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]") var/start_wait = world.time - UNTIL(round_end_sound_sent && (world.time - start_wait) > (delay * 2)) //don't wait forever + UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever sleep(delay - (world.time - start_wait)) if(delay_end) From bc5ecc91b57c8d94df0f055309b56a5f0c6a51fa Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 30 May 2017 15:55:00 -0500 Subject: [PATCH 3/3] rej clean --- code/controllers/subsystem/ticker.dm.rej | 10 ---------- code/datums/holocall.dm.rej | 10 ---------- code/game/gamemodes/gang/gang.dm.rej | 16 ---------------- code/game/gamemodes/gang/recaller.dm.rej | 10 ---------- code/modules/cargo/exports/materials.dm.rej | 10 ---------- code/modules/jobs/job_types/job.dm.rej | 12 ------------ 6 files changed, 68 deletions(-) delete mode 100644 code/controllers/subsystem/ticker.dm.rej delete mode 100644 code/datums/holocall.dm.rej delete mode 100644 code/game/gamemodes/gang/gang.dm.rej delete mode 100644 code/game/gamemodes/gang/recaller.dm.rej delete mode 100644 code/modules/cargo/exports/materials.dm.rej delete mode 100644 code/modules/jobs/job_types/job.dm.rej diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej deleted file mode 100644 index 24900fe503..0000000000 --- a/code/controllers/subsystem/ticker.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) -@@ -832,7 +832,7 @@ SUBSYSTEM_DEF(ticker) - to_chat(world, "Rebooting World in [delay/10] [(delay >= 10 && delay < 20) ? "second" : "seconds"]. [reason]") - - var/start_wait = world.time -- UNTIL(round_end_sound_sent && (world.time - start_wait) > (delay * 2)) //don't wait forever -+ UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever - sleep(delay - (world.time - start_wait)) - - if(delay_end && !skip_delay) diff --git a/code/datums/holocall.dm.rej b/code/datums/holocall.dm.rej deleted file mode 100644 index 8b39f40ba9..0000000000 --- a/code/datums/holocall.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/datums/holocall.dm b/code/datums/holocall.dm (rejected hunks) -@@ -45,7 +45,7 @@ - var/user_good = !QDELETED(user) - if(user_good) - user.reset_perspective() -- user.remote_control = null -+ user.remote_control = null - - if(!QDELETED(eye)) - if(user_good && user.client) diff --git a/code/game/gamemodes/gang/gang.dm.rej b/code/game/gamemodes/gang/gang.dm.rej deleted file mode 100644 index d9220abdbc..0000000000 --- a/code/game/gamemodes/gang/gang.dm.rej +++ /dev/null @@ -1,16 +0,0 @@ -diff a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm (rejected hunks) -@@ -255,11 +255,13 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue"," - return gang_bosses - - /datum/game_mode/proc/shuttle_check() -+ if(SSshuttle.emergencyNoRecall) -+ return - var/alive = 0 - for(var/mob/living/L in GLOB.player_list) - if(L.stat != DEAD) - alive++ -- if((alive < (GLOB.joined_player_list.len * 0.4)) && (SSshuttle.emergency.timeLeft(1) < (SSshuttle.emergencyCallTime * 0.4))) -+ if((alive < (GLOB.joined_player_list.len * 0.4)) && ((SSshuttle.emergency.timeLeft(1) > (SSshuttle.emergencyCallTime * 0.4)))) - SSshuttle.emergencyNoRecall = TRUE - SSshuttle.emergency.request(null, set_coefficient = 0.4) - priority_announce("Catastrophic casualties detected: crisis shuttle protocols activated - jamming recall signals across all frequencies.") diff --git a/code/game/gamemodes/gang/recaller.dm.rej b/code/game/gamemodes/gang/recaller.dm.rej deleted file mode 100644 index 1c7b030c48..0000000000 --- a/code/game/gamemodes/gang/recaller.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm (rejected hunks) -@@ -165,7 +165,7 @@ - if(!can_use(user)) - return 0 - -- if(SSticker.mode.forced_shuttle) -+ if(SSshuttle.emergencyNoRecall) - return 0 - - if(recalling) diff --git a/code/modules/cargo/exports/materials.dm.rej b/code/modules/cargo/exports/materials.dm.rej deleted file mode 100644 index a45710fc0d..0000000000 --- a/code/modules/cargo/exports/materials.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm (rejected hunks) -@@ -43,7 +43,7 @@ - - // Plasma. The oil of 26 century. The reason why you are here. - /datum/export/material/plasma -- cost = 500 -+ cost = 300 - k_elasticity = 0 - material_id = MAT_PLASMA - message = "cm3 of plasma" diff --git a/code/modules/jobs/job_types/job.dm.rej b/code/modules/jobs/job_types/job.dm.rej deleted file mode 100644 index c34e09ddc7..0000000000 --- a/code/modules/jobs/job_types/job.dm.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm (rejected hunks) -@@ -156,7 +156,9 @@ - else - back = backpack //Department backpack - -- if(backpack_contents && box) -+ if(box) -+ if(!backpack_contents) -+ backpack_contents = list() - backpack_contents.Insert(1, box) // Box always takes a first slot in backpack - backpack_contents[box] = 1 -