c1436c4c7b
Maptick lag minimization port ( #12066 )
...
* extools.dll
* backend
* queued pipenet builds
* oh yeah we don't have that
* wow
* Update air.dm
2020-05-03 03:34:33 +02:00
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
5fcf5b1c5e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-10-29 13:38:16 +01:00
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
411e0cc2cc
Update on_move.dm
2019-08-12 00:17:31 -07:00
d6e54bf237
Fixes and updates pod's emergency suits storage.
2019-06-02 18:28:30 +02:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
a7b900425b
[s] Prevent unbreakable ladders from being moved by shuttles ( #38477 )
...
* Prevent unbreakable ladders from being moved by shuttles
* Disconnect ladders before and reconnect them after shuttle move
2018-06-16 06:18:08 -05:00
5e15a988f6
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
20823c0c1b
Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks
...
Fix cycle-linked airlocks on shuttles
2018-04-19 03:15:01 -05:00
2570cefb40
[MIRROR] Fixes shuttles breaking when the turf the mobile dock is on is removed ( #5880 )
...
* Fixes shuttles breaking when the turf the mobile dock is on is removed (#36261 )
* Fixes shuttles breaking when the turf the mobile dock is on is removed
2018-03-10 07:37:58 -06:00
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
f2f6d9d910
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
...
# Conflicts:
# code/modules/events/alien_infestation.dm
# code/modules/events/spider_infestation.dm
# code/modules/events/vent_clog.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
2018-01-02 05:16:13 -06:00
30d4b25aee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
2018-01-01 14:09:07 -06:00
dae3c3efb5
Merge branch 'master' into upstream-merge-33621
2017-12-30 13:23:39 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
0f2fd05e87
removes silly garbage defines
2017-12-19 08:02:18 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
c27c52cf58
Player Z-tracking, again
2017-12-14 17:35:35 -06:00
28c4705750
Merge pull request #33312 from ninjanomnom/oldturf
...
old turf in afterShuttleMove
2017-12-06 22:51:09 -06:00
a29d4a5d11
Fixed mobs getting rotated by shuttles even if they are not moved ( #33026 )
2017-11-24 13:00:34 -06:00
49c72a8a91
Update on_move.dm
2017-11-17 23:39:06 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
a9f07518a7
Shuttle rotation refactor and significant performance upgrade
2017-10-31 20:23:57 -05:00
8a336215f1
Next round of shuttle fixes at the cost of a small piece of my sanity ( #31784 )
...
* shuttle bugs begone
* cleanup
2017-10-17 12:00:46 -05:00
f2f2f349ca
Fixed the shuttle navigation computer allowing you to move docking ports ( #31721 )
...
* Fixed the shuttle navigation computer allowing you to move stationary docking ports
* Moved a var from stationary docking ports to mobile docking ports
* Removed a sanity check
2017-10-16 23:02:02 -05:00
7ef36802ff
Merge pull request #31588 from ninjanomnom/shuttle-parallax
...
Fixes stationary mob parallax
2017-10-12 16:07:12 -05:00
033d14e8b3
loc -- > forcemove
2017-10-12 06:13:11 -05:00
494bb0222c
Makes cameras work on shuttles
2017-10-10 03:15:13 -05:00
cf37555c4d
Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302
...
[MIRROR] Move shuttleRotate into the shuttle module
2017-10-05 09:13:41 -04:00
cedb56af1b
Merge pull request #31302 from ninjanomnom/shuttle-rotation
...
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
d50c0e10f6
Makes shuttle movement a bit smoother and faster
2017-10-05 02:31:10 -05:00
9c9020ec32
[MIRROR] Removes dead testing code ( #2854 )
...
* Merge pull request #30860 from ninjanomnom/quickfix
Removes dead testing code
* Removes dead testing code
2017-09-19 06:24:12 -05:00
726b86f3a4
Update on_move.dm
2017-09-11 14:18:28 -05:00
2f10e78ba7
Update on_move.dm
2017-09-11 13:56:28 -05:00
c2c69d359f
Fixes shuttle name on ramming.
2017-09-07 10:34:28 -05:00
9b00f12ba0
Makes the shuttle code a little bit more robust by removing a snowflake loop ( #2559 )
2017-09-04 01:36:00 -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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
0b7d08d5ac
Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 04:05:53 -05:00
8d9dc6dd13
[MIRROR] Fixes a ... likely important bug with shuttle code.... ( #2061 )
...
* Fixes a ... likely important bug with shuttle code....
* Delete turf.dm.rej
* Update turf.dm
2017-07-18 06:01:02 -07:00
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
kevinz000