Commit Graph

  • bda2c740ba Merge branch 'master' into AnPrimAssistants lolman360 2020-08-21 11:08:13 +10:00
  • ab26e49293 Automatic changelog compile [ci skip] Changelogs 2020-08-21 00:45:25 +00:00
  • bb1d191647 Automatic changelog compile [ci skip] Changelogs 2020-08-21 00:44:26 +00:00
  • ff54b29e72 Haha terfs MrJWhit 2020-08-20 20:19:51 -04:00
  • 4b14914ff5 Automatic changelog compile [ci skip] Changelogs 2020-08-21 00:15:39 +00:00
  • eb2dadfd0d Automatic changelog compile [ci skip] Changelogs 2020-08-21 00:12:48 +00:00
  • cd10655985 fix 2 Ghom 2020-08-20 23:02:13 +02:00
  • 91764493fe Automatic changelog generation for PR #13223 [ci skip] CitadelStationBot 2020-08-20 15:58:57 -05:00
  • 88fb9d277a fix lizard snouts (#13223) Timothy Teakettle 2020-08-20 21:58:54 +01:00
  • c39764afde Merge branch 'Ghommie-cit835' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit835 Ghommie 2020-08-20 20:28:46 +02:00
  • 921a963e59 fix 1 Ghommie 2020-08-20 20:26:29 +02:00
  • 1242626faa Forgot the comment. Ghom 2020-08-20 19:01:13 +02:00
  • fde859bca0 Removing priority overlays, update_icon() splitup for guns. Ghommie 2020-08-20 18:33:23 +02:00
  • bc16a8f1b2 fix lizard snouts Timothy Teakettle 2020-08-20 16:39:07 +01:00
  • 02194633b5 initial commit - za hando Hatterhat 2020-08-20 09:14:30 -05:00
  • d51af28f77 Bumps min-pop to 25 Ludox 2020-08-20 14:39:04 +02:00
  • 8d70e21239 the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it. Letter N 2020-08-20 19:40:47 +08:00
  • 2dd3d71b19 config&copypaste chang. Letter N 2020-08-20 16:36:24 +08:00
  • 5bf32e1de8 Pubbystation Update MrJWhit 2020-08-20 01:58:00 -04:00
  • 3b7bca28b3 Functional* code Letter N 2020-08-20 13:50:33 +08:00
  • 4700aa5c16 OmegaStation Update MrJWhit 2020-08-20 01:25:31 -04:00
  • a6ed6a6928 Kilo station update MrJWhit 2020-08-20 01:21:07 -04:00
  • 5897c2f3e0 Delta station update MrJWhit 2020-08-20 01:09:55 -04:00
  • ce10f90b1c Automatic changelog generation for PR #13212 [ci skip] CitadelStationBot 2020-08-20 00:03:19 -05:00
  • 11467e1cae Merge pull request #13212 from Putnam3145/reftrack silicons 2020-08-19 22:03:16 -07:00
  • 4829c51f3a Metatstation update MrJWhit 2020-08-20 00:31:52 -04:00
  • b2f16d794d Automatic changelog generation for PR #13211 [ci skip] CitadelStationBot 2020-08-19 23:11:15 -05:00
  • 9de7a854b5 Merge pull request #13211 from LetterN/patch-3 silicons 2020-08-19 21:11:12 -07:00
  • d12cb37d88 Automatic changelog generation for PR #13183 [ci skip] CitadelStationBot 2020-08-19 23:04:01 -05:00
  • 91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix silicons 2020-08-19 21:03:58 -07:00
  • 0e2e4fdaf7 Merge pull request #13199 from lolman360/haha silicons 2020-08-19 21:03:21 -07:00
  • dc61b0fbd7 Captain Plasma -> Mumkey Jones MrJWhit 2020-08-19 23:25:27 -04:00
  • 0acbb0fc6b Merge remote-tracking branch 'upstream/master' DeltaFire 2020-08-20 05:21:15 +02:00
  • 23648a0c44 Automatic changelog generation for PR #13208 [ci skip] CitadelStationBot 2020-08-19 21:56:16 -05:00
  • 8a1cf1b860 Merge pull request #13208 from timothyteakettle/fuck silicons 2020-08-19 19:56:12 -07:00
  • 63e17875ac Boxstation expand MrJWhit 2020-08-19 21:46:28 -04:00
  • 01dabf7891 Automatic changelog compile [ci skip] Changelogs 2020-08-20 00:44:28 +00:00
  • 7ec14370e2 Automatic changelog compile [ci skip] Changelogs 2020-08-20 00:43:05 +00:00
  • 8eedd7174c Automatic changelog compile [ci skip] Changelogs 2020-08-20 00:15:07 +00:00
  • a0823ea54b Automatic changelog compile [ci skip] Changelogs 2020-08-20 00:14:25 +00:00
  • 63288afb72 Merge pull request #13216 from Citadel-Station-13/silicons-patch-21 Lin 2020-08-19 10:50:56 -05:00
  • 5414a8949c Update text.dm silicons 2020-08-19 08:50:26 -07:00
  • 43df1e7208 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-08-19 17:37:14 +02:00
  • 3d520782a3 Automatic changelog generation for PR #13214 [ci skip] CitadelStationBot 2020-08-19 10:36:05 -05:00
  • 69d2d697e5 Merge pull request #13214 from DeltaFire15/cooking-oil-fix silicons 2020-08-19 08:36:02 -07:00
  • 7a9796e782 minmax torture DeltaFire 2020-08-19 17:05:27 +02:00
  • 1982ad5ed1 Automatic changelog generation for PR #13210 [ci skip] CitadelStationBot 2020-08-19 08:59:40 -05:00
  • 747c2af995 Merge pull request #13210 from Hatterhat/pirate-bruh-moment silicons 2020-08-19 06:59:36 -07:00
  • 4259332cfd e lolman360 2020-08-19 18:37:31 +10:00
  • 1654a925b6 Update smoke_machine.dm lolman360 2020-08-19 18:26:53 +10:00
  • e82772dc44 kekw lolman360 2020-08-19 17:22:52 +10:00
  • 81dc6c7ee5 Ports reftracking from TG. Putnam 2020-08-18 20:41:43 -07:00
  • 8de7717b52 wounds moment Letter N 2020-08-19 11:01:38 +08:00
  • 0c4a3c740d >metabreaks >2020 Hatterhat 2020-08-18 21:50:57 -05:00
  • 37eb74b84d Merge remote-tracking branch 'upstream/master' DeltaFire 2020-08-19 04:31:43 +02:00
  • cc99a89027 Merge pull request #13206 from Citadel-Station-13/silicons-patch-18 Putnam3145 2020-08-18 19:24:14 -07:00
  • ee4da21d38 Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha lolman360 2020-08-19 12:20:38 +10:00
  • f35989b09e Merge remote-tracking branch 'upstream/master' into haha lolman360 2020-08-19 12:20:07 +10:00
  • b40a42209d fixes two snout paths timothyteakettle 2020-08-19 03:19:51 +01:00
  • 428d95b893 Automatic changelog generation for PR #13207 [ci skip] CitadelStationBot 2020-08-18 21:16:35 -05:00
  • 7eec264f45 Merge pull request #13207 from LetterN/patch-2 silicons 2020-08-18 19:16:31 -07:00
  • fa7b82694d src.islazy = TRUE Letter N 2020-08-19 10:04:56 +08:00
  • 5306da7938 Update code/modules/projectiles/guns/ballistic.dm lolman360 2020-08-19 12:02:53 +10:00
  • 09bba25050 Update code/modules/projectiles/boxes_magazines/_box_magazine.dm lolman360 2020-08-19 12:02:45 +10:00
  • a7a964154e Update code/modules/projectiles/boxes_magazines/_box_magazine.dm lolman360 2020-08-19 12:02:34 +10:00
  • b59d449a75 Update adminhelp.dm Letter N 2020-08-19 09:59:41 +08:00
  • 6eac8800b6 Automatic changelog generation for PR #13202 [ci skip] CitadelStationBot 2020-08-18 20:53:42 -05:00
  • 48652e4b0a Merge pull request #13202 from tiramisuapimancer/master silicons 2020-08-18 18:53:40 -07:00
  • ecff6bc36a Automatic changelog generation for PR #13194 [ci skip] CitadelStationBot 2020-08-18 20:53:24 -05:00
  • 04a0c2be6c Merge pull request #13194 from DeltaFire15/slab-wiki silicons 2020-08-18 18:53:21 -07:00
  • 0331f0cdc3 Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum silicons 2020-08-18 18:52:52 -07:00
  • ce80f64d27 Update suppression.dm silicons 2020-08-18 18:52:06 -07:00
  • c521d2502e Add files via upload EmeraldSundisk 2020-08-18 18:27:06 -07:00
  • 46a464d3b8 no it also cant be sentient timothyteakettle 2020-08-19 02:26:08 +01:00
  • 097851cbc4 better name timothyteakettle 2020-08-19 02:11:08 +01:00
  • 98baa09005 the aforementioned pet changes timothyteakettle 2020-08-19 01:47:11 +01:00
  • 4f315a2501 Automatic changelog compile [ci skip] Changelogs 2020-08-19 00:44:27 +00:00
  • e88b244a16 Automatic changelog compile [ci skip] Changelogs 2020-08-19 00:43:13 +00:00
  • 65508b8389 Automatic changelog compile [ci skip] Changelogs 2020-08-19 00:15:17 +00:00
  • b50ccb980c Automatic changelog compile [ci skip] Changelogs 2020-08-19 00:13:00 +00:00
  • 19dce2263d that too Timothy Teakettle 2020-08-18 17:49:01 +01:00
  • 945ac02152 small error Timothy Teakettle 2020-08-18 17:48:10 +01:00
  • 264e789c3d yes Timothy Teakettle 2020-08-18 17:38:20 +01:00
  • 6392367df4 donator items Timothy Teakettle 2020-08-18 17:28:09 +01:00
  • e00c383b1a Update belt.dm lolman360 2020-08-18 20:19:54 +10:00
  • 7390effcb9 e lolman360 2020-08-18 19:09:01 +10:00
  • 36bcc3a869 Merge branch 'plumb' of https://github.com/lolman360/Citadel-Station-13 into plumb lolman360 2020-08-18 18:57:35 +10:00
  • b466a5aae9 e lolman360 2020-08-18 18:57:23 +10:00
  • 92a664bb68 Update engine_teg.dmm MrJWhit 2020-08-18 04:32:47 -04:00
  • 4e23559065 Update sheet_types.dm lolman360 2020-08-18 18:15:24 +10:00
  • 5adb1c75d5 Update engine_teg.dmm MrJWhit 2020-08-18 03:45:37 -04:00
  • 9931cb006c eee lolman360 2020-08-18 17:33:20 +10:00
  • 13609ba6e6 Update ethereal.dm tiramisuapimancer 2020-08-17 23:01:01 -08:00
  • bd239b01b3 Update recipes_clothing.dm kiwedespars 2020-08-17 23:52:41 -07:00
  • d8e286d7be ee lolman360 2020-08-18 16:17:00 +10:00
  • 325f4eb72e Updates 2 lolman360 2020-08-18 15:43:44 +10:00
  • 3040032409 documentation updates lolman360 2020-08-18 15:42:19 +10:00
  • 8085ab01d9 culst! lolman360 2020-08-18 15:38:59 +10:00
  • 8f5078a15a Update mineral.dm lolman360 2020-08-18 14:47:47 +10:00
  • 0b4dfbfebc builds tgui. note: custom cit tgui's still need checking Letter N 2020-08-18 12:33:09 +08:00