Commit Graph

  • bfbe472114 Merge pull request #12587 from Ragolution/peachesnz silicons 2020-06-29 14:22:32 -07:00
  • 2d6035c84f Automatic changelog generation for PR #12645 [ci skip] CitadelStationBot 2020-06-29 16:18:15 -05:00
  • 26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 silicons 2020-06-29 14:18:10 -07:00
  • fdd8fec4ef Automatic changelog generation for PR #12390 [ci skip] CitadelStationBot 2020-06-29 14:44:36 -05:00
  • ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 Putnam3145 2020-06-29 12:44:33 -07:00
  • 62b4c54064 Automatic changelog generation for PR #12416 [ci skip] CitadelStationBot 2020-06-29 14:44:11 -05:00
  • 42809d8b0c Merge pull request #12416 from Ghommie/Ghommie-cit792 Putnam3145 2020-06-29 12:44:08 -07:00
  • fa25858fd7 Fix. :) Ghommie 2020-06-29 21:31:24 +02:00
  • 9930244aae Automatic changelog generation for PR #12622 [ci skip] CitadelStationBot 2020-06-29 14:13:09 -05:00
  • b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes Ghom 2020-06-29 21:13:06 +02:00
  • 74a3f05c2a Merge pull request #12608 from Citadel-Station-13/silicons-patch-5 Lin 2020-06-29 13:14:43 -05:00
  • 4484b1b7d6 Automatic changelog generation for PR #12605 [ci skip] CitadelStationBot 2020-06-29 13:12:29 -05:00
  • 0a59453ce6 Merge pull request #12605 from Citadel-Station-13/silicons-patch-4 Lin 2020-06-29 13:12:25 -05:00
  • 29e4f1ee09 Automatic changelog generation for PR #12595 [ci skip] CitadelStationBot 2020-06-29 13:11:42 -05:00
  • 1966c6daca Merge pull request #12595 from silicons/squish Lin 2020-06-29 13:11:38 -05:00
  • a3f275a804 Automatic changelog generation for PR #12623 [ci skip] CitadelStationBot 2020-06-29 12:30:52 -05:00
  • a749dab2b2 Merge pull request #12623 from Citadel-Station-13/silicons-patch-7 Ghom 2020-06-29 19:30:49 +02:00
  • 7c1328a4ca Automatic changelog generation for PR #12626 [ci skip] CitadelStationBot 2020-06-29 12:27:10 -05:00
  • a8046d072a Merge pull request #12626 from Citadel-Station-13/silicons-patch-10 Ghom 2020-06-29 19:27:07 +02:00
  • 8cc7b4fea0 Merge pull request #12643 from YakumoChen/master Ghom 2020-06-29 19:25:34 +02:00
  • bda7eada3d Icons for later. Ghommie 2020-06-29 19:23:52 +02:00
  • 0779dd560e More and more fixes. Ghommie 2020-06-29 18:52:37 +02:00
  • 70a2238f04 more pet carrier changes Timothy Teakettle 2020-06-29 17:43:16 +01:00
  • 58e606b4f2 Merge pull request #12640 from Citadel-Station-13/silicons-patch-6 Ghom 2020-06-29 18:34:07 +02:00
  • 5967a552bf Automatic changelog generation for PR #12644 [ci skip] CitadelStationBot 2020-06-29 11:29:11 -05:00
  • 3264ece150 Merge pull request #12644 from timothyteakettle/more-blood-fixes Ghom 2020-06-29 18:29:07 +02:00
  • 9d134f4fc9 blood fix Timothy Teakettle 2020-06-29 16:34:55 +01:00
  • 3b802ac062 actually stocks the new clothing YakumoChen 2020-06-29 13:38:36 +00:00
  • 2f3f823997 Merge pull request #2 from Citadel-Station-13/master YakumoChen 2020-06-29 09:37:22 -04:00
  • 6265cb190b Update bindings_client.dm silicons 2020-06-29 05:04:28 -07:00
  • c88b7721ad Update policy.dm silicons 2020-06-29 05:03:45 -07:00
  • 836391075f Update config_entry.dm silicons 2020-06-29 05:03:13 -07:00
  • 7b101a801c Update configuration.dm silicons 2020-06-29 04:55:22 -07:00
  • d6a7f91b81 Update autobunker.dm silicons 2020-06-29 04:45:05 -07:00
  • 9697e1b946 Update bindings_client.dm silicons 2020-06-29 04:42:58 -07:00
  • 5307676317 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 Ghommie 2020-06-29 06:55:35 +02:00
  • 2e4c5e322d tray and jar timothyteakettle 2020-06-29 02:49:31 +01:00
  • 53a9dd560b Automatic changelog compile [ci skip] Changelogs 2020-06-29 00:09:07 +00:00
  • 9b7690d90c Merge pull request #12633 from Ghommie/Ghommie-cit824 silicons 2020-06-28 12:53:54 -07:00
  • cf53a3d38d Automatic changelog generation for PR #12637 [ci skip] CitadelStationBot 2020-06-28 14:53:39 -05:00
  • abbbda15ef Merge pull request #12637 from timothyteakettle/fixes-my-dumb-mistakes silicons 2020-06-28 12:53:36 -07:00
  • f1aedce87b Merge pull request #12621 from Citadel-Station-13/silicons-patch-6 Lin 2020-06-28 13:36:55 -05:00
  • 436c41d343 Forgot about this. Ghommie 2020-06-28 19:33:22 +02:00
  • 2f5d351d70 Just ups stamina cost for bashing people. Ghommie 2020-06-28 18:47:55 +02:00
  • d6cfd957ad fix shoes Timothy Teakettle 2020-06-28 17:26:50 +01:00
  • ae49152e10 fixes my stupid mistake Timothy Teakettle 2020-06-28 17:05:30 +01:00
  • 6e242914d1 Automatic changelog generation for PR #12611 [ci skip] CitadelStationBot 2020-06-27 22:01:31 -05:00
  • 9e29ae97af Merge pull request #12611 from b1tt3r1n0/fucksdgf Ghom 2020-06-28 05:01:28 +02:00
  • 65ffadaa18 Few issues, solved. Ghommie 2020-06-28 04:51:02 +02:00
  • 6e90560173 Nerfs natural stamina recovery outside of stam-crit. Ghommie 2020-06-28 02:40:16 +02:00
  • 2af7bed457 Automatic changelog compile [ci skip] Changelogs 2020-06-28 00:08:42 +00:00
  • a2a2476243 Update shaft_miner.dm Ghom 2020-06-28 02:03:35 +02:00
  • 86241dbe8d ah Ghommie 2020-06-28 01:15:36 +02:00
  • a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. Ghommie 2020-06-28 01:10:22 +02:00
  • 548fabfb2d viscera cleanup detail kappa-sama 2020-06-27 18:21:22 -04:00
  • fec2d1aded someone call the janitor kappa-sama 2020-06-27 18:21:01 -04:00
  • bf6a1b3de4 cleanup crew kappa-sama 2020-06-27 18:20:40 -04:00
  • 5787a75dee node kappa-sama 2020-06-27 18:20:13 -04:00
  • d98175d947 decal painter to lathe kappa-sama 2020-06-27 18:19:49 -04:00
  • 0d5888daf6 Merge pull request #12628 from Citadel-Station-13/silicons-patch-11 Ghom 2020-06-28 00:19:38 +02:00
  • 61caf7dde2 spraycan kappa-sama 2020-06-27 18:15:20 -04:00
  • 579727d41d spraycans kappa-sama 2020-06-27 18:14:20 -04:00
  • a96bd52c91 airlock painting kappa-sama 2020-06-27 18:13:09 -04:00
  • 74a2377bc1 Automatic changelog generation for PR #12603 [ci skip] CitadelStationBot 2020-06-27 16:55:00 -05:00
  • 2ab69c0170 Merge pull request #12603 from b1tt3r1n0/Pouches(again) silicons 2020-06-27 14:54:57 -07:00
  • 5d1e806bdc Automatic changelog generation for PR #12601 [ci skip] CitadelStationBot 2020-06-27 16:54:47 -05:00
  • 5c10370326 Merge pull request #12601 from Detective-Google/piggyback silicons 2020-06-27 14:54:44 -07:00
  • a1934f5280 Automatic changelog generation for PR #12607 [ci skip] CitadelStationBot 2020-06-27 16:54:34 -05:00
  • e51bee9649 Merge pull request #12607 from Detective-Google/cog-2 silicons 2020-06-27 14:54:31 -07:00
  • 24fa9e2887 Automatic changelog generation for PR #12591 [ci skip] CitadelStationBot 2020-06-27 16:53:55 -05:00
  • 7115df73f7 Merge pull request #12591 from MrJWhit/snow-snaxi-update silicons 2020-06-27 14:53:52 -07:00
  • 0b2e7aa441 Automatic changelog generation for PR #12596 [ci skip] CitadelStationBot 2020-06-27 16:53:32 -05:00
  • 45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819 silicons 2020-06-27 14:53:28 -07:00
  • a66fc1db07 Automatic changelog generation for PR #12615 [ci skip] CitadelStationBot 2020-06-27 16:53:04 -05:00
  • 8b04fd70de Merge pull request #12615 from Ghommie/Ghommie-cit821 silicons 2020-06-27 14:52:59 -07:00
  • 4e52d51cc7 Automatic changelog generation for PR #12619 [ci skip] CitadelStationBot 2020-06-27 15:14:21 -05:00
  • 58778f2e6e Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck Ghom 2020-06-27 22:14:17 +02:00
  • 0c4e1e7696 Update SDQL_2_wrappers.dm silicons 2020-06-27 07:17:29 -07:00
  • 0970234483 Automatic changelog generation for PR #12627 [ci skip] CitadelStationBot 2020-06-27 08:53:40 -05:00
  • 3dbc10bced Merge pull request #12627 from Putnam3145/song-by-jimmy-buffet silicons 2020-06-27 06:53:37 -07:00
  • e407ca754f You can save the whales, you can save the toads Putnam 2020-06-27 06:42:27 -07:00
  • 3aefc8ae10 tg changes L 2020-06-27 07:01:19 -03:00
  • ced24b8931 Update input.dm silicons 2020-06-27 01:39:34 -07:00
  • 0e2f3d0f04 Update input.dm silicons 2020-06-27 01:29:26 -07:00
  • 30a4bb5683 Update client_procs.dm silicons 2020-06-27 01:20:15 -07:00
  • 2ea030ca3e fix silicons 2020-06-26 23:53:52 -07:00
  • 2a0b3ce036 typo silicons 2020-06-26 23:48:56 -07:00
  • 1d4a54d880 log silicons 2020-06-26 23:47:16 -07:00
  • 0df5aa083b policies and code hooks silicons 2020-06-26 23:41:44 -07:00
  • 90e9a647ed Update mentorpm.dm silicons 2020-06-26 22:39:17 -07:00
  • e3ed6ead49 Merge pull request #12618 from Ragolution/clapclap-done BlackMajor 2020-06-27 17:10:48 +12:00
  • b94267e1e1 more spellchecks timothyteakettle 2020-06-27 02:41:50 +01:00
  • 76b5557e1e bunch of grammar corrections timothyteakettle 2020-06-27 02:12:44 +01:00
  • 3c4d3791a4 Update life.dm silicons 2020-06-26 17:21:20 -07:00
  • 6a9dd435e3 Automatic changelog compile [ci skip] Changelogs 2020-06-27 00:10:19 +00:00
  • 6dc290a192 Automatic changelog compile [ci skip] Changelogs 2020-06-27 00:08:12 +00:00
  • 2926f8dab1 Add files via upload EmeraldSundisk 2020-06-26 16:40:01 -07:00
  • 37f2242eec Update OmegaStation.dmm EmeraldSundisk 2020-06-26 15:08:21 -07:00
  • 9c9868438c some fixes Timothy Teakettle 2020-06-26 22:49:43 +01:00
  • fe021f2dc8 Merge pull request #12616 from Citadel-Station-13/silicons-patch-6 Ghom 2020-06-26 21:52:20 +02:00