Commit Graph

129 Commits

Author SHA1 Message Date
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
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
73b105ffe6 Merge pull request #641 from Citadel-Station-13/upstream-merge-26541
[MIRROR] Gives Backup Shuttle Lighting and Fixes Auxiliary Tool Storage Plating on Delta
2017-05-02 11:15:54 -05:00
LetterJay
3d6845675a Merge pull request #679 from Citadel-Station-13/upstream-merge-26709
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
2017-05-01 08:10:13 -05:00
CitadelStationBot
87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
CitadelStationBot
0ae4f76fb9 Winter Wonderland holodeck no longer has freon, and it's no longer restricted 2017-04-30 15:12:51 -05:00
CitadelStationBot
15229c3ca1 Gives Backup Shuttle Lighting and Fixes Auxiliary Tool Storage Plating on Delta 2017-04-28 21:06:11 -05:00
CitadelStationBot
3d2f91d0c7 Removes a lavaland_surface_ww_vault.dmm because its just bad. (#536) 2017-04-26 11:08:30 -05:00
CitadelStationBot
c1fbb61977 Omega Station had two APCs not wired properly. 2017-04-25 23:33:10 -05:00
LetterJay
496107120f the fun never ends 2017-04-25 02:09:21 -05:00
LetterJay
8088ce38cc rej file cleanup 2017-04-25 01:15:04 -05:00
LetterJay
88d4703ebf Merge pull request #528 from Citadel-Station-13/upstream-merge-26292
[MIRROR] [Deltastation] Access Fixes [Ready for Review]*
2017-04-25 01:14:17 -05:00
LetterJay
fc0246d388 Merge pull request #538 from Citadel-Station-13/upstream-merge-26444
[MIRROR] Cerestation Tweaks MKIV
2017-04-25 01:13:55 -05:00
LetterJay
a7a08f6cae Merge pull request #548 from Citadel-Station-13/upstream-merge-26496
[MIRROR] Removes active turfs from Pubby, Box and Crashed Ship ruin
2017-04-25 01:13:41 -05:00
LetterJay
8fcb5d761e Merge pull request #547 from Citadel-Station-13/upstream-merge-26491
[MIRROR] Fixes turfs on Omegastation
2017-04-25 01:02:23 -05:00
LetterJay
d78e5c196d Rename tgstation.2.1.3.dmm.rej to broken.rej 2017-04-25 01:01:11 -05:00
LetterJay
4ea582ddef Update tgstation.2.1.3.dmm.rej 2017-04-25 01:00:20 -05:00
LetterJay
de1d8188ae removes rej files 2017-04-24 21:34:58 -05:00
CitadelStationBot
7172979792 Removes active turfs from Pubby, Box and Crashed Ship ruin 2017-04-24 20:54:39 -05:00
CitadelStationBot
437634c957 Fixes turfs on Omegastation 2017-04-24 20:54:36 -05:00
CitadelStationBot
babb6c53c8 Cerestation Tweaks MKIV 2017-04-24 17:38:22 -05:00
LetterJay
7c14af7f7b Merge pull request #511 from Citadel-Station-13/upstream-merge-26365
[MIRROR] poly's ghost no longer haunts the space of cerestation round-start
2017-04-24 16:41:55 -05:00
CitadelStationBot
5be9cf5225 [Deltastation] Access Fixes [Ready for Review]* 2017-04-23 14:24:07 -05:00
CitadelStationBot
341951623e Updates space ruins TGM format and noop usage (#504) 2017-04-23 01:31:40 -05:00
CitadelStationBot
83e69b928b poly's ghost no longer haunts the space of cerestation round-start 2017-04-22 05:42:13 -05:00
LetterJay
b2766df858 Merge pull request #447 from Citadel-Station-13/upstream-merge-26286
[MIRROR] Expands the bird to Pubbystation
2017-04-18 01:15:40 -05:00
CitadelStationBot
54012635a7 Expands the bird to Pubbystation 2017-04-17 17:41:57 -05:00