From 21dad8bdc079e9b82c29d0d4fceba33af1c31c64 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 16 May 2015 14:42:23 +0200 Subject: [PATCH 1/3] Teleport anomaly fix. It should no longer teleport mobs inside other atoms. Making the dangerous assumption that touch-teleportation actually works. --- .../xenoarchaeology/artifact/effects/unknown_effect_teleport.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm index b8d1c9a87cd..6f6d7f88f35 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm @@ -34,7 +34,7 @@ sparks.set_up(3, 0, get_turf(M)) sparks.start() // - M.loc = pick(orange(get_turf(T), 50)) + M.Move(pick(trange(50, get_turf(holder)))) sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(3, 0, get_turf(M)) sparks.start() From 76b828ab7d6ec8e7976569a571fd8ec29679a301 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sat, 16 May 2015 14:47:04 +0200 Subject: [PATCH 2/3] Changelog entry. --- html/changelogs/PsiOmegaDelta-ArtifactTele-150516.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-ArtifactTele-150516.yml diff --git a/html/changelogs/PsiOmegaDelta-ArtifactTele-150516.yml b/html/changelogs/PsiOmegaDelta-ArtifactTele-150516.yml new file mode 100644 index 00000000000..3e259687bac --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-ArtifactTele-150516.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - bugfix: "Teleporter artifacts should no longer teleport mobs inside objects." From 7433e6b7d2eb2391ed97c09ff574e92cd93712f9 Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Sun, 17 May 2015 01:40:41 -0400 Subject: [PATCH 3/3] Travis.yml change to check for duplicate nanoUI templates. The way nanoUI works having two templates with same MD5 hash means that one won't be sent to the clients as the resource sending function in byond uses MD5hash and MD5hash only to determine if someone has a file. This bug doesn't show up in Windows for some reason but is something we'd want to watch out for. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9d86d85229f..02174a82978 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,5 @@ install: script: - shopt -s globstar - (! grep 'step_[xy]' maps/**/*.dmm) + - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano) - DreamMaker baystation12.dme