Commit Graph

  • 10c8dbbb6e hOLd oN Ghommie 2020-03-08 02:47:38 +01:00
  • e23e478c06 mOre rUntIMeS Ghommie 2020-03-08 02:43:35 +01:00
  • 5bcb38c79f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610 Ghommie 2020-03-08 02:33:27 +01:00
  • 525ac3a8fc Merge pull request #11344 from Citadel-Station-13/kevinz000-patch-11 Ghom 2020-03-08 01:41:05 +01:00
  • b96475d5aa Merge pull request #11346 from Citadel-Station-13/kevinz000-patch-15 Ghom 2020-03-08 01:40:43 +01:00
  • a3cc805d13 Automatic changelog generation for PR #11366 [ci skip] CitadelStationBot 2020-03-07 18:40:24 -06:00
  • 201a85464c Merge pull request #11366 from zeroisthebiggay/nerfsthekiloshuttle Ghom 2020-03-08 01:40:22 +01:00
  • 788660c822 Automatic changelog generation for PR #11353 [ci skip] CitadelStationBot 2020-03-07 18:40:09 -06:00
  • 1e0ea6facf Merge pull request #11353 from Citadel-Station-13/kevinz000-patch-22 Ghom 2020-03-08 01:40:07 +01:00
  • 8012eebfb8 Automatic changelog generation for PR #11360 [ci skip] CitadelStationBot 2020-03-07 18:39:55 -06:00
  • 3e9b998866 Merge pull request #11360 from Citadel-Station-13/kevinz000-patch-23 Ghom 2020-03-08 01:39:53 +01:00
  • be8331eeb4 Automatic changelog generation for PR #11363 [ci skip] CitadelStationBot 2020-03-07 18:39:43 -06:00
  • 64215b41a4 Merge pull request #11363 from Ragolution/took-it-and-threw-it-on-the-ground Ghom 2020-03-08 01:39:41 +01:00
  • a139f0adc6 Update flavor_text.dm Ghom 2020-03-08 01:38:42 +01:00
  • 991f9a75b7 Update flavor_text.dm Ghom 2020-03-08 01:33:02 +01:00
  • d10f0b0e2f Update flavor_text.dm Ghom 2020-03-08 01:28:42 +01:00
  • 5f3496e908 Update human.dm Ghom 2020-03-08 01:27:35 +01:00
  • ec0d0f9ada Update flavor_text.dm Ghom 2020-03-08 01:27:14 +01:00
  • 40fd1deeeb Merge pull request #11364 from kevinz000/gc_debugging Ghom 2020-03-08 01:16:41 +01:00
  • 97315940fe Polychromic element. Ghommie 2020-03-08 01:01:21 +01:00
  • 1a36d6e6fa Merge pull request #10770 from Ghommie/Ghommie-cit536 Lin 2020-03-07 17:59:12 -06:00
  • 81f2963a0d Automatic changelog generation for PR #11356 [ci skip] CitadelStationBot 2020-03-07 17:50:56 -06:00
  • 3dfd7a5ea4 Merge pull request #11356 from Citadel-Station-13/kevinz000-patch-19 Lin 2020-03-07 17:50:54 -06:00
  • 7115c96f9d Merge branch 'master' into gc_debugging kevinz000 2020-03-07 15:30:47 -08:00
  • dff0e03f11 fixes null runtime and baton inhands Kraseo 2020-03-08 00:27:16 +01:00
  • bbf43b0464 whoopsies almost forgot this Kraseo 2020-03-07 20:48:04 +01:00
  • a5ef41c0fc adjust numbers, fix shuttle dropoffs Kraseo 2020-03-07 20:31:49 +01:00
  • 748614b98a Apply suggestions from code review Trilbyspaceclone 2020-03-07 08:26:15 -05:00
  • c9cad7a0ff Automatic changelog generation for PR #11193 [ci skip] CitadelStationBot 2020-03-07 04:39:53 -06:00
  • f35dfeb472 Merge pull request #11193 from Trilbyspaceclone/patch-293 Ghom 2020-03-07 11:39:51 +01:00
  • 02a32dc2bd Automatic changelog generation for PR #11339 [ci skip] CitadelStationBot 2020-03-07 04:39:02 -06:00
  • 6422b15430 Merge pull request #11339 from MrJWhit/teg-fix-so-fract-doesn't-yell Ghom 2020-03-07 11:38:59 +01:00
  • 5fecf00621 Merge pull request #11361 from Ragolution/just-slide-on-in Ghom 2020-03-07 11:37:41 +01:00
  • 213086ae9f Merge pull request #11345 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-03-07 11:37:17 +01:00
  • aed0efb117 Merge pull request #11343 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-03-07 11:36:37 +01:00
  • fdf3dc82e4 Merge pull request #11347 from Citadel-Station-13/kevinz000-patch-17 Ghom 2020-03-07 11:36:06 +01:00
  • dce540b4cf Automatic changelog generation for PR #11359 [ci skip] CitadelStationBot 2020-03-07 04:35:41 -06:00
  • 865e859141 Merge pull request #11359 from Trilbyspaceclone/lightswitch Ghom 2020-03-07 11:35:39 +01:00
  • 1b926905fb Automatic changelog generation for PR #11338 [ci skip] CitadelStationBot 2020-03-07 04:27:00 -06:00
  • 5a18cac701 Merge pull request #11338 from Crystal9156/patch-1 kevinz000 2020-03-07 03:26:57 -07:00
  • cab5747acf Automatic changelog generation for PR #11340 [ci skip] CitadelStationBot 2020-03-07 04:26:51 -06:00
  • 02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605 kevinz000 2020-03-07 03:26:48 -07:00
  • f58955b80a Automatic changelog generation for PR #11358 [ci skip] CitadelStationBot 2020-03-07 04:24:32 -06:00
  • 7de59975fc Merge pull request #11358 from bunny232/master kevinz000 2020-03-07 03:24:29 -07:00
  • 204311abad Update code/modules/mob/living/living.dm kevinz000 2020-03-07 01:06:24 -07:00
  • 9d1cef2e97 Update code/modules/reagents/reagent_containers.dm Ragolution 2020-03-07 01:58:17 -05:00
  • 860d6b0827 Update code/modules/reagents/reagent_containers.dm Ragolution 2020-03-07 01:58:06 -05:00
  • ddd4d14477 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into eigenstasium-nope Putnam 2020-03-06 22:57:12 -08:00
  • bb4b6f8c01 src.mind.assigned_role == "AI" Detective Google 2020-03-07 00:06:17 -06:00
  • 023d1d6d97 Tweaked weights a bunch Putnam 2020-03-06 21:40:44 -08:00
  • f670d09a88 Made IAA work again (whoops) Putnam 2020-03-06 21:39:38 -08:00
  • c7eb8b430d adds the option for AIs to cryo without being dragged and stuffed in a pod on the other side of the station. Detective Google 2020-03-06 23:22:41 -06:00
  • 1ca4eda4be it begins kappa-sama 2020-03-06 22:58:12 -05:00
  • c8535275ce In case it wasn't shitcode enough, makes it reset on move monster860 2020-03-06 22:05:56 -05:00
  • 171a998a8e TG Compile keronshb 2020-03-06 20:31:46 -05:00
  • 39527ae4a7 prevented hijack/martyr from being contractors Putnam 2020-03-06 17:21:41 -08:00
  • 1c37b95c0b renamed "gimmick" to "freeform" Putnam 2020-03-06 17:21:30 -08:00
  • 71ac07426a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types Putnam 2020-03-06 17:03:24 -08:00
  • 182e98192c no longer uses that var Putnam 2020-03-06 17:01:43 -08:00
  • 7bed0d5c87 Of runtimes and null. Ghommie 2020-03-07 01:57:15 +01:00
  • 930643b01a Blob Reroll keronshb 2020-03-06 19:06:50 -05:00
  • 137e3560c5 Me 2048 Ghom 2020-03-07 00:57:25 +01:00
  • 9066287037 Oh yea I forgot tg repathed many /under clothes a while ago. Ghom 2020-03-07 00:42:18 +01:00
  • 436e781ec9 Removed assassin-only, made subterfuge more likely to assassinate Putnam 2020-03-06 15:37:59 -08:00
  • e3e15ea7a4 accidental revert. Ghommie 2020-03-07 00:30:10 +01:00
  • 4dfa3ec3cf Automatic changelog generation for PR #11367 [ci skip] CitadelStationBot 2020-03-06 17:15:16 -06:00
  • 0e8d1041a4 Merge pull request #11367 from Trilbyspaceclone/patch-303 Ghom 2020-03-07 00:15:13 +01:00
  • a817bd6115 Porting the musician and curator beacons. Ghommie 2020-03-07 00:12:50 +01:00
  • 6a71bc4ba3 Merge pull request #34 from Citadel-Station-13/master kappa-sama 2020-03-06 18:11:31 -05:00
  • 90de20caf7 Revert "what" kappa-sama 2020-03-06 18:09:32 -05:00
  • c221135849 eigenstasium no longer encourages certain personalities Putnam 2020-03-06 14:58:33 -08:00
  • f4e3d75088 Blob Reroll keronshb 2020-03-06 17:37:07 -05:00
  • c2e56f156f Update recipes_weapon_and_ammo.dm Trilbyspaceclone 2020-03-06 17:18:10 -05:00
  • 3e5809ae30 Update code/modules/food_and_drinks/food/snacks_frozen.dm Trilbyspaceclone 2020-03-06 16:32:11 -05:00
  • 228012c718 Blob refactor (#43872) keronshb 2020-03-06 15:58:17 -05:00
  • bc981bd637 Update hivelord.dm Ghom 2020-03-06 21:55:43 +01:00
  • 96bd80ac54 map merge also exists ZeroMan 2020-03-06 15:52:33 -05:00
  • e4c871a8d3 eva is maybe dangerous ZeroMan 2020-03-06 15:52:12 -05:00
  • 928c389b17 Automatic changelog generation for PR #11336 [ci skip] CitadelStationBot 2020-03-06 14:47:17 -06:00
  • 65b7833738 Merge pull request #11336 from Putnam3145/mkultra-aaa Ghom 2020-03-06 21:47:14 +01:00
  • ef42a8c2f7 map merge also exists ZeroMan 2020-03-06 15:14:18 -05:00
  • bee1f7cfe5 its time to vibe ZeroMan 2020-03-06 15:13:23 -05:00
  • 34bc3f7b6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mapping ZeroMan 2020-03-06 14:38:04 -05:00
  • 0fb623b7ca okay here we go ZeroMan 2020-03-06 14:37:41 -05:00
  • 079fd425e5 Makes the monkeys' gorillize chances from radiation exponential. Ghommie 2020-03-06 19:05:45 +01:00
  • a669e87db1 Merge branch 'master' into gc_debugging kevinz000 2020-03-06 10:14:19 -07:00
  • 93d995eb18 k kevinz000 2020-03-06 10:13:11 -07:00
  • 1cc7d01a44 Culls irrelevant targeting information. Ragolution 2020-03-06 11:39:27 -05:00
  • 4857bd120c Fixes bartender drink slide spill Ragolution 2020-03-06 10:06:59 -05:00
  • 8f563797df Update BoxStation.dmm bunny232 2020-03-06 09:28:37 -05:00
  • 65b9fd8f70 Automatic changelog generation for PR #11298 [ci skip] CitadelStationBot 2020-03-06 08:23:33 -06:00
  • c6c676ceb5 Merge pull request #11298 from Kraseo/contracties Ghom 2020-03-06 15:23:30 +01:00
  • c2822dd885 Update stunbaton.dm kevinz000 2020-03-06 07:23:29 -07:00
  • 0afaf6794c Update stunbaton.dm kevinz000 2020-03-06 07:21:52 -07:00
  • b1cc622097 Automatic changelog generation for PR #11334 [ci skip] CitadelStationBot 2020-03-06 08:09:46 -06:00
  • 75aa5ebc95 Merge pull request #11334 from Putnam3145/power-sink-suck Ghom 2020-03-06 15:09:43 +01:00
  • 2f492881ce rouge pixle TrilbySpaceClone 2020-03-06 09:09:28 -05:00
  • f1116648a8 corrects snowcones TrilbySpaceClone 2020-03-06 09:08:05 -05:00
  • e13fef13fd a bunny232 2020-03-06 09:00:59 -05:00
  • a298a34ae9 Oh yea. Ghommie 2020-03-06 14:57:34 +01:00