Commit Graph

18 Commits

Author SHA1 Message Date
CitadelStationBot
12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
1291b12273 Cleaned up stacked pipes 2017-08-13 01:28:11 -05:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
LetterJay
70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977
[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
CitadelStationBot
b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot
0ce34e08b6 Augment Styles/Changes 2017-07-18 06:45:44 -05:00
CitadelStationBot
755de4f223 Made cell / holding cell windoors their own subtype 2017-07-17 06:52:17 -05: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
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
CitadelStationBot
990aec3d14 Replaces useless teleporter consoles on bridge 2017-07-06 19:18:14 -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