Commit Graph

  • 735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 Ghommie 2019-10-09 01:18:30 +02:00
  • 1ccf95462a Update costumes_toys.dm Trilbyspaceclone 2019-10-08 19:07:02 -04:00
  • 0a878c17bc readds carpet Trilbyspaceclone 2019-10-08 18:51:58 -04:00
  • e4a2c21b8c Merge branch 'master' into Cargo_rebalance Trilbyspaceclone 2019-10-08 18:49:38 -04:00
  • dac6fef57a Also implementing /tg/station pr #40767 Ghommie 2019-10-09 00:38:09 +02:00
  • 9c3e532be7 Fixes lack of arguments on mobs' can_equip. Ghommie 2019-10-09 00:21:55 +02:00
  • 2cd7f8f8ce More control over species based offsets JTGSZ 2019-10-08 17:03:51 -04:00
  • 26e35376d6 ok Poojawa 2019-10-08 15:15:56 -05:00
  • c7f52fa292 Update other_reagents.dm Poojawa 2019-10-08 14:29:22 -05:00
  • 2629402fa4 Makes zombie smell through their eyes MrJWhit 2019-10-08 14:53:00 -04:00
  • 17090d9aff Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-10-08 13:51:02 -05:00
  • cbefe95ade Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails Poojawa 2019-10-08 13:50:29 -05:00
  • 14823d3452 Update code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm Sishen1542 2019-10-08 14:05:39 -04:00
  • 9ee1987dec Applying kevinz' ominous warning suggestion Ghommie 2019-10-08 20:04:08 +02:00
  • c4a8b80851 No digitigrade plasmaman suits spriting, thank you. Ghommie 2019-10-08 18:43:40 +02:00
  • 5df84d6ab5 Update scripture_drivers.dm Sishen 2019-10-08 11:36:38 -04:00
  • 363303747a Update neovgre.dm Sishen 2019-10-08 10:27:48 -04:00
  • 47c18fd052 Automatic changelog generation for PR #9445 [ci skip] CitadelStationBot 2019-10-08 07:54:47 -05:00
  • 1d501342b9 Merge pull request #9445 from Thalpy/PANIC kevinz000 2019-10-08 05:54:44 -07:00
  • 10ce91c686 aaa Fermi 2019-10-08 13:45:16 +01:00
  • b397c4868f Theres a bit more limits now Fermi 2019-10-08 13:23:35 +01:00
  • 9bb045b60a Merge branch 'master' into FERMICHEMCurTweaks Thalpy 2019-10-08 13:10:35 +01:00
  • db416defd6 Fixes/updates some chems. Fermi 2019-10-08 13:08:13 +01:00
  • 9e96f76625 Automatic changelog generation for PR #9443 [ci skip] CitadelStationBot 2019-10-08 07:00:55 -05:00
  • b37cd80d9c Merge pull request #9443 from Thalpy/PANIC kevinz000 2019-10-08 05:00:53 -07:00
  • a9ad80691e Okay this too Fermi 2019-10-08 12:57:06 +01:00
  • f0e803f056 PANIC Fermi 2019-10-08 12:38:39 +01:00
  • 1da86bec1c Kev pls Fermi 2019-10-08 12:31:01 +01:00
  • bc118d5ead Merge branch 'master' into Updates-holder Fermi 2019-10-08 12:21:56 +01:00
  • 06ad17e539 More mild Fermi 2019-10-08 12:16:33 +01:00
  • b8c87a5f40 Spicy Fermi 2019-10-08 12:05:06 +01:00
  • 5cc16011ac paren lolman360 2019-10-08 20:13:44 +11:00
  • ddb781a144 examines lolman360 2019-10-08 20:09:07 +11:00
  • 6faa0ee6e9 reverts jetpack efficiency YakumoChen 2019-10-08 09:03:12 +00:00
  • 2709570f01 techwebs and stuff i forgot lolman360 2019-10-08 20:02:26 +11:00
  • d7ab97dffc does some of the television's demands Poojawa 2019-10-08 04:02:20 -05:00
  • 9d4446d165 update YakumoChen 2019-10-08 04:57:35 -04:00
  • 04521551f0 one commit wonder lolman360 2019-10-08 19:46:28 +11:00
  • 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-10-08 02:55:32 -05:00
  • 9f8ad74bf9 New traumas and some other things. GrayRachnid 2019-10-08 03:53:01 -04:00
  • 5aa796440e Update mam_tails.dmi Poojawa 2019-10-08 02:49:35 -05:00
  • 492e9c9d08 Automatic changelog generation for PR #9389 [ci skip] CitadelStationBot 2019-10-08 02:38:18 -05:00
  • 1d7deedd34 Merge pull request #9389 from Weblure/beepsky-animation-port kevinz000 2019-10-08 00:38:16 -07:00
  • 8c7b539585 Automatic changelog generation for PR #9391 [ci skip] CitadelStationBot 2019-10-08 02:36:28 -05:00
  • 922e9849bd Merge pull request #9391 from GrayRachnid/rebalancesk9borgs kevinz000 2019-10-08 00:36:26 -07:00
  • 922c202363 Automatic changelog generation for PR #9421 [ci skip] CitadelStationBot 2019-10-08 02:35:00 -05:00
  • fe1a78f413 Merge pull request #9421 from Ghommie/Ghommie-cit218 kevinz000 2019-10-08 00:34:58 -07:00
  • 0a29acb9ef Automatic changelog generation for PR #9427 [ci skip] CitadelStationBot 2019-10-08 02:34:35 -05:00
  • abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219 kevinz000 2019-10-08 00:34:33 -07:00
  • 6910835976 Automatic changelog generation for PR #9404 [ci skip] CitadelStationBot 2019-10-08 02:34:11 -05:00
  • 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head kevinz000 2019-10-08 00:34:07 -07:00
  • 0a9589f8cd Automatic changelog generation for PR #9316 [ci skip] CitadelStationBot 2019-10-08 02:33:24 -05:00
  • 8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats kevinz000 2019-10-08 00:33:21 -07:00
  • f57d185580 Automatic changelog generation for PR #9226 [ci skip] CitadelStationBot 2019-10-08 02:30:56 -05:00
  • 6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2 kevinz000 2019-10-08 00:30:54 -07:00
  • 909fcd61f7 Automatic changelog generation for PR #9287 [ci skip] CitadelStationBot 2019-10-08 02:30:03 -05:00
  • 3d404b6967 Merge pull request #9287 from Thalpy/Wiki kevinz000 2019-10-08 00:30:00 -07:00
  • 52b3301819 Automatic changelog generation for PR #9314 [ci skip] CitadelStationBot 2019-10-08 02:29:44 -05:00
  • 26b076c5aa Merge pull request #9314 from Trilbyspaceclone/patch-228 kevinz000 2019-10-08 00:29:41 -07:00
  • 13a60ad179 Automatic changelog generation for PR #9032 [ci skip] CitadelStationBot 2019-10-08 02:28:08 -05:00
  • 06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178 kevinz000 2019-10-08 00:28:06 -07:00
  • 7677c4d827 Automatic changelog generation for PR #8937 [ci skip] CitadelStationBot 2019-10-08 02:25:54 -05:00
  • f405cd1be3 Merge pull request #8937 from Ghommie/Ghommie-cit153 kevinz000 2019-10-08 00:25:51 -07:00
  • f592fc325e Formmating Thalpy 2019-10-08 07:47:10 +01:00
  • edb26eeaeb Master of confusion Thalpy 2019-10-08 07:44:32 +01:00
  • 281c6e04e8 Hmm Thalpy 2019-10-08 07:43:51 +01:00
  • ec059492f9 Automatic changelog generation for PR #9406 [ci skip] CitadelStationBot 2019-10-08 01:39:55 -05:00
  • 76ede7a473 Merge pull request #9406 from Poojawa/carpet-colors kevinz000 2019-10-07 23:39:52 -07:00
  • 4538c43ede Oops Thalpy 2019-10-08 07:39:41 +01:00
  • f7d14ebb2c Damnit webedit Thalpy 2019-10-08 07:39:19 +01:00
  • 72f6a8af85 Automatic changelog generation for PR #9418 [ci skip] CitadelStationBot 2019-10-08 01:36:13 -05:00
  • dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216 kevinz000 2019-10-07 23:36:11 -07:00
  • d3d64a7887 Automatic changelog generation for PR #9431 [ci skip] CitadelStationBot 2019-10-08 01:35:20 -05:00
  • 7c94029006 Merge pull request #9431 from Ghommie/Ghommie-cit221 kevinz000 2019-10-07 23:35:18 -07:00
  • 36cde7e245 Automatic changelog generation for PR #9413 [ci skip] CitadelStationBot 2019-10-08 01:32:51 -05:00
  • d3f29c4084 Merge pull request #9413 from Poojawa/sprays-obey-fashion kevinz000 2019-10-07 23:32:48 -07:00
  • 564c1fde9f Merge branch 'master' into Reagents_bitflats Thalpy 2019-10-08 07:31:03 +01:00
  • 1cfcfb8e2e Automatic changelog generation for PR #9309 [ci skip] CitadelStationBot 2019-10-08 01:29:21 -05:00
  • 0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port kevinz000 2019-10-07 23:29:19 -07:00
  • 5024c8664b Lowers view amount of turfs, fixes BOH moving dominator JTGSZ 2019-10-08 01:02:45 -04:00
  • 77f3b22df5 Update neovgre.dm Sishen 2019-10-07 21:53:34 -04:00
  • 46d6cf8a17 Automatic changelog generation for PR #9410 [ci skip] CitadelStationBot 2019-10-07 18:24:40 -05:00
  • de117afd8b Merge pull request #9410 from Poojawa/cryopod-tweaks nik707 2019-10-07 18:24:38 -05:00
  • e60f9534cb Automatic changelog generation for PR #9379 [ci skip] CitadelStationBot 2019-10-07 18:23:26 -05:00
  • b46c41cafd Merge pull request #9379 from jakeramsay007/Medbay-Doors nik707 2019-10-07 18:23:23 -05:00
  • 5777a0a196 Automatic changelog generation for PR #9384 [ci skip] CitadelStationBot 2019-10-07 18:20:02 -05:00
  • 6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes nik707 2019-10-07 18:19:59 -05:00
  • 30a41292d8 left extra letter in comment JTGSZ 2019-10-07 18:02:16 -04:00
  • fce6f13471 Ports "Chat Subsystem ported from TerraGov-Marine-Corps" Ghommie 2019-10-07 23:58:15 +02:00
  • 7951d87022 species clothing restrictions JTGSZ 2019-10-07 17:55:16 -04:00
  • 4bdd38b422 i feel like this is a really stupid way to fix it Linzolle 2019-10-07 16:17:42 -05:00
  • 071c23b101 Automatic changelog generation for PR #9434 [ci skip] CitadelStationBot 2019-10-07 15:20:26 -05:00
  • 36d7a6f3bd Merge pull request #9434 from EmeraldSundisk/plantbox nik707 2019-10-07 15:20:24 -05:00
  • d9ff93fdff consistency Ghommie 2019-10-07 22:13:21 +02:00
  • 6fc2373a58 Adds some potted plants. EmeraldSundisk 2019-10-07 12:59:43 -07:00
  • 99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 Ghommie 2019-10-07 21:41:04 +02:00
  • 159d2a188d peeve. Ghommie 2019-10-07 17:38:36 +02:00
  • b95f910a4e macros Ghommie 2019-10-07 17:32:16 +02:00
  • 93ad7f1066 Corrects a missing tail state Poojawa 2019-10-07 04:30:23 -05:00
  • caf9bc56da Make replacement update icon Putnam 2019-10-07 01:34:22 -07:00