shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,904 Commits 5 Branches 0 Tags
809951c56c04f1ef2e462b16abfa4e984f0e5c2e
Commit Graph
149 Commits
Author SHA1 Message Date
LetterJayandGitHub 809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176 
[MIRROR] loc -- > forcemove
 2017-11-14 15:58:20 -06:00
orangesandCitadelStationBot 43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJayandGitHub d6e5942baf Merge branch 'master' into upstream-merge-31176 2017-11-09 03:24:38 -06:00
Tad HardestyandCitadelStationBot a0801a8e92 Scale fullscreen overlays to the view size 2017-11-05 04:52:40 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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 GainesandCitadelStationBot b97e1741df fixes shuttle parallax again (#32350) 2017-11-03 15:53:34 -05:00
LetterJayandGitHub d0c1964181 Update shuttle.dm 2017-11-02 02:21:40 -05:00
orangesandCitadelStationBot 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 GainesandCitadelStationBot a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
CitadelStationBotandPoojawa f6331eedf8 [MIRROR] Shuttle navigation computers ignore the shuttle when placing a new location (#3596) 
* Shuttle navigation computers ignore the shuttle when placing a new location (#31722)

* Fixed the shuttle navigation computer allowing you to move stationary docking ports

* Made the shuttle navigation computer ignore the shuttle it controls when determining valid turfs

* Removed a redundant list

* Moved a var from stationary docking ports to mobile docking ports

* Removed a sanity check

* Shuttle navigation computers ignore the shuttle when placing a new location
 2017-10-25 20:03:11 -05:00
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
kevinz000andCitadelStationBot 033d14e8b3 loc -- > forcemove 2017-10-12 06:13:11 -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