Commit Graph

  • 6f21b23a87 Fixes Shit. lolman360 2020-08-18 14:28:57 +10:00
  • f2a86f2c42 Update medical_designs.dm lolman360 2020-08-18 14:23:09 +10:00
  • f02d2080bc Update _box_magazine.dm lolman360 2020-08-18 13:46:01 +10:00
  • 8027706bea Update _box_magazine.dm lolman360 2020-08-18 13:45:44 +10:00
  • 5e9af664ec Update CogStation.dmm EmeraldSundisk 2020-08-17 20:39:54 -07:00
  • 5dff3e9a04 deletes ping Letter N 2020-08-18 11:35:10 +08:00
  • 2d1edc9fa2 Update _box_magazine.dm lolman360 2020-08-18 13:30:49 +10:00
  • 8356dbf20a Update medical_designs.dm lolman360 2020-08-18 13:26:32 +10:00
  • 50eca19658 Revert "load_delay var for /obj/item/ammo_box, nerfs shotgun stripper clips (hatter why'd you pr them)" silicons 2020-08-17 20:20:04 -07:00
  • 83df9159de GOONCHAT IS DEAD! LONG LIVE THE KING! Letter N 2020-08-18 10:51:13 +08:00
  • 90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT Letter N 2020-08-18 10:33:21 +08:00
  • 4ab53ae9c4 Automatic changelog compile [ci skip] Changelogs 2020-08-18 00:43:51 +00:00
  • bf361337a5 Automatic changelog compile [ci skip] Changelogs 2020-08-18 00:42:53 +00:00
  • 32c0335a17 Update medical_designs.dm lolman360 2020-08-18 10:35:56 +10:00
  • d312a5d639 fix tails timothyteakettle 2020-08-18 01:32:06 +01:00
  • 9bc751b5a6 Automatic changelog compile [ci skip] Changelogs 2020-08-18 00:15:16 +00:00
  • 20648fc1bb Automatic changelog compile [ci skip] Changelogs 2020-08-18 00:12:17 +00:00
  • 93fa8b72b8 w e w lolman360 2020-08-18 10:05:54 +10:00
  • bb86003510 w e w lolman360 2020-08-18 10:04:52 +10:00
  • 47424be1c0 tail fix timothyteakettle 2020-08-18 00:46:05 +01:00
  • a7a58ce81d this might work better Hatterhat 2020-08-17 18:30:00 -05:00
  • 0d3e95803c Automatic changelog generation for PR #13195 [ci skip] CitadelStationBot 2020-08-17 18:24:23 -05:00
  • 7d5d2b969e Merge pull request #13195 from Detective-Google/hotfix silicons 2020-08-17 16:24:19 -07:00
  • eb69035240 holy shit i despise the copypaste on this one Hatterhat 2020-08-17 12:39:49 -05:00
  • b13048f636 makes glass floors actually deconstructable Detective Google 2020-08-17 12:15:09 -05:00
  • f1b0e72676 Automatic changelog generation for PR #13108 [ci skip] CitadelStationBot 2020-08-17 10:58:04 -05:00
  • d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum silicons 2020-08-17 08:58:00 -07:00
  • 31f1e04654 updates the helpertext in general DeltaFire 2020-08-17 17:03:53 +02:00
  • c74803dd1a updates the wiki page link DeltaFire 2020-08-17 16:53:49 +02:00
  • fc3948ef3f Merge remote-tracking branch 'upstream/master' DeltaFire 2020-08-17 16:13:43 +02:00
  • 55bd3ecc26 actual tgui code Letter N 2020-08-17 21:07:09 +08:00
  • 610e25beb7 oops updates asset cache Letter N 2020-08-17 20:51:05 +08:00
  • 2f14d8998b Update autohydro.dm lolman360 2020-08-17 22:42:41 +10:00
  • 621f32adc3 Update output.dm silicons 2020-08-17 03:43:32 -07:00
  • e087845745 reee SmArtKar 2020-08-17 13:32:18 +03:00
  • c1a2d907f1 Automatic changelog generation for PR #13190 [ci skip] CitadelStationBot 2020-08-17 05:15:50 -05:00
  • d16a1ae301 Merge pull request #13190 from Detective-Google/art silicons 2020-08-17 03:15:47 -07:00
  • 56d49aac2e Merge pull request #13186 from Detective-Google/telebort silicons 2020-08-17 03:15:37 -07:00
  • 1889092914 Automatic changelog generation for PR #13185 [ci skip] CitadelStationBot 2020-08-17 05:15:20 -05:00
  • 3d69f65c6b Merge pull request #13185 from Hatterhat/large-demons silicons 2020-08-17 03:15:16 -07:00
  • 5c8378a6f0 Automatic changelog generation for PR #13180 [ci skip] CitadelStationBot 2020-08-17 05:14:19 -05:00
  • f611945b34 Merge pull request #13180 from Detective-Google/glass-floors silicons 2020-08-17 03:14:15 -07:00
  • 7a24842c0a Automatic changelog generation for PR #13179 [ci skip] CitadelStationBot 2020-08-17 05:13:51 -05:00
  • 7d2d4d870c Merge pull request #13179 from Detective-Google/if-chain-begoen silicons 2020-08-17 03:13:48 -07:00
  • 23b4ba3714 Merge pull request #13063 from silicons/supermatter Putnam3145 2020-08-17 03:13:14 -07:00
  • 8e9fb8eaae Buffs/hugboxes slaughter demons Putnam 2020-08-17 01:39:51 -07:00
  • eed7e4ad02 also painting frames Detective Google 2020-08-17 00:39:25 -05:00
  • ee7c528185 adds art to ghost cafe Detective Google 2020-08-17 00:36:09 -05:00
  • f5300750b5 Revert "[TESTMERGE ONLY] FUCK" Timothy Teakettle 2020-08-17 03:18:36 +01:00
  • d285e9f005 Merge pull request #13187 from Citadel-Station-13/revert-13110-cum Lin 2020-08-16 21:16:42 -05:00
  • 4cd731ce11 Revert "cease your shitcode: cum edition" silicons 2020-08-16 19:06:57 -07:00
  • 3ac272c9be a few other little cleanups while I'm opening a PR Detective Google 2020-08-16 21:03:11 -05:00
  • 83332453b6 clarifies a bit more where each pad goes on snaxi. Detective Google 2020-08-16 21:01:09 -05:00
  • 3b2d93dcce Automatic changelog generation for PR #13110 [ci skip] CitadelStationBot 2020-08-16 20:56:17 -05:00
  • c210667237 Automatic changelog generation for PR #13122 [ci skip] CitadelStationBot 2020-08-16 20:56:16 -05:00
  • 56d15c7829 Automatic changelog generation for PR #13124 [ci skip] CitadelStationBot 2020-08-16 20:56:14 -05:00
  • 604fdff241 Automatic changelog generation for PR #13135 [ci skip] CitadelStationBot 2020-08-16 20:56:13 -05:00
  • e86a51e302 Automatic changelog generation for PR #13141 [ci skip] CitadelStationBot 2020-08-16 20:56:12 -05:00
  • 514241e1fa Automatic changelog generation for PR #13144 [ci skip] CitadelStationBot 2020-08-16 20:56:11 -05:00
  • 6be76bdefd Automatic changelog generation for PR #13148 [ci skip] CitadelStationBot 2020-08-16 20:56:10 -05:00
  • 2b919f3888 Automatic changelog generation for PR #13159 [ci skip] CitadelStationBot 2020-08-16 20:56:07 -05:00
  • 17cb79cea4 Automatic changelog generation for PR #13164 [ci skip] CitadelStationBot 2020-08-16 20:56:06 -05:00
  • b7530eff6d Automatic changelog generation for PR #13167 [ci skip] CitadelStationBot 2020-08-16 20:56:05 -05:00
  • 5be2587b1e Automatic changelog generation for PR #13168 [ci skip] CitadelStationBot 2020-08-16 20:56:04 -05:00
  • 054c7fe5c5 Automatic changelog generation for PR #13169 [ci skip] CitadelStationBot 2020-08-16 20:56:03 -05:00
  • 1194341659 Automatic changelog generation for PR #13176 [ci skip] CitadelStationBot 2020-08-16 20:56:01 -05:00
  • f3da72137d Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/CitadelStation13 silicons 2020-08-16 18:55:36 -07:00
  • 8dedcbcf76 Merge branch '13113' silicons 2020-08-16 18:53:35 -07:00
  • ac7bdb5db5 Merge branch '13175' silicons 2020-08-16 18:53:00 -07:00
  • 1f0f5d621a Merge branch '13176' silicons 2020-08-16 18:52:48 -07:00
  • 83b41b1a0f Merge branch '13174' silicons 2020-08-16 18:52:33 -07:00
  • 2095e2705f Merge branch '13169' silicons 2020-08-16 18:52:13 -07:00
  • 690f610f62 Merge branch '13168' silicons 2020-08-16 18:52:04 -07:00
  • 384e5ae311 Merge branch '13167' silicons 2020-08-16 18:51:48 -07:00
  • 83e72b4f96 Merge branch '13164' silicons 2020-08-16 18:51:36 -07:00
  • a900c07846 Merge branch '13163' silicons 2020-08-16 18:51:24 -07:00
  • a1a26d6941 Merge branch '13159' silicons 2020-08-16 18:51:07 -07:00
  • 66322c4d38 Merge branch '13156' silicons 2020-08-16 18:50:29 -07:00
  • 806a0d289b Merge branch '13153' silicons 2020-08-16 18:50:16 -07:00
  • 451d5e52de Merge branch '13148' silicons 2020-08-16 18:49:57 -07:00
  • b8686ab0f9 Update _vehicle.dm silicons 2020-08-16 18:49:49 -07:00
  • bc1fad653b Merge branch '13147' silicons 2020-08-16 18:48:57 -07:00
  • b767c99bac Merge branch '13144' silicons 2020-08-16 18:48:14 -07:00
  • 44e2327280 Merge branch '13143' silicons 2020-08-16 18:47:48 -07:00
  • 59f2d1ea75 Merge branch '13142' silicons 2020-08-16 18:47:07 -07:00
  • 38959b6120 Merge branch '13141' silicons 2020-08-16 18:46:33 -07:00
  • 9602f0742e Merge branch '13135' silicons 2020-08-16 18:46:06 -07:00
  • b7b13403b9 Merge branch '13130' silicons 2020-08-16 18:45:54 -07:00
  • 397cdb6c03 Merge branch '13129' silicons 2020-08-16 18:45:35 -07:00
  • 09fc795f3b AnPrim lolman360 2020-08-17 11:45:24 +10:00
  • fe7d8860f5 Merge branch '13124' silicons 2020-08-16 18:45:23 -07:00
  • 53fe2c95c5 Merge branch 'pr-13122' silicons 2020-08-16 18:45:01 -07:00
  • b56742beb5 Merge branch 'pr-13110' silicons 2020-08-16 18:40:23 -07:00
  • 9c63a09907 Merge branch 'pr-13087' silicons 2020-08-16 18:40:07 -07:00
  • bdacd72f3d Automatic changelog generation for PR #13067 [ci skip] CitadelStationBot 2020-08-16 20:38:56 -05:00
  • 01dd2f389b Merge branch 'pr-13067' silicons 2020-08-16 18:38:13 -07:00
  • fa11480781 Merge pull request #13109 from Detective-Google/sm-fix silicons 2020-08-16 18:36:16 -07:00
  • 6f0c6ca88d Automatic changelog generation for PR #13037 [ci skip] CitadelStationBot 2020-08-16 20:35:08 -05:00
  • 428bb936aa Merge pull request #13037 from timothyteakettle/freedom-in-customisation silicons 2020-08-16 18:35:05 -07:00
  • dbf065526a Automatic changelog generation for PR #13092 [ci skip] CitadelStationBot 2020-08-16 20:20:32 -05:00