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
cf6ee8d4c2
Merge pull request #32288 from kevinz000/patch-369
...
Fixes hand tele adjacent attacks teleporting you
2017-11-01 21:38:21 -05:00
3df2049f44
Update teleportation.dm
2017-10-13 22:31:10 -05:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
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
kevinz000