LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
kevinz000
eba429f5b1
Hand teleporter and portal fixes. ( #32689 )
2017-11-14 13:11:55 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
kevinz000
42deca4f72
Fixes hand tele losing ranged portal-dispel function ( #32408 )
...
* Fixes hand teles not dispelling at range
2017-11-06 14:43:14 -06:00
Leo
cf6ee8d4c2
Merge pull request #32288 from kevinz000/patch-369
...
Fixes hand tele adjacent attacks teleporting you
2017-11-01 21:38:21 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
LetterJay
3df2049f44
Update teleportation.dm
2017-10-13 22:31:10 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
