From 85dc61f84d8062ea409d2f8d6771ac9060df2ab9 Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 02:55:14 -0400 Subject: [PATCH 1/3] Revert "Update teleporter.dm" This reverts commit c963f5e43e000f8efcf879e517609ab937749ad1. --- code/game/machinery/teleporter.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 9e46198787..5af01269ab 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -70,13 +70,13 @@ use_power(5000) if(!calibrated && prob(30 - ((accurate) * 10))) //oh dear a problem log_game("[M] ([key_name(M)]) was turned into a fly person") - if(ishuman(M))//don't remove people from the round randomly you jerks - var/mob/living/carbon/human = M - if(human.dna) + if(iscarbon(M))//don't remove people from the round randomly you jerks + var/mob/living/carbon = M + if(M.dna) to_chat(M, "You hear a buzzing in your ears.") - human.set_species(/datum/species/fly) + M.set_species(/datum/species/fly) - human.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), EFFECT_IRRADIATE, 0) + M.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), EFFECT_IRRADIATE, 0) calibrated = 0 return From 42c37d9de3bef2342be4fb21b4acd040c8ee135d Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 02:55:24 -0400 Subject: [PATCH 2/3] Revert "Update teleporter.dm" This reverts commit 2b3e53d7d620c819dc937087cd85a4624e79f7b4. --- code/game/machinery/teleporter.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 5af01269ab..64081a77e4 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -70,13 +70,13 @@ use_power(5000) if(!calibrated && prob(30 - ((accurate) * 10))) //oh dear a problem log_game("[M] ([key_name(M)]) was turned into a fly person") - if(iscarbon(M))//don't remove people from the round randomly you jerks - var/mob/living/carbon = M - if(M.dna) + if(ishuman(M))//don't remove people from the round randomly you jerks + var/mob/living/carbon/human/human = M + if(human.dna && human.dna.species.id == "human") to_chat(M, "You hear a buzzing in your ears.") - M.set_species(/datum/species/fly) + human.set_species(/datum/species/fly) - M.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), EFFECT_IRRADIATE, 0) + human.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), EFFECT_IRRADIATE, 0) calibrated = 0 return From 73e31aba04a69f59ccf23bfe521eb1d842b938f8 Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 02:55:27 -0400 Subject: [PATCH 3/3] Revert "Update teleporter.dm" This reverts commit 5fcb94d8d67459e48a6bbcbbe1ab63734877f57e. --- code/game/machinery/teleporter.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 64081a77e4..2c54b8b793 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -72,7 +72,6 @@ log_game("[M] ([key_name(M)]) was turned into a fly person") if(ishuman(M))//don't remove people from the round randomly you jerks var/mob/living/carbon/human/human = M - if(human.dna && human.dna.species.id == "human") to_chat(M, "You hear a buzzing in your ears.") human.set_species(/datum/species/fly)