shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,356 Commits 5 Branches 0 Tags
750baf3dcafe2e9c5bd2fb22b24e886ad934a1bd
Commit Graph

155 Commits

Author SHA1 Message Date
LetterJay
750baf3dca multi level 2017-05-29 02:15:26 -05:00
LetterJay
aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 2017-05-29 02:12:41 -05:00
CitadelStationBot
6b6a156c2f Lavaland Lighting Fix + ruin varedit cleanup (#1257) 2017-05-28 15:27:50 -07:00
CitadelStationBot
29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot
6c1159bf85 Puts the Viruses back in the viro fridge at the syndicate base. (#1229) 2017-05-27 13:27:33 -07:00
CitadelStationBot
9e14458188 Removes Fastload.dmm 2017-05-26 14:36:26 -05:00
CitadelStationBot
b95b6dca00 Raven Ship Blast Door Fix 2017-05-24 08:25:53 -05:00
CitadelStationBot
0da4f06c59 Add Glass Panes to Box Armoury Weapon Racks 2017-05-24 05:49:30 -05:00
CitadelStationBot
4ac787e3bb Adds a toy weapon vendor into the syndie lavaland base firing range 2017-05-22 22:10:47 -05:00
LetterJay
65c24a5fde Merge branch 'master' into upstream-merge-27440 2017-05-22 11:33:55 -05:00
CitadelStationBot
4e5617ad54 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base 2017-05-21 22:28:10 -05:00
CitadelStationBot
813ea3bee6 Merge loadallmaps.dm into basemap.dm 2017-05-20 21:27:10 -05:00
LetterJay
62e3eb8718 Merge pull request #1043 from Citadel-Station-13/upstream-merge-27358 
[MIRROR] [Delta] Adds freon tank to engineering secure storage
 2017-05-18 23:45:20 -04:00
CitadelStationBot
bcf7ff1ddb [Delta] Adds freon tank to engineering secure storage 2017-05-18 16:37:38 -05:00
CitadelStationBot
abb9676c31 [Cere] Atmospherics Revamp 2017-05-18 16:37:34 -05:00
CitadelStationBot
6ff8de633b Syndicate Base Virology Smart Fridge now has Viruses in it (#1001) 2017-05-18 13:12:04 -05:00
CitadelStationBot
df0b468cef [Pubby] Adds APC to Engineering (#1008) 2017-05-18 12:24:38 -05:00
CitadelStationBot
67c0463bbb Removes that description on the Second MetaStation Sign (#1007) 2017-05-18 12:24:16 -05:00
CitadelStationBot
9c27020b56 [Omega] Removed duplicate APC in bar (#1005) 2017-05-18 12:23:57 -05:00
CitadelStationBot
bb7d8d6bbf [Delta] Cleaned up thermo filter line in SM room #2 (#1004) 2017-05-18 12:23:35 -05:00
CitadelStationBot
65a33dc658 Corrects Baseturfs for Dragoon Tomb (#995) 2017-05-18 12:04:48 -05:00
CitadelStationBot
7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
cb03dd5d0d [MIRROR] Smartfridges only come preloaded at map start (#837) 
* Smartfridges only come preloaded at map start

* update CitadelStation-1.2.1.dmm
 2017-05-18 01:12:31 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
CitadelStationBot
9f63a77cb8 [Box] Area Power Fixes 2017-05-15 07:00:57 -05:00
CitadelStationBot
3644e9585e Cerestation Tweaks MKV (#683) 2017-05-14 20:25:28 -07:00
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
LetterJay
8cce0f181a Merge pull request #940 from Citadel-Station-13/upstream-merge-27168 
[MIRROR] Make Hermit Ruin more self-sufficient
 2017-05-14 16:30:16 -04:00
CitadelStationBot
73101cbd88 Free Golems can purchase their own royal capes 2017-05-13 21:17:37 -05:00
CitadelStationBot
80de24c491 Make Hermit Ruin more self-sufficient 2017-05-13 18:01:05 -05:00
CitadelStationBot
bec5a73f6c Tweak Meta Kill Room Areas (#883) 2017-05-10 16:11:43 -07:00
CitadelStationBot
4e957c7de2 CC Ferry can now dock at Omega (#880) 2017-05-10 16:03:59 -07:00
CitadelStationBot
8e0e77cd35 Nerfs Chaplain smoke book. (#758) 2017-05-08 16:45:59 -07:00
kevinz000
ce7b714ada Merge pull request #730 from Citadel-Station-13/upstream-merge-26862 
[MIRROR] If you're gonna rename a job, do it right!
 2017-05-07 23:16:21 -07:00
kevinz000
ec752aabb4 curator --> librarian 2017-05-07 22:33:39 -07:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
kevinz000
30934570b8 Merge pull request #829 from Citadel-Station-13/upstream-merge-26988 
[MIRROR] Corrects Baseturfs from Lava to Space
 2017-05-07 19:39:24 -07:00
CitadelStationBot
a69b9c1b18 Corrects Baseturfs from Lava to Space 2017-05-07 17:01:36 -05:00
CitadelStationBot
d8d49803b7 Add watertank, shower, sink to mining station and gulag 2017-05-07 08:59:19 -05:00
kevinz000
32a215ab5e Merge pull request #792 from Citadel-Station-13/upstream-merge-26917 
[MIRROR] Various Deltastation Map Fixes/Edits
 2017-05-06 21:35:15 -07:00
CitadelStationBot
fc7be7e32b Remove empty description tag from right-most tiles of Space Station 13 sign 2017-05-06 20:48:44 -05:00
kevinz000
d6993f42dc Merge pull request #733 from Citadel-Station-13/upstream-merge-26789 
[MIRROR] gives omega shuttle lights
 2017-05-06 14:12:58 -07:00
kevinz000
24e6a9c80b Merge pull request #777 from Citadel-Station-13/upstream-merge-26879 
[MIRROR] Corrects docking port name for escape pods
 2017-05-06 14:12:13 -07:00
CitadelStationBot
358046709f Various Deltastation Map Fixes/Edits 2017-05-05 20:08:03 -05:00
CitadelStationBot
aa13c4f148 Corrects docking port name for escape pods 2017-05-04 23:16:48 -05:00
CitadelStationBot
01d80a0cc0 Takes out an airlock in xenobiology's kill room [Pubby] 2017-05-04 20:40:05 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
CitadelStationBot
e3ebd661a8 gives omega shuttle lights 2017-05-03 22:22:03 -05:00
CitadelStationBot
ee99534085 If you're gonna rename a job, do it right! 2017-05-03 22:21:50 -05:00