From f4a76781fa297565c8904343e68c9b68b23d1022 Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Mon, 16 Dec 2019 08:18:35 -0500 Subject: [PATCH 1/3] Removed robicist headset from the engineering channel Words --- code/game/objects/items/devices/radio/encryptionkey.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index dd7489d6b1..03742965ed 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -38,7 +38,7 @@ name = "robotics radio encryption key" desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For research, use :n." icon_state = "rob_cypherkey" - channels = list("Science" = 1, "Engineering" = 1) + channels = list("Science" = 1) /obj/item/encryptionkey/headset_med name = "medical radio encryption key" From 8209fe5159e0e6593ab05ce80a7db48db70fe442 Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Mon, 16 Dec 2019 08:19:12 -0500 Subject: [PATCH 2/3] Update encryptionkey.dm --- code/game/objects/items/devices/radio/encryptionkey.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 03742965ed..dd7489d6b1 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -38,7 +38,7 @@ name = "robotics radio encryption key" desc = "An encryption key for a radio headset. To access the engineering channel, use :e. For research, use :n." icon_state = "rob_cypherkey" - channels = list("Science" = 1) + channels = list("Science" = 1, "Engineering" = 1) /obj/item/encryptionkey/headset_med name = "medical radio encryption key" From 44b96f01ea72f0beea8af34b63f21daf8f51de1c Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Fri, 3 Jan 2020 06:04:10 -0500 Subject: [PATCH 3/3] Make radiation collectors move faster Words --- code/modules/power/singularity/collector.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 4159d9898a..07941beae7 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -44,8 +44,8 @@ eject() else var/gasdrained = min(powerproduction_drain*drainratio,loaded_tank.air_contents.gases[/datum/gas/plasma]) - loaded_tank.air_contents.gases[/datum/gas/plasma] -= gasdrained - loaded_tank.air_contents.gases[/datum/gas/tritium] += gasdrained + loaded_tank.air_contents.gases[/datum/gas/plasma] -= 2.7 * gasdrained + loaded_tank.air_contents.gases[/datum/gas/tritium] += 2.7 * gasdrained GAS_GARBAGE_COLLECT(loaded_tank.air_contents.gases) var/power_produced = RAD_COLLECTOR_OUTPUT