Commit Graph

  • 60a35c5270 Merge pull request #6409 from Citadel-Station-13/upstream-merge-37194 deathride58 2018-04-14 20:39:12 +00:00
  • a3279d6de2 Merge pull request #6408 from Citadel-Station-13/upstream-merge-37095 deathride58 2018-04-14 20:38:52 +00:00
  • fc035e2b61 Merge pull request #6407 from Citadel-Station-13/upstream-merge-37176 deathride58 2018-04-14 20:38:33 +00:00
  • dae96ee19b Merge pull request #6406 from Citadel-Station-13/upstream-merge-37168 deathride58 2018-04-14 20:38:08 +00:00
  • 6923c83762 Merge pull request #6377 from Citadel-Station-13/upstream-merge-36417 deathride58 2018-04-14 20:37:42 +00:00
  • 19f4a5f990 Fixes SCP being deconstructable CitadelStationBot 2018-04-14 10:57:55 -05:00
  • 26fb305551 zoinks vuonojenmustaturska 2018-04-14 16:28:37 +03:00
  • 45054c24dc sucessfully fixes some grammar CitadelStationBot 2018-04-14 08:12:35 -05:00
  • 3ffe415eb8 sucessfully fixes some grammar (#37095) Tlaltecuhtli 2018-04-14 15:12:36 +02:00
  • ae77b58bcb Removes startup message in sql log CitadelStationBot 2018-04-14 08:11:21 -05:00
  • 9ce8aae7dd removes startup message in sql log (#37176) Jordie 2018-04-14 23:11:36 +10:00
  • 0d0092497e Fixes imps all having the same name CitadelStationBot 2018-04-14 08:10:07 -05:00
  • 677f3e8a7b Fixes imps all having the same name (#37168) shrimpboom8 2018-04-14 06:09:36 -07:00
  • 8b2a75c108 Merge pull request #6380 from Citadel-Station-13/upstream-merge-37005 LetterJay 2018-04-14 07:46:20 -05:00
  • a861726664 Merge pull request #6379 from Citadel-Station-13/upstream-merge-37125 LetterJay 2018-04-14 07:46:04 -05:00
  • 385c9d9b22 Merge pull request #6382 from Citadel-Station-13/upstream-merge-37119 LetterJay 2018-04-14 07:45:42 -05:00
  • 6b3a59b028 Merge pull request #6372 from Citadel-Station-13/upstream-merge-37117 LetterJay 2018-04-14 07:45:15 -05:00
  • 86ca6b424d Merge pull request #6366 from Citadel-Station-13/upstream-merge-37122 LetterJay 2018-04-14 07:44:50 -05:00
  • fbaa2d5ae8 Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132 LetterJay 2018-04-14 07:44:36 -05:00
  • 8dec1d8926 Merge pull request #6363 from Citadel-Station-13/upstream-merge-37110 LetterJay 2018-04-14 07:44:22 -05:00
  • 51c718aa31 Merge pull request #6362 from Citadel-Station-13/upstream-merge-37106 LetterJay 2018-04-14 07:44:08 -05:00
  • 2c0884765c Merge pull request #6404 from Citadel-Station-13/upstream-merge-37167 LetterJay 2018-04-14 07:43:50 -05:00
  • 698d89c55c Merge pull request #6403 from Citadel-Station-13/upstream-merge-37174 LetterJay 2018-04-14 07:43:30 -05:00
  • 26636ece0d Merge pull request #6400 from Citadel-Station-13/upstream-merge-37161 LetterJay 2018-04-14 07:43:11 -05:00
  • 5d5dc5483e Merge pull request #6399 from Citadel-Station-13/upstream-merge-37158 LetterJay 2018-04-14 07:42:57 -05:00
  • a9f7e829a9 Merge pull request #6398 from Citadel-Station-13/upstream-merge-37178 LetterJay 2018-04-14 07:42:30 -05:00
  • f4b54eb9df Merge pull request #6397 from Citadel-Station-13/upstream-merge-37177 LetterJay 2018-04-14 07:42:16 -05:00
  • e5e22c2665 Merge pull request #6396 from Citadel-Station-13/upstream-merge-37154 LetterJay 2018-04-14 07:41:54 -05:00
  • 513db7eb2e Merge pull request #6395 from Citadel-Station-13/upstream-merge-37138 LetterJay 2018-04-14 07:41:32 -05:00
  • 5a9a0c9ed9 Merge pull request #6394 from Citadel-Station-13/upstream-merge-37148 LetterJay 2018-04-14 07:41:12 -05:00
  • 58e70caa69 Merge pull request #6393 from Citadel-Station-13/upstream-merge-37140 LetterJay 2018-04-14 07:40:57 -05:00
  • 8b2ee170bb Merge pull request #6390 from Citadel-Station-13/upstream-merge-37152 LetterJay 2018-04-14 07:39:47 -05:00
  • 47c2bfd13c Merge pull request #6389 from Citadel-Station-13/upstream-merge-36942 LetterJay 2018-04-14 07:39:35 -05:00
  • a01d37560c Merge pull request #6388 from Citadel-Station-13/upstream-merge-37114 LetterJay 2018-04-14 07:39:11 -05:00
  • d9d93ca9a6 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) CitadelStationBot 2018-04-14 04:43:25 -05:00
  • 44a273f6b8 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) (#37167) kevinz000 2018-04-14 02:42:41 -07:00
  • 5d05a729d9 Readds dropped #endif CitadelStationBot 2018-04-13 22:10:47 -05:00
  • 13c40be136 Readds dropped #endif (#37174) AnturK 2018-04-14 05:10:56 +02:00
  • a353876bf5 Makes the PI circuit use the PI define CitadelStationBot 2018-04-13 12:44:13 -05:00
  • 47c783ec71 Makes the PI circuit use the PI define (#37161) Nich 2018-04-13 19:44:21 +02:00
  • c44ba4fdd5 Cleans up CENTCOM morgue/chapel/library doors CitadelStationBot 2018-04-13 09:04:55 -05:00
  • 5dfd1f7d42 grunge airlock ShizCalev 2018-04-12 18:53:01 -04:00
  • d1165e1803 Fixes SCP 194 not using the amount variable. CitadelStationBot 2018-04-13 09:03:40 -05:00
  • b56b2a94e8 Fixes SCP 194 not using the amount variable. Dax Dupont 2018-04-13 15:13:49 +02:00
  • 29b1160c46 Reduces aurora caelus weight to that of meteors CitadelStationBot 2018-04-13 09:02:28 -05:00
  • f52f0f9f33 Reduces aurora caelus weight to that of meteors Jordan Brown 2018-04-13 09:04:02 -04:00
  • 98a6e06fc2 Updates baseturf helpers to the new baseturf system CitadelStationBot 2018-04-13 07:58:37 -05:00
  • d139c8ebb3 Updates baseturf helpers to the new baseturf system (#37154) Emmett Gaines 2018-04-13 08:59:01 -04:00
  • 023d9b8caf Cleans up end of round robo report CitadelStationBot 2018-04-13 07:51:16 -05:00
  • 8f52745322 Cleans up end of round robo report (#37138) ShizCalev 2018-04-13 08:51:23 -04:00
  • 0ad4ac95e6 Rounded the last digit of pi correctly CitadelStationBot 2018-04-13 07:51:06 -05:00
  • 5eab3eb454 Rounded the last digit of pi correctly (#37148) Putnam3145 2018-04-13 05:51:50 -07:00
  • 56713b0a75 Fixes bad style for cham projector warning CitadelStationBot 2018-04-13 07:49:54 -05:00
  • 38b2460760 Fixes bad span class for cham projector warning (#37140) ShizCalev 2018-04-13 08:50:16 -04:00
  • 0bc2c67af9 Fixes conveyor switches. CitadelStationBot 2018-04-13 04:30:32 -05:00
  • 4e7d222224 Fixes conveyors. (#37152) AnturK 2018-04-13 11:31:08 +02:00
  • 73c3ac7d81 Fixes tile analyzer CitadelStationBot 2018-04-12 11:48:28 -05:00
  • b7023e1bbb Fixes tile analyzer (#36942) robbym 2018-04-12 09:49:25 -07:00
  • f2a9fd6c0b Adds round id to server ban messages CitadelStationBot 2018-04-12 11:47:08 -05:00
  • 3a518e0e6d Adds round id to server ban messages (#37114) Jordie 2018-04-13 02:48:33 +10:00
  • 58111c6482 Fixing slimepeople (#6386) Chayse Ramsay 2018-04-12 16:39:44 +01:00
  • e7b14fbf89 Merge pull request #6385 from Citadel-Station-13/Rust-g LetterJay 2018-04-12 07:22:44 -05:00
  • 705cb7016b manual mirror LetterJay 2018-04-12 07:21:44 -05:00
  • 3cd0591d90 Merge pull request #6334 from Citadel-Station-13/upstream-merge-36858 LetterJay 2018-04-12 07:06:08 -05:00
  • 8e293a20aa Update asteroid.dm LetterJay 2018-04-12 07:04:33 -05:00
  • dcff61724a Update dna.dm LetterJay 2018-04-12 07:04:09 -05:00
  • c26d4dc240 Update bitfields.dm LetterJay 2018-04-12 07:03:47 -05:00
  • 508e4f4d37 Update tiny_prick.dm LetterJay 2018-04-12 07:03:26 -05:00
  • bc8c97d6c4 Adds an period to point messages ShizCalev 2018-04-12 05:27:35 -04:00
  • af7ab75acd floor is lava no longer hurts silicons CitadelStationBot 2018-04-12 06:37:54 -05:00
  • 72b2d9b436 floor is lava no longer hurts silicons (#37119) kevinz000 2018-04-12 02:35:33 -07:00
  • a8b5510825 Changes ore-burning math to avoid decimals (and raise RNG) CitadelStationBot 2018-04-12 06:37:33 -05:00
  • 4e74f63147 Changes ore-burning math to avoid decimals (and raise RNG) (#37005) Grandmother of 50 2018-04-12 06:44:08 -04:00
  • f0246250f4 Shuttle window spawner name fix CitadelStationBot 2018-04-12 06:37:25 -05:00
  • bc68ed8536 Merge pull request #37125 from 81Denton/shuttle-window-name vuonojenmustaturska 2018-04-12 13:47:11 +03:00
  • d8e3200d6c Merge pull request #6287 from Citadel-Station-13/upstream-merge-36953 deathride58 2018-04-11 21:40:22 +00:00
  • 51147e928f Merge pull request #6307 from Citadel-Station-13/upstream-merge-36974 deathride58 2018-04-11 21:40:00 +00:00
  • 2658200472 Merge pull request #6337 from Citadel-Station-13/upstream-merge-37070 deathride58 2018-04-11 21:39:39 +00:00
  • aa4a4742e3 Merge pull request #6340 from Citadel-Station-13/upstream-merge-37037 deathride58 2018-04-11 21:39:01 +00:00
  • 512b5e86c9 Merge pull request #6341 from Citadel-Station-13/upstream-merge-36469 deathride58 2018-04-11 21:38:24 +00:00
  • b4ecb3ef27 Merge pull request #6343 from Citadel-Station-13/upstream-merge-36670 deathride58 2018-04-11 21:37:24 +00:00
  • 76be207446 RPD pipe autowrenching CitadelStationBot 2018-04-11 16:36:56 -05:00
  • 105e55068b RPD pipe autowrenching (#36417) Dennok 2018-04-12 00:35:55 +03:00
  • f89f9c372e Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693 deathride58 2018-04-11 21:36:35 +00:00
  • 538cb55b68 Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791 deathride58 2018-04-11 21:35:45 +00:00
  • ce946619b3 Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088 deathride58 2018-04-11 21:35:21 +00:00
  • 1f9d19a92a Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983 deathride58 2018-04-11 21:34:56 +00:00
  • 6d1ee7c6e9 Merge pull request #6351 from Citadel-Station-13/upstream-merge-36604 deathride58 2018-04-11 21:34:32 +00:00
  • 2502bb79bf Merge pull request #6353 from Citadel-Station-13/upstream-merge-37044 deathride58 2018-04-11 21:32:17 +00:00
  • bca8c97bdf Merge pull request #6356 from Citadel-Station-13/upstream-merge-37082 deathride58 2018-04-11 21:31:46 +00:00
  • 055eacca74 Merge pull request #6358 from Citadel-Station-13/upstream-merge-37073 deathride58 2018-04-11 21:31:17 +00:00
  • baf8c6967d Update admins.txt deathride58 2018-04-11 17:31:04 -04:00
  • dd7cf18694 Merge pull request #6359 from Citadel-Station-13/upstream-merge-37077 deathride58 2018-04-11 21:30:16 +00:00
  • 43eee9851c Merge pull request #6360 from Citadel-Station-13/upstream-merge-37094 deathride58 2018-04-11 21:29:52 +00:00
  • 6c107f538a Merge pull request #6361 from Citadel-Station-13/upstream-merge-37107 deathride58 2018-04-11 21:29:28 +00:00
  • 1f44356e49 Merge pull request #6364 from Citadel-Station-13/upstream-merge-37120 deathride58 2018-04-11 21:28:50 +00:00
  • 72dfdb0a63 Merge pull request #6365 from Citadel-Station-13/upstream-merge-37032 deathride58 2018-04-11 21:28:25 +00:00
  • eebe38dc39 Merge pull request #6367 from Citadel-Station-13/upstream-merge-37136 deathride58 2018-04-11 21:27:58 +00:00
  • 1bec758c65 Merge pull request #6369 from Citadel-Station-13/upstream-merge-37130 deathride58 2018-04-11 21:27:26 +00:00
  • 84a94e1894 Merge pull request #6371 from Citadel-Station-13/upstream-merge-37123 deathride58 2018-04-11 21:27:05 +00:00