Commit Graph

165 Commits

Author SHA1 Message Date
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
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
CitadelStationBot
59a189327a Fixes thunderdome, moves delta nuke op shuttle locations a bit. 2017-06-03 10:58:01 -05:00
CitadelStationBot
7bb7c7d494 [Box] Removes extra unattached vent from Xenobiology Lab 2017-06-03 02:25:44 -05:00
CitadelStationBot
96eb21fa2a CereStation Security Department Revamp (and other misc fixes/changes) 2017-05-31 19:57:52 -05:00
CitadelStationBot
946a6b1146 [Meta] Var Cleanup and tweaks 2017-05-31 08:57:18 -05:00
CitadelStationBot
12719cb824 [Omega] Fixes checkered plating 2017-05-31 08:50:30 -05:00
LetterJay
52881797d0 update area turfs 2017-05-30 23:33:19 -05:00
LetterJay
168a96c268 back in we go 2017-05-30 23:10:43 -05:00
LetterJay
dac12e365a just delete the shit for now 2017-05-30 23:03:44 -05:00
LetterJay
6717b0d3a2 dsds 2017-05-30 23:01:22 -05:00
LetterJay
3baf042360 more commits 2017-05-30 22:55:11 -05:00
LetterJay
7d9865955b master maps 2017-05-30 22:47:08 -05:00
LetterJay
dd1facf96e update 2017-05-30 22:02:41 -05:00
LetterJay
a41d17c9b9 die die die 2017-05-30 20:45:32 -05:00
LetterJay
dc83d85b05 it DOES NOT END 2017-05-30 20:40:03 -05:00
LetterJay
a60ad3264a commit 2017-05-30 20:31:45 -05:00
LetterJay
a497ba644e more maps 2017-05-30 20:25:23 -05:00
LetterJay
405df96d2a missed one 2017-05-30 20:17:15 -05:00
LetterJay
8948f2d636 FIXING SHIT. 2017-05-30 20:16:00 -05:00
LetterJay
0fe4a33b15 Merge pull request #1100 from Citadel-Station-13/upstream-merge-27453
[MIRROR] [All stations] Cleaned up var-editted areas
2017-05-30 19:50:35 -05:00
LetterJay
55fa44c7ce it never ends 2017-05-30 19:24:20 -05:00
LetterJay
6cfbd556c2 chronological order 2017-05-30 19:15:24 -05:00
LetterJay
36aa2e4b15 map 2017-05-30 19:08:04 -05:00
Leon-Leonardo
0818c38966 Citadel Station 1.2.2
-fixed broken areas
-fixed broken pipes
-fixed broken wires
-removed pens that kept getting vored by paper bins
-added working bot patrols
-added beepsky and pingsky
2017-05-28 16:26:14 -04:00
CitadelStationBot
9e14458188 Removes Fastload.dmm 2017-05-26 14:36:26 -05:00
CitadelStationBot
0da4f06c59 Add Glass Panes to Box Armoury Weapon Racks 2017-05-24 05:49:30 -05:00
CitadelStationBot
db4b764aea [All stations] Cleaned up var-editted areas 2017-05-21 22:29:41 -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
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
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
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