shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1 from Ghommie/Ghommie-cit185

Browse Source 
Uncalibrated teleporters can now turn furries, scalies & co into flypeople.
This commit is contained in:
kappa-sama
2019-08-08 18:25:24 -04:00
committed by GitHub
parent 2dc15b3fc0 a7287ed4d1
commit 1853dc185c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/teleporter.dm
+7 -7
View File
@@ -68,15 +68,15 @@
if (ismovableatom(M)) if (ismovableatom(M))
if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE)) if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE))
use_power(5000) use_power(5000)
var/mob/living/carbon/C = M if(!calibrated && iscarbon(M) && prob(30 - ((accurate) * 10))) //oh dear a problem
if(C.dna && C.dna.species && C.dna.species.id != "fly" && !HAS_TRAIT(C, TRAIT_RADIMMUNE)) var/mob/living/carbon/C = M
if(!calibrated && iscarbon(M) && prob(30 - ((accurate) * 10))) //oh dear a problem if(C.dna?.species && C.dna.species.id != "fly" && !HAS_TRAIT(C, TRAIT_RADIMMUNE))
log_game("[M] ([key_name(M)]) was turned into a fly person") to_chat(C, "<span class='italics'>You hear a buzzing in your ears.</span>")
to_chat(M, "<span class='italics'>You hear a buzzing in your ears.</span>")
C.set_species(/datum/species/fly) 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) C.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), EFFECT_IRRADIATE, 0)
calibrated = 0
calibrated = FALSE
return return
/obj/machinery/teleport/hub/update_icon() /obj/machinery/teleport/hub/update_icon()