shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,296 Commits 5 Branches 0 Tags
aabbbb9dffb92e440a65bbadbae5c349ccecdc5c
Commit Graph

72 Commits

Author SHA1 Message Date
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
LetterJay
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
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay
e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
LetterJay
95642e631f Update shuttle.dm 2017-12-26 05:28:55 -06:00
Emmett Gaines
9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
Emmett Gaines
8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
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
Cruix
2afb3c0368 Fixed several bad type checks in shuttle procs (#33497) 2017-12-13 21:09:23 -06:00
Jordan Brown
367872f962 Merge pull request #33457 from ninjanomnom/check-your-tick 
Check ticks some more in dock()
 2017-12-12 13:05:49 -06:00
Leo
9a0961c320 Merge pull request #33462 from ninjanomnom/dont-be-so-negative 
Ordered turfs quickfix
 2017-12-11 12:15:29 -06:00
deathride58
71c3a8266a Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424 
[MIRROR] Standardization of return_ordered_turfs
 2017-12-11 00:06:54 +00:00
Emmett Gaines
35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
Cruix
746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
Jordan Brown
b6653dd94c Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem 
Allows for qdel in shuttleMove procs
 2017-12-09 15:53:57 -06:00
Jordan Brown
28c4705750 Merge pull request #33312 from ninjanomnom/oldturf 
old turf in afterShuttleMove
 2017-12-06 22:51:09 -06:00
Emmett Gaines
0b07f80b62 custom docker improvements (#32626) 2017-11-24 12:59:17 -06:00
Jordie
aea39fdd49 Merge pull request #32886 from ShizCalev/to_chat 
Fixes incorrect to_chat usage
 2017-11-19 22:26:28 -06:00
LetterJay
c3aa4c5929 Merge pull request #3778 from Citadel-Station-13/upstream-merge-32350 
[MIRROR] Fixes shuttle parallax again
 2017-11-04 22:33:30 -05:00
LetterJay
1c131962d4 Merge pull request #3745 from Citadel-Station-13/upstream-merge-32269 
[MIRROR] Makes enterTransit check canMove and sets mode to idle
 2017-11-04 22:31:17 -05:00
Emmett Gaines
b97e1741df fixes shuttle parallax again (#32350) 2017-11-03 15:53:34 -05:00
LetterJay
d0c1964181 Update shuttle.dm 2017-11-02 02:21:40 -05:00
oranges
eb7ee7fb58 Merge pull request #32269 from ninjanomnom/cargo-shuttle-moblock 
Makes enterTransit check canMove and sets mode to idle
 2017-11-01 21:37:50 -05:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
Emmett Gaines
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
Cruix
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
Jordan Brown
2a68dce1ed Fixes ruins spawning over shuttle docks 2017-10-12 16:02:39 -05:00
LetterJay
47b72055cd Update shuttle.dm 2017-10-05 05:19:49 -05:00
Emmett Gaines
d50c0e10f6 Makes shuttle movement a bit smoother and faster 2017-10-05 02:31:10 -05:00
Emmett Gaines
2610101820 fixes shuttles creating duplicate area types (#31008) 2017-09-26 07:26:37 -05:00
CitadelStationBot
fc62f8bf3e [MIRROR] Shuttle multi-tile object fix (#2748) 
* multi-tile object fix (#30674)

* Shuttle multi-tile object fix
 2017-09-14 07:37:54 -05:00
CitadelStationBot
82d0aae420 [MIRROR] Changes shuttle port direction var from an angle to a dir (#2613) 
* Changes shuttle port direction var from an angle to a dir

* actually ports the directions

* Update shuttle.dm

* how
 2017-09-13 20:39:55 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
9adcc174b3 Update shuttle.dm 2017-09-11 17:09:44 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
LetterJay
92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
CitadelStationBot
9b00f12ba0 Makes the shuttle code a little bit more robust by removing a snowflake loop (#2559) 2017-09-04 01:36:00 -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
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
c3ccae5298 Fixes stuff on shuttles not rotating in the proper direction 2017-08-05 12:20:30 -05:00
CitadelStationBot
20d86558d2 Cleans up jumpToNullSpace proc a bit and fixes pod doors 2017-07-20 22:25:57 -05:00
CitadelStationBot
0b7d08d5ac Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc 2017-07-19 04:05:53 -05:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00