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

194 Commits

Author SHA1 Message Date
LetterJay
68b44e73f4 Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734 
[MIRROR] Makes cyclelinkeddir rotate with shuttle
 2017-12-30 05:06:32 -06:00
LetterJay
ac7750202b Update shuttle_rotate.dm 2017-12-29 18:38:05 -06:00
LetterJay
518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
deathride58
aa83dbf500 Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759 
[MIRROR] Modified the starting locations of advanced camera console eyes
 2017-12-28 02:54:18 +00:00
LetterJay
e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
Cruix
b0facbda47 Fixed shuttle docking computers not working more than once (#33782) 
* Fixed shuttle docking computers not moving the docking port if it already existed

* Removed explicit type instantiation
 2017-12-26 23:44:16 -06:00
LetterJay
95642e631f Update shuttle.dm 2017-12-26 05:28:55 -06:00
Emmett Gaines
9ece43116d Makes cyclelinkeddir rotate with shuttle 2017-12-25 19:16:47 -06:00
Cruix
8465defbb0 Modified the starting locations of advanced camera console eyes (#33759) 
* Modified the starting locations of advanced camera console eyes
Made shuttle navigation computers no longer work on z levels they are not locked to

* Advanced camera eyes do not start on the console if they use static and the console is in camera view but not on a usable z-level
 2017-12-25 19:14:33 -06:00
WJohn
6cfd346bdd Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731) 2017-12-22 10:35:47 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Emmett Gaines
8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -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
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58
7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
Cruix
2afb3c0368 Fixed several bad type checks in shuttle procs (#33497) 2017-12-13 21:09:23 -06:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -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
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08: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
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148 
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
 2017-12-10 23:50:20 +00:00
Emmett Gaines
35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
deathride58
68d7347c02 Update white_ship.dm 2017-12-10 17:55:46 -05:00
uraniummeltdown
d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -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
8b9e15d1b5 Merge pull request #33324 from deathride58/foreignfurryaddswidescreen 
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
 2017-12-08 10:35:23 -06:00
Jordan Brown
28c4705750 Merge pull request #33312 from ninjanomnom/oldturf 
old turf in afterShuttleMove
 2017-12-06 22:51:09 -06:00
Cruix
e9f307af8e Fixed a rare custom shuttle docker client crash (#33086) 2017-11-27 11:46:32 -06:00
ShizCalev
4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
deathride58
ed9b99a166 Merge pull request #4108 from Citadel-Station-13/upstream-merge-33026 
[MIRROR] Fixed mobs getting rotated by shuttles even if they are not moved
 2017-11-24 23:14:14 +00:00
Cruix
a29d4a5d11 Fixed mobs getting rotated by shuttles even if they are not moved (#33026) 2017-11-24 13:00:34 -06:00
Emmett Gaines
0b07f80b62 custom docker improvements (#32626) 2017-11-24 12:59:17 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
KorPhaeron
8242b08d28 Bar Drone can't be remotely detonated (#32908) 2017-11-20 13:40:23 -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
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58
49c72a8a91 Update on_move.dm 2017-11-17 23:39:06 -05:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176 
[MIRROR] loc -- > forcemove
 2017-11-14 15:58:20 -06:00
oranges
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
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
d6e5942baf Merge branch 'master' into upstream-merge-31176 2017-11-09 03:24:38 -06:00
Tad Hardesty
a0801a8e92 Scale fullscreen overlays to the view size 2017-11-05 04:52:40 -06:00