From 6889f2db9e9aff47472b28010c40438c6a1eafdb Mon Sep 17 00:00:00 2001 From: yacabo Date: Mon, 2 Dec 2019 23:19:34 -0500 Subject: [PATCH 1/3] Adds Catastrophe achievement Emag a PA to get it --- code/datums/achievements/achievements.dm | 5 +++++ .../singularity/particle_accelerator/particle_control.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/datums/achievements/achievements.dm b/code/datums/achievements/achievements.dm index 090e58e35dd8..b63b0e770fe2 100644 --- a/code/datums/achievements/achievements.dm +++ b/code/datums/achievements/achievements.dm @@ -12,3 +12,8 @@ name = "I live again" desc = "As a roboticist, create a cyborg" id = 2 + +/datum/achievement/pa_emag //Should be hidden but that's not a thing yet + name = "Catastrophe" + desc = "Emag a Particle Accelerator" + id = 4 diff --git a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm index 7c54b06cf725..64b7b68c32d4 100644 --- a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -5,6 +5,7 @@ if(obj_flags & EMAGGED) return to_chat(user, "The laws of physics no longer apply in the future, god help you...") + SSachievements.unlock_achievement(/datum/achievement/pa_emag, user.client) do_sparks(5, 0, src) obj_flags |= EMAGGED From de554d32e477153b2a4ba4c8fae221ca3b64809d Mon Sep 17 00:00:00 2001 From: yacabo Date: Mon, 2 Dec 2019 23:20:15 -0500 Subject: [PATCH 2/3] Revert "Adds Catastrophe achievement" This reverts commit 6889f2db9e9aff47472b28010c40438c6a1eafdb. --- code/datums/achievements/achievements.dm | 5 ----- .../singularity/particle_accelerator/particle_control.dm | 1 - 2 files changed, 6 deletions(-) diff --git a/code/datums/achievements/achievements.dm b/code/datums/achievements/achievements.dm index b63b0e770fe2..090e58e35dd8 100644 --- a/code/datums/achievements/achievements.dm +++ b/code/datums/achievements/achievements.dm @@ -12,8 +12,3 @@ name = "I live again" desc = "As a roboticist, create a cyborg" id = 2 - -/datum/achievement/pa_emag //Should be hidden but that's not a thing yet - name = "Catastrophe" - desc = "Emag a Particle Accelerator" - id = 4 diff --git a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm index 64b7b68c32d4..7c54b06cf725 100644 --- a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -5,7 +5,6 @@ if(obj_flags & EMAGGED) return to_chat(user, "The laws of physics no longer apply in the future, god help you...") - SSachievements.unlock_achievement(/datum/achievement/pa_emag, user.client) do_sparks(5, 0, src) obj_flags |= EMAGGED From a61e74c967861be8fb98b8a49408404632fefade Mon Sep 17 00:00:00 2001 From: yacabo Date: Mon, 2 Dec 2019 23:25:43 -0500 Subject: [PATCH 3/3] Adds the Catastrophe achievement Emag a PA to get it --- code/datums/achievements/achievements.dm | 5 +++++ .../singularity/particle_accelerator/particle_control.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/datums/achievements/achievements.dm b/code/datums/achievements/achievements.dm index 090e58e35dd8..b63b0e770fe2 100644 --- a/code/datums/achievements/achievements.dm +++ b/code/datums/achievements/achievements.dm @@ -12,3 +12,8 @@ name = "I live again" desc = "As a roboticist, create a cyborg" id = 2 + +/datum/achievement/pa_emag //Should be hidden but that's not a thing yet + name = "Catastrophe" + desc = "Emag a Particle Accelerator" + id = 4 diff --git a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm index 7c54b06cf725..64b7b68c32d4 100644 --- a/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/yogstation/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -5,6 +5,7 @@ if(obj_flags & EMAGGED) return to_chat(user, "The laws of physics no longer apply in the future, god help you...") + SSachievements.unlock_achievement(/datum/achievement/pa_emag, user.client) do_sparks(5, 0, src) obj_flags |= EMAGGED