Commit Graph
29197 Commits
Author SHA1 Message Date
kevinz000andGitHub 72ddaa2ded Update swimming.dm 2020-02-04 23:56:27 -07:00
kevinz000andGitHub d8038edfc8 Update pool_controller.dm 2020-02-03 01:51:23 -07:00
kevinz000andGitHub f3b3053a8c Update pool_structures.dm 2020-02-03 01:49:54 -07:00
kevinz000andGitHub 01a43b2481 Update pool_controller.dm 2020-01-30 00:07:46 -07:00
kevinz000andGitHub b5134e5197 Update pool_controller.dm 2020-01-29 23:01:06 -07:00
Detective Google 8e3830f4a1 Adds the pool to box(again) to fix a merge conflict- implements some feedback 2020-01-28 21:22:17 -06:00
Detective Google cc2ce746d8 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-28 20:19:55 -06:00
Detective Google b61269c7e2 brings the map back to standard (so I can re-do it and make it not conflict) 2020-01-28 20:06:15 -06:00
CitadelStationBot 754fb126f5 Automatic changelog generation for PR #10751 [ci skip] 2020-01-28 19:16:41 -06:00
GhomandGitHub 3671f58612 Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1
traitor+bro now have a minimum population of 25
2020-01-29 02:16:38 +01:00
CitadelStationBot 987e0e16e2 Automatic changelog generation for PR #10748 [ci skip] 2020-01-28 18:59:45 -06:00
GhomandGitHub 2643fd053b Merge pull request #10748 from Trilbyspaceclone/door-
correct door to vault being all access
2020-01-29 01:59:42 +01:00
GhomandGitHub cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
[s] more reasonable reagent logging
2020-01-29 01:59:09 +01:00
kevinz000andGitHub d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2
Makes transfer_ckey() less pedant.
2020-01-28 17:59:00 -07:00
kevinz000andGitHub c5fdc24e73 Merge pull request #10696 from Citadel-Station-13/Ghommie-patch-1
Whops, I forgot that was a get_hearers_in_view()
2020-01-28 17:58:40 -07:00
kevinz000andGitHub b08503de70 Merge pull request #10699 from Putnam3145/no-newline-on-txts
Made .editorconfig not auto-newline on txts
2020-01-28 17:58:23 -07:00
kevinz000andGitHub 3de59b75fa Merge pull request #10678 from Ghommie/Ghommie-cit516
Stops the donor patriotic cape from being considered a bed sheet.
2020-01-28 17:58:07 -07:00
Putnam3145andGitHub 6d6c101044 Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7
[s] botany logging
2020-01-28 16:57:50 -08:00
kevinz000andGitHub 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
Putnam3145andGitHub a00d1fb05e Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5
The meteor wave report time to impact is now accurate (tip you were getting 2-3 minute warnings all along)
2020-01-28 16:56:50 -08:00
kevinz000andGitHub 3ed288dd14 Merge pull request #10750 from LetterN/patch-1
Updates README
2020-01-28 17:56:21 -07:00
CitadelStationBot 540e76d118 Automatic changelog generation for PR #10754 [ci skip] 2020-01-28 18:56:14 -06:00
kevinz000andGitHub 96df844aa3 Merge pull request #10754 from MalricB/Virgomangood
Reunites Shaggy (hair from virgo) with Scooby Terrowin
2020-01-28 17:56:11 -07:00
CitadelStationBot 194d26b044 Automatic changelog generation for PR #10753 [ci skip] 2020-01-28 18:55:52 -06:00
kevinz000andGitHub 70d4be0ea6 Merge pull request #10753 from Trilbyspaceclone/changlog_messing3
Updates changlog
2020-01-28 17:55:49 -07:00
kevinz000andGitHub 3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3
An oversight with one of the new area helper procs.
2020-01-28 17:55:39 -07:00
TrilbySpaceClone a3ce2b06f6 tada 2020-01-28 16:09:49 -05:00
TrilbySpaceClone 92e355267f Revert "correct door to vault being all access"
This reverts commit f145dd1730.
2020-01-28 16:07:15 -05:00
CitadelStationBot 94d1b7a035 Automatic changelog generation for PR #10414 [ci skip] 2020-01-28 11:12:33 -06:00
GhomandGitHub fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi
The Great Citadel De-Pissening of 2020
2020-01-28 18:12:30 +01:00
CitadelStationBot 678c0f0ff5 Automatic changelog generation for PR #10752 [ci skip] 2020-01-28 11:09:03 -06:00
GhomandGitHub fbe79edc24 Merge pull request #10752 from Owai-Seek/cargocratetglass
6 More Crates
2020-01-28 18:08:58 +01:00
CitadelStationBot 6b0dc5d438 Automatic changelog generation for PR #10590 [ci skip] 2020-01-28 10:58:47 -06:00
GhomandGitHub 7ff01ac152 Merge pull request #10590 from KathrinBailey/Kat'sBoxRework
Fixes bugs in BoxStation; turns on docking beacons on Box; fixes roundstart atmos differences.
2020-01-28 17:58:44 +01:00
CitadelStationBot f6d79e8846 Automatic changelog generation for PR #10765 [ci skip] 2020-01-28 05:01:36 -06:00
Putnam3145andGitHub 8e0a674845 Merge pull request #10765 from Citadel-Station-13/kevinz000-patch-15
skittish sanity checks aka "Kev, this isn't a powergamer trait" they said, and now look where we are at?
2020-01-28 03:01:33 -08:00
kevinz000andGitHub a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
CitadelStationBot 8bae366652 Automatic changelog generation for PR #10764 [ci skip] 2020-01-28 00:38:08 -06:00
kevinz000andGitHub b903c110d9 Merge pull request #10764 from deathride58/antinyoom
fixes spacemen going at lightspeed on local/testing servers
2020-01-27 23:38:05 -07:00
kevinz000 6cc995a137 atom color 2020-01-27 23:10:16 -07:00
kevinz000 59e41c20bf changes 2020-01-27 23:09:34 -07:00
kevinz000 70970b78f4 forcemove 2020-01-27 23:00:03 -07:00
kevinz000 6eac97524f compile 2020-01-27 22:42:48 -07:00
kevinz000 8c0d8b694c missing bracket 2020-01-27 22:39:16 -07:00
kevinz000 c76bf202a8 ladder climb 2020-01-27 22:34:31 -07:00
kevinz000 9867d7b377 -20% 2020-01-27 22:28:28 -07:00
kevinz000andGitHub 1b164e1e1e Update pool_controller.dm 2020-01-27 22:25:16 -07:00
kevinz000andGitHub bc05819cee Update pool_drain.dm 2020-01-27 22:23:21 -07:00
kevinz000andGitHub 171d50caff Update sharks.dm 2020-01-27 22:22:34 -07:00
kevinz000andGitHub 0157371a15 Update pool_drain.dm 2020-01-27 22:21:12 -07:00