cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source
This commit is contained in:
PsiOmega
2015-05-17 11:30:04 +02:00
parent 13b26cff8e b423ba7bc4
commit c16d033b18
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -19,4 +19,5 @@ install:
script: script:
- shopt -s globstar - shopt -s globstar
- (! grep 'step_[xy]' maps/**/*.dmm) - (! grep 'step_[xy]' maps/**/*.dmm)
- (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano)
- DreamMaker baystation12.dme - DreamMaker baystation12.dme

2
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm
View File

@@ -34,7 +34,7 @@
sparks.set_up(3, 0, get_turf(M)) sparks.set_up(3, 0, get_turf(M))
sparks.start() 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 = new /datum/effect/effect/system/spark_spread()
sparks.set_up(3, 0, get_turf(M)) sparks.set_up(3, 0, get_turf(M))
sparks.start() sparks.start()

5
html/changelogs/PsiOmegaDelta-ArtifactTele-150516.yml Normal file
View File

@@ -0,0 +1,5 @@
author: PsiOmegaDelta
delete-after: True
changes:
- bugfix: "Teleporter artifacts should no longer teleport mobs inside objects."