Commit Graph

1773 Commits

Author SHA1 Message Date
silicons f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons 1c2e42136c Merge pull request #13047 from Sishen1542/tbat
replaces box whiteship tbaton with truncheon
2020-08-09 05:45:50 -07:00
Letter N 186482ecef map fix 2020-08-09 19:50:45 +08:00
Putnam 2b10fc81cf actually, fully, removed the kegs 2020-08-08 13:46:03 -07:00
Putnam 11560a0d69 Removed aphro from maps, too. 2020-08-08 01:38:11 -07:00
Sishen 3a8675048a Update whiteship_box.dmm 2020-08-07 21:16:52 -06:00
silicons 5471817656 Merge pull request #13046 from MrJWhit/hop-line-shutter-boxstation
Adds a second shutter to the hopline on boxstation
2020-08-07 17:30:20 -07:00
Sishen 2d53eceb86 Update whiteship_box.dmm 2020-08-06 12:31:04 -06:00
Lin c97aa49c12 Merge pull request #13026 from dapnee/active-turfs-DIE
More Active Turf Fixes
2020-08-06 12:35:35 -05:00
MrJWhit 94acbb5fe8 Update BoxStation.dmm 2020-08-06 13:31:16 -04:00
dapnee 7cd5217871 AI Open
What if Engies didn't have to ask the AI to open the way to tcomms so they could fix it?
2020-08-04 19:00:44 -06:00
dapnee 17d672ede3 changing protolathe to techfab
stepped on hatter's toes, oopsie
2020-08-04 14:49:28 -06:00
dapnee e805fd9715 last fix
I saw white flooring under a window and I commited hyperfixation on the room
2020-08-04 13:50:46 -06:00
dapnee c045016a35 removed some windows that were inside rock
why would you do this?
2020-08-04 13:47:58 -06:00
dapnee 7491d49510 fixes pubby gateway
just stumbling over the map slowly.
2020-08-04 13:45:09 -06:00
dapnee ad5980636d Pubby Fixes
issues found on pubby are fixed here now as well
2020-08-04 13:31:57 -06:00
dapnee cb17ea4874 More Active Turf Fixes
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
Lin 0c85e3f127 Merge pull request #12989 from dapnee/why-is-box-even-fucked-like-this,-smh
You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
2020-08-02 12:50:34 -05:00
silicons d2d598dcfe Merge pull request #12980 from dapnee/What-if-I-keep-fixing-maps
Map Edits Three: The Mappening
2020-08-01 03:34:59 -07:00
silicons 320c91f4d3 Merge pull request #12742 from KeRSedChaplain/clockcultrework
Clockwork Cult rework
2020-08-01 00:17:11 -07:00
dapnee 825ac6124b missed a tile
oopsy
2020-07-31 16:29:25 -06:00
dapnee bcffff1e7d Update BoxStation.dmm
fucking amazing
2020-07-31 16:02:58 -06:00
dapnee e197cb44b2 You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
Fixed active turfs from plating that sat in space, removed random catwalk to nowhere, turned the medical console in the sleeper room to not face a window, FIXED MAINTENANCE BAR APC NOT ACTUALLY BEING FOR THE MAINTENANCE BAR. As well as fixed the xeno hive ruin on lavaland from having active turfs.
2020-07-31 15:37:40 -06:00
Lin 0f07c8fca6 Merge pull request #12962 from dapnee/morechangestokilo
Another Pass Over Kilo
2020-07-31 14:25:56 -05:00
dapnee 3fdd1654ad aaaaaaa
I missed a SINGLE SINK
2020-07-30 16:44:24 -06:00
dapnee dcf3155b7f Map Edits Three: The Mappening
Fixes active turfs in wizard ruin that spawns in lavaland and ones on the space hermit asteroid. Fixes delta missing APC's for botany, the pool, and the little lounge area before toxin's testing site. And a light to the server room so it's not pitch black in there.
2020-07-30 16:29:04 -06:00
dapnee 5a58cd6da0 Another pass over kilo
Added an air alarm to science near the bepis, fixed the active tiles around the arrivals shuttle, and fixed the commissary APC being only renamed and not area stringed correctly
2020-07-29 14:35:17 -06:00
silicons 1bc2404bae revert cc 2020-07-29 01:47:14 -07:00
silicons e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
Keate Senior 5284fbbec0 various fixes to make the PR not conflict with clickdelays probably 2020-07-28 23:52:13 -04:00
dapnee f53280c9b7 adds another atmos tech spawn
treading on justin's pr by accident, oops
2020-07-28 13:46:10 -06:00
dapnee 170afed3bc oops
forgot the sinks in the locker room
2020-07-28 12:16:31 -06:00
dapnee 1540d66e88 Minor Fixes to Box
backwards sinks and such
2020-07-28 12:00:35 -06:00
silicons 785c2b6e0b Merge pull request #12934 from dapnee/a-fan
Miscellaneous fixes to Kilo Station and a Fan for the Listening Outpost
2020-07-26 23:01:08 -07:00
silicons e083689b4b Merge pull request #12923 from EmeraldSundisk/snaxattack
Adds more toilets, among other things to Snow Taxi.
2020-07-26 23:00:16 -07:00
silicons d9f9b2e974 Merge pull request #12916 from MrJWhit/meta-station-atmos-and-toxins-update
Metastation atmos and toxins map update
2020-07-26 22:57:36 -07:00
dapnee 940d4c4d72 kilostation fixes
haha, why did this get through?
2020-07-26 19:30:55 -06:00
dapnee 8fbdc6257c Update listeningstation.dmm
it's a fan
2020-07-26 18:26:52 -06:00
EmeraldSundisk 29a3050209 Add files via upload 2020-07-26 11:30:24 -07:00
MrJWhit d14256e8a9 Minor map adjustments to meta 2020-07-26 01:10:56 -04:00
MrJWhit 503d39e8bc Update MetaStation.dmm 2020-07-26 00:51:58 -04:00
EmeraldSundisk 40b956c1ba Update Snaxi.dmm 2020-07-25 19:31:21 -07:00
Keate Senior e2eb08fcba probably gets travis to stop yelling about the new reebe 2020-07-25 17:43:49 -04:00
dapnee 6f0860d1d3 What if Meta Arrivals Weren't An Eye Sore?
Whack of you to assume this is kosher to make arrivals look like shit like that.
2020-07-23 16:36:54 -06:00
silicons 3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
silicons 9392eb3bb1 Merge pull request #12866 from Sneakyrat6/snaxiTypo
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
EmeraldSundisk 29023f9522 Add files via upload 2020-07-22 16:49:40 -07:00
EmeraldSundisk f422ffb998 Update OmegaStation.dmm 2020-07-22 15:24:20 -07:00
Sneakyrat6 1a641231a9 Fixes Snaxi DMM Typos 2020-07-22 16:20:32 -05:00
silicons f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00