shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,793 Commits 5 Branches 0 Tags
514533ddaf81b602020558c41b53ae5594e83a36
Commit Graph
135 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa 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 GainesandCitadelStationBot 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
CruixandCitadelStationBot 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 BrownandCitadelStationBot 4d110d9b70 Merge pull request #31661 from ninjanomnom/custom-docker 
Fixes custom shuttle docker display
 2017-10-14 18:55:03 -05:00
LetterJayandGitHub aed26b120c Merge pull request #3350 from Citadel-Station-13/upstream-merge-31584 
[MIRROR] Fixes ruins spawning over shuttle docks
 2017-10-13 23:36:10 -04:00
Jordan BrownandCitadelStationBot 7ef36802ff Merge pull request #31588 from ninjanomnom/shuttle-parallax 
Fixes stationary mob parallax
 2017-10-12 16:07:12 -05:00
Jordan BrownandCitadelStationBot 2a68dce1ed Fixes ruins spawning over shuttle docks 2017-10-12 16:02:39 -05:00
orangesandCitadelStationBot 494bb0222c Makes cameras work on shuttles 2017-10-10 03:15:13 -05:00
LetterJay ea41c07221 white 2017-10-08 22:47:42 -05:00
LetterJayandGitHub 71cec9faad Merge pull request #3223 from Citadel-Station-13/upstream-merge-31409 
[MIRROR] Buckled mobs rotation fix
 2017-10-08 16:21:24 -04:00
LetterJayandGitHub 8ea93639ca Merge pull request #3222 from Citadel-Station-13/upstream-merge-31405 
[MIRROR] Gives ghosts direction is their meaningless existence
 2017-10-08 16:21:06 -04:00
Jordan BrownandCitadelStationBot 8c4e9d6a02 Merge pull request #31409 from ninjanomnom/buckled-mobs 
Buckled mobs rotation fix
 2017-10-08 01:48:55 -05:00
Emmett GainesandCitadelStationBot e5e8a807a2 fixes directionless ghosts having direction (#31405) 2017-10-08 01:37:34 -05:00
ShizCalevandCitadelStationBot 92ec5c11ab Fixes being able to sell camera mobs to CentCom (#31306) 
* Fixes being able to sell camera mobs to CENTCOM

* Did it Ninja's way.
 2017-10-07 19:13:28 -05:00
LetterJayandGitHub 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
LetterJayandGitHub a1ae6add27 Merge pull request #3152 from Citadel-Station-13/upstream-merge-31296 
[MIRROR] Cleans up and fixes old landmarks
 2017-10-05 09:12:35 -04:00
LetterJayandGitHub 47b72055cd Update shuttle.dm 2017-10-05 05:19:49 -05:00
orangesandCitadelStationBot bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup 
Cleans up and fixes old landmarks
 2017-10-05 03:05:40 -05:00
orangesandCitadelStationBot cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 03:05:32 -05:00
Emmett GainesandCitadelStationBot d50c0e10f6 Makes shuttle movement a bit smoother and faster 2017-10-05 02:31:10 -05:00
bawhoppenandCitadelStationBot 82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
LetterJayandGitHub 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
Jordan BrownandCitadelStationBot e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
KorPhaeronandCitadelStationBot 6fca708b33 Advanced camera consoles use a list for z lock rather than a single z level (#30661) 
* Refactor Abductor Console

* Station lock
 2017-09-28 10:44:12 -05:00
LetterJayandGitHub d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
Emmett GainesandCitadelStationBot 2610101820 fixes shuttles creating duplicate area types (#31008) 2017-09-26 07:26:37 -05:00
ShizCalevandCitadelStationBot 169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
orangesandCitadelStationBot 6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
CitadelStationBotandPoojawa 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
pubbyandCitadelStationBot a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 9d52a495b2 [MIRROR] Fix monastery shuttle + Pods (#2599) 
* Fix monastery shuttle + Pods

* actually ports podfix
 2017-09-13 17:58:25 -05:00
LetterJayandGitHub 1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJayandGitHub a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJayandGitHub cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJayandGitHub 9adcc174b3 Update shuttle.dm 2017-09-11 17:09:44 -05:00
LetterJayandGitHub 6b25a0e42b Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465 
[MIRROR] Fixes shuttle name on ramming.
 2017-09-11 15:22:36 -05:00
LetterJayandGitHub 726b86f3a4 Update on_move.dm 2017-09-11 14:18:28 -05:00
LetterJayandGitHub 2f10e78ba7 Update on_move.dm 2017-09-11 13:56:28 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
AnturKandCitadelStationBot 317958fb5c Fixes more CanPass misuse (#30493) 
* Fixes more CanPass misuse

* Let's not give wrong impression

* spans
 2017-09-09 19:41:02 -05:00
CitadelStationBotandPoojawa d35717e1ab [MIRROR] Fixes assault pod blinking docking effects (#2667) 
* Fixes assault pod blinking docking effects (#30492)

* Fixes assault pod blinking docking effects
 2017-09-08 20:15:10 -05:00
AnturKandCitadelStationBot c2c69d359f Fixes shuttle name on ramming. 2017-09-07 10:34:28 -05:00
LetterJay bae0563d47 initial commit 2017-09-05 16:17:50 -05:00
PoojawaandGitHub 3a76fdc2e9 Update supply.dm 2017-09-04 21:26:19 -05:00
LetterJayandPoojawa 92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
CitadelStationBotandPoojawa 9b00f12ba0 Makes the shuttle code a little bit more robust by removing a snowflake loop (#2559) 2017-09-04 01:36:00 -05:00
kevinz000andGitHub 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