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

271 Commits

Author SHA1 Message Date
CitadelStationBot
0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -07:00
CitadelStationBot
7c65bae7ba Cleaned up doubled turf on omega (#2150) 2017-07-26 22:56:43 -07:00
CitadelStationBot
7cdeae21a5 Moved abductor ships further apart (#2149) 2017-07-26 22:56:13 -07:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
LetterJay
51846b1efd Merge pull request #2122 from Citadel-Station-13/upstream-merge-29485 
[MIRROR] Map Spellcheck
 2017-07-25 12:56:27 -05:00
CitadelStationBot
b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot
32586afe69 cerestation grammar fix 2017-07-24 21:16:41 -05:00
CitadelStationBot
37b9e24bc0 Removes the gulag sink and water bottles from the sustenance vendor. (#2094) 2017-07-24 04:08:56 -07:00
CitadelStationBot
49ee9d6cc9 roundstart AT cleanup (#2103) 2017-07-24 04:07:02 -07:00
LetterJay
1e2fd6c235 Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293 
[MIRROR] Made cell / holding cell windoors their own subtype
 2017-07-19 13:41:37 -05:00
LetterJay
e94cb572e7 Merge pull request #2077 from Citadel-Station-13/upstream-merge-29328 
[MIRROR] [Delta] fixed doppler direction
 2017-07-19 13:30:59 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBot
66b42903cb [Delta] fixed doppler direction 2017-07-19 10:25:33 -05:00
CitadelStationBot
b29641d23e [Meta] Minor Whiteship Edits (#2042) 2017-07-17 22:55:42 -07:00
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
755de4f223 Made cell / holding cell windoors their own subtype 2017-07-17 06:52:17 -05:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05: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
CitadelStationBot
3b06da0774 Converts shelter_2.dmm to TGM (#1733) 2017-06-30 20:20:14 -07:00
Poojawa
789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
LetterJay
10909c9dee Update oldstation.dmm 2017-06-27 12:21:49 -05:00
LetterJay
7d7078e7a6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-06-26 06:32:33 -05:00
LetterJay
a4526e8c39 cerestation.dmm 2017-06-26 06:32:22 -05:00
LetterJay
e3b1838e63 Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600 
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
 2017-06-26 06:24:31 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00