shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,685 Commits 5 Branches 0 Tags
8d9dc6dd136647149db6f0bc274a4e0729a2b0cd
Commit Graph

202 Commits

Author SHA1 Message Date
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot
d286ed197e Cleaned up duped vars 2017-07-15 22:28:58 -05:00
CitadelStationBot
3f1204e31d [Deltastation] Fixes some access issues 2017-07-13 17:46:30 -05:00
CitadelStationBot
cce816f900 Fixed walls on pubby shuttle (#1968) 2017-07-10 16:13:37 -07:00
CitadelStationBot
ce82313f30 Alters Meta's robo resources to an amount closer to Box's (#1966) 2017-07-10 16:13:27 -07:00
CitadelStationBot
292bed59f0 Adds a crew monitoring console to the warden's office in BoxStation 2017-07-09 19:43:35 -05:00
CitadelStationBot
acb20fcde2 Box Viro Wants Plasma v2 2017-07-08 09:45:42 -05:00
CitadelStationBot
a85476ec78 Corrected misplaced vents on Delta (#1939) 2017-07-07 23:48:37 -07:00
TalkingCactus
cb5247d060 Fixes Gamemode Voting & Map Edits (#1937) 
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
 2017-07-07 17:54:53 -04:00
LetterJay
85b4996267 Merge pull request #1912 from Citadel-Station-13/upstream-merge-29062 
[MIRROR] Adds wires to armory on Meta
 2017-07-06 22:46:15 -05:00
LetterJay
642817d144 Merge pull request #1911 from Citadel-Station-13/upstream-merge-29063 
[MIRROR] Adds aux resources to Delta's aux storage
 2017-07-06 22:46:03 -05:00
LetterJay
24ec38bfe3 Merge pull request #1910 from Citadel-Station-13/upstream-merge-29065 
[MIRROR] Renames mech bay APC on Pubby
 2017-07-06 22:45:48 -05:00
LetterJay
2a5ad74faf Merge pull request #1909 from Citadel-Station-13/upstream-merge-29070 
[MIRROR] Replaces centcom admin mirrors with normal ones
 2017-07-06 22:45:35 -05:00
LetterJay
169983ff9d Merge pull request #1908 from Citadel-Station-13/upstream-merge-29069 
[MIRROR] Replaces useless teleporter consoles on bridge
 2017-07-06 22:45:19 -05:00
LetterJay
e0db6cd92b Merge pull request #1907 from Citadel-Station-13/upstream-merge-29067 
[MIRROR] Sets wall in pod evac area on centcom to nodiag
 2017-07-06 22:45:03 -05:00
CitadelStationBot
d653febeb2 Adds wires to armory on Meta 2017-07-06 19:19:31 -05:00
CitadelStationBot
e413712d68 Adds aux resources to Delta's aux storage 2017-07-06 19:19:27 -05:00
CitadelStationBot
6fdbee9f2f Renames mech bay APC on Pubby 2017-07-06 19:18:22 -05:00
CitadelStationBot
b83a702ff7 Replaces centcom admin mirrors with normal ones 2017-07-06 19:18:19 -05:00
CitadelStationBot
990aec3d14 Replaces useless teleporter consoles on bridge 2017-07-06 19:18:14 -05:00
CitadelStationBot
7c8b4da022 Sets wall in pod evac area on centcom to nodiag 2017-07-06 19:17:09 -05:00
CitadelStationBot
cbbd49b88a reconnected APC in sec and HOP office on Omega 2017-07-06 19:17:05 -05:00
CitadelStationBot
75fe249947 Replaces highpressure windows with plasma windows 2017-07-06 09:11:50 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00
LetterJay
a4526e8c39 cerestation.dmm 2017-06-26 06:32:22 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJay
ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227 
[MIRROR] Clown Toy Box + Wooden Crates
 2017-06-26 04:29:08 -05:00
LetterJay
fd9b9608ce Delete cerestation.dmm 2017-06-26 03:40:30 -05:00
LetterJay
609ccb554c Delete cerestation.dmm 2017-06-26 03:27:00 -05:00
LetterJay
eb055bc1ec more and more 2017-06-19 16:56:38 -05:00
CitadelStationBot
8cd87a0866 Adds a single D4 to Lavaland mining base 2017-06-18 09:49:06 -05:00
CitadelStationBot
3c6b2db665 [Omega] Cleaned up unconnected atmos pipes (#1578) 2017-06-17 13:36:44 -07:00
CitadelStationBot
bd59fee5f7 Fixed PubbyStation piping (#1626) 2017-06-17 13:28:45 -07:00
CitadelStationBot
7db1cc2397 [Delta] fixed doubled up pen blast door (#1605) 2017-06-17 13:26:59 -07:00
LetterJay
a2a897220f Merge pull request #1353 from Citadel-Station-13/upstream-merge-27952 
[MIRROR] [Box] Removes extra unattached vent from Xenobiology Lab
 2017-06-14 08:49:14 -05:00
LetterJay
e1e60417f2 Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884 
[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
 2017-06-14 08:49:01 -05:00
LetterJay
40065d004f Create tgstation.2.1.4.dmm 2017-06-14 08:20:52 -05:00
LetterJay
3c1af1d450 Merge pull request #1361 from Citadel-Station-13/upstream-merge-27967 
[MIRROR] Fixes thunderdome, moves delta nuke op shuttle locations a bit.
 2017-06-14 08:20:50 -05:00
LetterJay
885297aec3 Update cerestation.dmm 2017-06-14 08:18:20 -05:00
LetterJay
36a9810945 map fix 2017-06-11 01:51:56 -05:00
LetterJay
7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
CitadelStationBot
f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
LetterJay
6a819ed7a4 Merge pull request #1493 from Citadel-Station-13/upstream-merge-28190 
[MIRROR] [Meta] atmosia pump layer fix
 2017-06-09 09:36:21 -05:00
LetterJay
910fcb01bd Merge pull request #1316 from Citadel-Station-13/upstream-merge-27869 
[MIRROR] [Omega] Fixes checkered plating
 2017-06-09 09:13:46 -05:00
CitadelStationBot
c013ce4793 [Delta] Ridin' Dirty 2017-06-08 17:19:14 -05:00
CitadelStationBot
356ea18e95 [Meta] atmosia pump layer fix 2017-06-08 17:16:56 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
LetterJay
3d750adbd7 master cleanup 2017-06-05 22:50:31 -05:00