Commit Graph

  • 0d80c8c169 Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-03-11 17:01:01 -07:00
  • e76704bfa3 Automatic changelog generation for PR #11414 [ci skip] CitadelStationBot 2020-03-11 19:00:49 -05:00
  • 3df171cf99 Merge pull request #11414 from Citadel-Station-13/Ghommie-patch-3-1 kevinz000 2020-03-11 17:00:46 -07:00
  • b311b62919 Automatic changelog generation for PR #11409 [ci skip] CitadelStationBot 2020-03-11 18:30:55 -05:00
  • 9f681e9a76 Merge pull request #11409 from necromanceranne/taser_nerf Ghom 2020-03-12 00:30:52 +01:00
  • d30ba9721c Automatic changelog generation for PR #11410 [ci skip] CitadelStationBot 2020-03-11 18:28:06 -05:00
  • 199272ca9d Merge pull request #11410 from necromanceranne/harvesters_and_mechs Ghom 2020-03-12 00:28:03 +01:00
  • e41e3a5fbb Update banana.dm Ghom 2020-03-12 00:22:53 +01:00
  • bba13d706d FAAAAKE Ghom 2020-03-12 00:16:42 +01:00
  • 148e935c41 Fixes jump to node keronshb 2020-03-11 17:39:08 -04:00
  • f5d2a04833 Ports Blob Buffs keronshb 2020-03-11 17:33:27 -04:00
  • 9e61d9cfb7 Update KiloStation.dmm MrJWhit 2020-03-11 16:53:12 -04:00
  • 5c4663d364 Automatic changelog generation for PR #11432 [ci skip] CitadelStationBot 2020-03-11 11:21:03 -05:00
  • 3b102c4ef7 Merge pull request #11432 from Citadel-Station-13/kevinz000-patch-2 Ghom 2020-03-11 17:21:00 +01:00
  • 77bdb9afe8 Update flavor_text.dm Ghom 2020-03-11 17:15:04 +01:00
  • be3d45d0b9 Mistake. Ghommie 2020-03-11 16:54:33 +01:00
  • b371766853 Edge cases. Ghommie 2020-03-11 16:53:47 +01:00
  • ed92d21a0e Merge pull request #11427 from Citadel-Station-13/kevinz000-patch-5 Ghom 2020-03-11 16:48:02 +01:00
  • d31075eb54 Spellcasting element Ghommie 2020-03-11 16:23:30 +01:00
  • 2bf892c482 Update bubblegum.dm kevinz000 2020-03-11 08:07:37 -07:00
  • bfeb2f0952 Update hivelord.dm kevinz000 2020-03-11 08:07:20 -07:00
  • 2552a34c21 Update hivelord.dm kevinz000 2020-03-11 08:02:33 -07:00
  • ee68e71b2a Update bubblegum.dm kevinz000 2020-03-11 08:01:34 -07:00
  • dbcb9fec6a Update code/modules/mob/living/brain/brain.dm kevinz000 2020-03-11 07:56:26 -07:00
  • d5a6c25128 Update tablet.dm Ghom 2020-03-11 13:19:57 +01:00
  • 9a42101b68 Automatic changelog generation for PR #11421 [ci skip] CitadelStationBot 2020-03-11 07:17:51 -05:00
  • f7674067d2 Merge pull request #11421 from Citadel-Station-13/kevinz000-patch-2 Ghom 2020-03-11 13:17:47 +01:00
  • 901fd6b96b Merge pull request #11420 from kappa-sama/patch-18 Ghom 2020-03-11 13:17:08 +01:00
  • a4855d3b18 Automatic changelog generation for PR #11385 [ci skip] CitadelStationBot 2020-03-11 07:10:27 -05:00
  • 5424633945 Merge pull request #11385 from bunny232/master Ghom 2020-03-11 13:10:24 +01:00
  • 7fe564e192 Update BoxStation.dmm bunny232 2020-03-11 06:56:17 -04:00
  • d5f15874c2 Merge pull request #2 from Citadel-Station-13/master bunny232 2020-03-11 06:52:01 -04:00
  • 8a00a15621 removed no-votes mattering more than votes (??) Putnam 2020-03-11 03:01:05 -07:00
  • a1f820be45 maybe check the rest of the codebase Putnam 2020-03-11 03:00:07 -07:00
  • 1e907ac1c0 Made random's pop_antag_ratio 7 too Putnam 2020-03-11 02:58:39 -07:00
  • 430f3decdc Fixed dynamic runtiming in some circumstances. Putnam 2020-03-11 02:48:18 -07:00
  • 5b46af0f88 Added a proper extended-lite. Putnam 2020-03-11 02:47:59 -07:00
  • 8db3a3ced4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks Putnam 2020-03-11 02:17:16 -07:00
  • a724de6dd8 Moved disease, revenant from midround to event. Putnam 2020-03-11 01:40:13 -07:00
  • f5bde6a869 Let clown ops inherit from nuke ops Putnam 2020-03-11 01:39:48 -07:00
  • f229e8c8fb Enabled clown ops Putnam 2020-03-11 01:19:54 -07:00
  • 230138d31d Rejiggered the weights (config needs updated anyway) Putnam 2020-03-11 01:19:47 -07:00
  • 1ecb84526f Update brain.dm kevinz000 2020-03-11 01:09:52 -07:00
  • bf511d0208 Made storytellers have different possible antag-per-pop goals Putnam 2020-03-10 23:39:14 -07:00
  • 995fc09c87 Made threatening meteors more likely Putnam 2020-03-10 23:38:47 -07:00
  • bb45117c92 Update medicine_reagents.dm kevinz000 2020-03-10 23:37:14 -07:00
  • 621ea62d64 Added swarmers, portal storm, wormholes to dynamic. Putnam 2020-03-10 23:21:47 -07:00
  • c37d30a617 Some fixes requested by kev also ports a fix from tg necromanceranne 2020-03-11 15:43:47 +11:00
  • e3f6f07e73 some adjustments for now necromanceranne 2020-03-11 15:26:21 +11:00
  • 3071dec0d6 probably needs a testmerge kevinz000 2020-03-10 20:14:31 -07:00
  • 18471be4ce cult team kevinz000 2020-03-10 20:11:18 -07:00
  • a43f9ec7be refactor time fuck you kevinz000 2020-03-10 19:57:30 -07:00
  • d5ab355fe5 Update living.dm kevinz000 2020-03-10 19:39:11 -07:00
  • 46823a127b Merge pull request #11335 from Ghommie/Ghommie-cit604 kevinz000 2020-03-10 17:26:20 -07:00
  • 2fabc0c7b5 Automatic changelog generation for PR #10702 [ci skip] CitadelStationBot 2020-03-10 19:24:51 -05:00
  • 0791f22b62 Merge pull request #10702 from Ghommie/Ghommie-cit528 kevinz000 2020-03-10 17:24:48 -07:00
  • ce8de536b5 Merge remote-tracking branch 'citadel/master' into eldritch_affairs kevinz000 2020-03-10 17:24:09 -07:00
  • fef4c82464 Update living.dm kevinz000 2020-03-10 17:18:53 -07:00
  • c4f59b0b83 Update life.dm kevinz000 2020-03-10 17:18:01 -07:00
  • 09d39b8cbd Update robot.dm kevinz000 2020-03-10 17:17:37 -07:00
  • bb1480a369 Update carbon.dm kevinz000 2020-03-10 17:16:33 -07:00
  • e1a48cc91d Automatic changelog generation for PR #11411 [ci skip] CitadelStationBot 2020-03-10 19:14:53 -05:00
  • f5fd4733e1 Merge pull request #11411 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-03-10 17:14:51 -07:00
  • 31ed285a9e Merge pull request #11419 from Citadel-Station-13/Ghommie-patch-3-2 kevinz000 2020-03-10 17:14:38 -07:00
  • c5e4898d17 realtimeofday kappa-sama 2020-03-10 19:37:31 -04:00
  • 0d7612dcf5 [s] Sanitizes ParseSong tempo. Ghom 2020-03-11 00:29:31 +01:00
  • 6757eece5c Automatic changelog generation for PR #11401 [ci skip] CitadelStationBot 2020-03-10 18:03:32 -05:00
  • d55f7aba42 Merge pull request #11401 from Trilbyspaceclone/bow_sprites Ghom 2020-03-11 00:03:29 +01:00
  • a834c0b184 Automatic changelog generation for PR #11417 [ci skip] CitadelStationBot 2020-03-10 16:52:32 -05:00
  • 759b7a434f Merge pull request #11417 from Citadel-Station-13/Ghommie-patch-3 Putnam3145 2020-03-10 14:52:29 -07:00
  • 27a7f754c4 Fix runtimes some more. Ghommie 2020-03-10 22:40:06 +01:00
  • 103dbe18b3 Update vote.dm Ghom 2020-03-10 22:24:27 +01:00
  • 833841bd7b Update others.dm Trilbyspaceclone 2020-03-10 16:48:33 -04:00
  • bd4e32e1c4 Update others.dm Trilbyspaceclone 2020-03-10 16:35:04 -04:00
  • 152b3b3b51 Update posibrain.dm Ghom 2020-03-10 18:20:07 +01:00
  • 3f707a61f2 Automatic changelog generation for PR #11349 [ci skip] CitadelStationBot 2020-03-10 12:01:55 -05:00
  • 48ff2f2cec Merge pull request #11349 from monster860/pixel_erp Ghom 2020-03-10 18:01:52 +01:00
  • aaf494c66b Update code/modules/mob/mob_defines.dm Ghom 2020-03-10 17:37:39 +01:00
  • ddc7d5cf12 Update flavor_text.dm Ghom 2020-03-10 17:28:31 +01:00
  • 4cc1fdadd4 Automatic changelog generation for PR #11399 [ci skip] CitadelStationBot 2020-03-10 10:59:58 -05:00
  • 424a3d9668 Merge pull request #11399 from Seris02/lizardtailfixes Ghom 2020-03-10 16:59:55 +01:00
  • ef1fc6b6aa Automatic changelog generation for PR #11398 [ci skip] CitadelStationBot 2020-03-10 10:59:41 -05:00
  • abd2be036e Merge pull request #11398 from Citadel-Station-13/kevinz000-patch-7 Ghom 2020-03-10 16:59:38 +01:00
  • 2b4b626fac support for items that switch states through update_icon. Ghommie 2020-03-10 16:55:30 +01:00
  • 7578d60436 flavor texts unset on randomize, yay. Ghommie 2020-03-10 15:11:16 +01:00
  • b03af0ea9a Update RCL.dm Ghom 2020-03-10 14:44:33 +01:00
  • c86124f8ed Update human.dm Ghom 2020-03-10 14:34:17 +01:00
  • 7ba120a8d3 lazyor Ghommie 2020-03-10 14:12:11 +01:00
  • 8caea8e83a Ports tg#44633 necromanceranne 2020-03-10 23:59:50 +11:00
  • 3d6c82cbc8 Merge pull request #11381 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-03-10 05:59:36 -07:00
  • 5d475b4537 Automatic changelog generation for PR #11388 [ci skip] CitadelStationBot 2020-03-10 07:59:27 -05:00
  • 832d894e92 Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20 kevinz000 2020-03-10 05:59:24 -07:00
  • d837476389 Automatic changelog generation for PR #11390 [ci skip] CitadelStationBot 2020-03-10 07:58:46 -05:00
  • 41fdaae32c Merge pull request #11390 from zeroisthebiggay/ghosthudstaketwo kevinz000 2020-03-10 05:58:43 -07:00
  • e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 kevinz000 2020-03-10 05:58:17 -07:00
  • 40e470cba2 Automatic changelog generation for PR #11392 [ci skip] CitadelStationBot 2020-03-10 07:57:29 -05:00
  • d3306e2eec Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice kevinz000 2020-03-10 05:57:27 -07:00
  • 3eac86cf31 Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3 kevinz000 2020-03-10 05:57:18 -07:00
  • 04c5a5a83b Automatic changelog generation for PR #11395 [ci skip] CitadelStationBot 2020-03-10 07:56:59 -05:00
  • 1b7eaf48eb Merge pull request #11395 from Citadel-Station-13/Ghommie-patch-4 kevinz000 2020-03-10 05:56:56 -07:00