From 8a176e126e8b33a06555c353fe2de51aba8e8a13 Mon Sep 17 00:00:00 2001
From: ShiggyDiggyDo <33476624+ShiggyDiggyDo@users.noreply.github.com>
Date: Thu, 4 Jan 2018 12:55:07 +0100
Subject: [PATCH 1/3] You now have to stand next to the decoy nuke disk and
examine it to know it's fake
---
code/game/gamemodes/nuclear/nuclearbomb.dm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index bf85215f94..e88e797bcf 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -564,8 +564,8 @@ This is here to make the tiles around the station mininuke change when it's arme
user.death(0)
/obj/item/disk/fakenucleardisk
- name = "cheap plastic imitation of the nuclear authentication disk"
- desc = "Broken dreams and a faint odor of cheese."
+ name = "nuclear authentication disk"
+ desc = "Better keep this safe."
icon_state = "nucleardisk"
/obj/item/disk/fakenucleardisk/suicide_act(mob/user)
@@ -573,3 +573,11 @@ This is here to make the tiles around the station mininuke change when it's arme
playsound(src, 'sound/machines/alarm.ogg', 30, -1, 1)
addtimer(CALLBACK(src, .proc/manual_suicide, user), 101)
return MANUAL_SUICIDE
+<<<<<<< HEAD
+=======
+
+/obj/item/disk/fakenucleardisk/examine(mob/user)
+ ..()
+ if(Adjacent(user))
+ to_chat(user, "Wait, this is a fake!")
+>>>>>>> 32a205b... You now have to stand next to the decoy nuke disk and examine it to know it's fake (#34059)
From 1bfba8fd50a421ee3c39902e9e5fe2db2a545e8e Mon Sep 17 00:00:00 2001
From: deathride58
Date: Thu, 4 Jan 2018 20:56:53 -0500
Subject: [PATCH 2/3] Update nuclearbomb.dm
---
code/game/gamemodes/nuclear/nuclearbomb.dm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index e88e797bcf..68340a1da3 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -573,11 +573,8 @@ This is here to make the tiles around the station mininuke change when it's arme
playsound(src, 'sound/machines/alarm.ogg', 30, -1, 1)
addtimer(CALLBACK(src, .proc/manual_suicide, user), 101)
return MANUAL_SUICIDE
-<<<<<<< HEAD
-=======
/obj/item/disk/fakenucleardisk/examine(mob/user)
..()
if(Adjacent(user))
to_chat(user, "Wait, this is a fake!")
->>>>>>> 32a205b... You now have to stand next to the decoy nuke disk and examine it to know it's fake (#34059)
From c8ec3d8e510bd7dd5e05404547b6c8a2681e9882 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Thu, 4 Jan 2018 20:44:24 -0600
Subject: [PATCH 3/3] Automatic changelog generation for PR #4662 [ci skip]
---
html/changelogs/AutoChangeLog-pr-4662.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-4662.yml
diff --git a/html/changelogs/AutoChangeLog-pr-4662.yml b/html/changelogs/AutoChangeLog-pr-4662.yml
new file mode 100644
index 0000000000..1214c07d8e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4662.yml
@@ -0,0 +1,4 @@
+author: "ShiggyDiggyDo"
+delete-after: True
+changes:
+ - tweak: "Syndicate experts were able to create more sophisticated copies of the nuclear authentication disk. While still unable to detonate the nuclear fission explosive with them, they're practically identical to the real disk if not examined closely."