From f38ac0dfbf86960f56ccce8d475bfddd534bd826 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Thu, 8 Aug 2019 01:49:06 -0400 Subject: [PATCH 1/9] possibly makes teleporter hate all races equally let's go --- 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) From 5fcb94d8d67459e48a6bbcbbe1ab63734877f57e Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 02:12:31 -0400 Subject: [PATCH 2/9] Update teleporter.dm --- code/game/machinery/teleporter.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 2c54b8b793..64081a77e4 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -72,6 +72,7 @@ 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) From 2b3e53d7d620c819dc937087cd85a4624e79f7b4 Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 02:23:59 -0400 Subject: [PATCH 3/9] Update teleporter.dm --- 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 64081a77e4..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/human = M - if(human.dna && human.dna.species.id == "human") + 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 c963f5e43e000f8efcf879e517609ab937749ad1 Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 02:40:51 -0400 Subject: [PATCH 4/9] Update teleporter.dm --- 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..9e46198787 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 = M + if(human.dna) 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 85dc61f84d8062ea409d2f8d6771ac9060df2ab9 Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 02:55:14 -0400 Subject: [PATCH 5/9] 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 6/9] 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 7/9] 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) From 2dc15b3fc01d198052db21a6a9e7fc4bd8d8f2e0 Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 8 Aug 2019 15:05:48 -0400 Subject: [PATCH 8/9] Update teleporter.dm --- code/game/machinery/teleporter.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 9e46198787..785297529e 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -68,15 +68,14 @@ if (ismovableatom(M)) if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE)) use_power(5000) - if(!calibrated && prob(30 - ((accurate) * 10))) //oh dear a problem + var/mob/living/carbon/C = M + if(C.dna && C.dna.species && C.dna.species.id != "fly" && !HAS_TRAIT(C, TRAIT_RADIMMUNE)) + if(!calibrated && iscarbon(M) && 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) - to_chat(M, "You hear a buzzing in your ears.") - human.set_species(/datum/species/fly) + to_chat(M, "You hear a buzzing in your ears.") + C.set_species(/datum/species/fly) - human.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), EFFECT_IRRADIATE, 0) + C.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), EFFECT_IRRADIATE, 0) calibrated = 0 return From a9eeb28fff58018cabb137637835e2f5fb894583 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Thu, 8 Aug 2019 21:09:11 +0200 Subject: [PATCH 9/9] Uncalibrated teleporters can now turn furries, scalies & co into flypeople too. --- code/game/machinery/teleporter.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 64081a77e4..b2f05e6747 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -68,16 +68,15 @@ if (ismovableatom(M)) if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE)) 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/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) + if(!calibrated && iscarbon(M) && prob(30 - ((accurate) * 10))) //oh dear a problem + var/mob/living/carbon/C = M + if(C.dna?.species && C.dna.species.id != "fly" && !HAS_TRAIT(C, TRAIT_RADIMMUNE)) + to_chat(C, "You hear a buzzing in your ears.") + C.set_species(/datum/species/fly) + log_game("[C] ([key_name(C)]) was turned into a fly person") + C.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 + calibrated = FALSE return /obj/machinery/teleport/hub/update_icon()