shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • eeee2140bd Merge pull request #12554 from deathride58/bluespaceshenanigans kevinz000 2020-06-17 20:06:50 -07:00
  • a4fafad137 Automatic changelog generation for PR #12482 [ci skip] CitadelStationBot 2020-06-17 20:03:28 -05:00
  • 46fdb476b5 Merge pull request #12482 from TheSpaghetti/patch-1 Lin 2020-06-17 20:03:25 -05:00
  • 898480af84 fixes some missing icon statesa on moonoutpost and UO45 Detective Google 2020-06-17 19:48:28 -05:00
  • 0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) Detective Google 2020-06-17 19:33:14 -05:00
  • 30e0c34286 Automatic changelog compile [ci skip] Changelogs 2020-06-18 00:17:37 +00:00
  • 4d0421f9cd Automatic changelog compile [ci skip] Changelogs 2020-06-18 00:17:23 +00:00
  • 090c121b23 Automatic changelog compile [ci skip] Changelogs 2020-06-18 00:09:47 +00:00
  • bb2028cc76 Automatic changelog compile [ci skip] Changelogs 2020-06-18 00:07:42 +00:00
  • aa798af36e Fix square root circuit to check the only input it has Funce 2020-06-18 08:50:29 +12:00
  • 1a40fa73fb fixes an upstream oversight that completely bricks a downstream's atmos deathride58 2020-06-17 15:24:17 -04:00
  • f0f2a7eaf2 Update world.dm kevinz000 2020-06-17 11:12:34 -07:00
  • 54c5a847b7 Automatic changelog generation for PR #12540 [ci skip] CitadelStationBot 2020-06-17 11:15:35 -05:00
  • 53dc2da8c7 Merge pull request #12540 from timothyteakettle/embed-changes kevinz000 2020-06-17 09:15:32 -07:00
  • 2229db2214 Merge branch 'master' into embed-changes Timothy Teakettle 2020-06-17 16:40:34 +01:00
  • e9b0dc898a Automatic changelog generation for PR #12537 [ci skip] CitadelStationBot 2020-06-17 10:35:53 -05:00
  • eb572c9d47 Merge pull request #12537 from timothyteakettle/ports-tipping-medibots kevinz000 2020-06-17 08:35:50 -07:00
  • 93eef9fb13 Automatic changelog generation for PR #12544 [ci skip] CitadelStationBot 2020-06-17 10:35:37 -05:00
  • 2e943e03a3 Merge pull request #12544 from SmArtKar/bee_shuttles kevinz000 2020-06-17 08:35:34 -07:00
  • 92a60d6e68 Makes it actually work Artur 2020-06-17 17:37:03 +03:00
  • 7055e6c47a Ports https://github.com/tgstation/tgstation/pull/51585 Artur 2020-06-17 17:07:42 +03:00
  • 43951bf44e Ports https://github.com/tgstation/tgstation/pull/51152 Artur 2020-06-17 17:01:55 +03:00
  • bac16dbf61 Trying to fix the examine bug.. Artur 2020-06-17 16:13:10 +03:00
  • 4e1817d2be why were these tabs? Trilbyspaceclone 2020-06-17 03:22:29 -04:00
  • 4d9eeae268 Update necropolis_chests.dm Trilbyspaceclone 2020-06-17 03:08:52 -04:00
  • 51da7dfa71 Merge branch 'master' into spike-loot-differentces Trilbyspaceclone 2020-06-17 02:36:52 -04:00
  • fbf09e84c4 Merge pull request #12531 from Detective-Google/o7-icebox kevinz000 2020-06-16 23:36:41 -07:00
  • 5e2d5c2b09 Automatic changelog generation for PR #12530 [ci skip] CitadelStationBot 2020-06-17 01:32:52 -05:00
  • ba162eb90a Merge pull request #12530 from Detective-Google/no-more-100%-chance-combat-upgrade kevinz000 2020-06-16 23:32:48 -07:00
  • ff4d6e3dee Automatic changelog generation for PR #12538 [ci skip] CitadelStationBot 2020-06-17 01:32:18 -05:00
  • bd9ce04471 some cog touchups (#12538) kevinz000 2020-06-16 23:32:14 -07:00
  • d1cd0b0601 Automatic changelog generation for PR #12539 [ci skip] CitadelStationBot 2020-06-17 01:32:08 -05:00
  • 9d956e7c1c a couple little snaxi fixes (#12539) Detective-Google 2020-06-17 01:32:04 -05:00
  • 80f4c1556e Automatic changelog compile [ci skip] Changelogs 2020-06-17 00:17:31 +00:00
  • aa28d1dd5d Automatic changelog compile [ci skip] Changelogs 2020-06-17 00:17:03 +00:00
  • 30281fe4fd Automatic changelog compile [ci skip] Changelogs 2020-06-17 00:09:31 +00:00
  • d9d3eb15f1 Automatic changelog compile [ci skip] Changelogs 2020-06-17 00:07:45 +00:00
  • 176b6bcf14 Automatic changelog generation for PR #12535 [ci skip] CitadelStationBot 2020-06-16 18:23:20 -05:00
  • 29ff6fc464 Updating ID Icons (#12535) SmArtKar 2020-06-17 02:23:17 +03:00
  • 17ac614ba5 Automatic changelog generation for PR #12532 [ci skip] CitadelStationBot 2020-06-16 18:22:59 -05:00
  • 170a38a3a7 Porting sutures and meshes from /TG/ (#12532) SmArtKar 2020-06-17 02:22:56 +03:00
  • d1432e20b0 woops make it back to 10 minutes Timothy Teakettle 2020-06-16 23:54:44 +01:00
  • 2d1d2eeda6 final fixes Timothy Teakettle 2020-06-16 23:47:22 +01:00
  • f054ae6288 appease our great linter overlord Timothy Teakettle 2020-06-16 21:40:50 +01:00
  • f4913af4ee woops did i forget that Timothy Teakettle 2020-06-16 20:08:30 +01:00
  • 78ff5727cd Hopefully fixed the away mission gateways Artur 2020-06-16 21:18:58 +03:00
  • 882c11e0e5 This is every single onstation gateway r-r-ight? Artur 2020-06-16 20:53:56 +03:00
  • 89bd474192 update antag huds Timothy Teakettle 2020-06-16 18:45:06 +01:00
  • 74d7e2ea8a further sprite fixes Timothy Teakettle 2020-06-16 18:32:25 +01:00
  • 157be39f44 fix sprites Timothy Teakettle 2020-06-16 17:32:58 +01:00
  • 779e15f3b5 map fixes Timothy Teakettle 2020-06-16 17:16:31 +01:00
  • a0ecf85e4b Update conveyor2.dm kevinz000 2020-06-16 08:27:58 -07:00
  • f6a4e26e91 Automatic changelog generation for PR #12543 [ci skip] CitadelStationBot 2020-06-16 10:25:25 -05:00
  • 8f35795971 Update autobotter_designs.dm (#12543) Trilbyspaceclone 2020-06-16 11:25:21 -04:00
  • d10dfbec5e fix maps but it works Timothy Teakettle 2020-06-16 16:23:53 +01:00
  • 46c3e9e54d Shuttles SmArtKar 2020-06-16 18:16:14 +03:00
  • 390419cfaa Stupid mistake Artur 2020-06-16 17:21:46 +03:00
  • bc30fb7710 Hard resets _maps to master Artur 2020-06-16 16:09:05 +03:00
  • b59c8c1af6 fix maps timothyteakettle 2020-06-16 02:44:11 +01:00
  • b13fcf9f2c WIP, let's just use TG's cause i'm dull Ghommie 2020-06-16 03:22:04 +02:00
  • 8a1290b562 Update vent_clog.dm bunny232 2020-06-15 21:04:06 -04:00
  • c9b1bbdb2c Update vent_clog.dm bunny232 2020-06-15 21:00:07 -04:00
  • a61b63c1aa fix ricochets properly timothyteakettle 2020-06-16 01:18:45 +01:00
  • e8de29a8ce Automatic changelog compile [ci skip] Changelogs 2020-06-16 00:08:12 +00:00
  • 002fa1da1d how did i fuck that up timothyteakettle 2020-06-16 00:34:28 +01:00
  • 5df0cbfc40 Manual mapedit Artur 2020-06-16 02:29:05 +03:00
  • d22520d621 chmod permission fixes for travis Artur 2020-06-16 02:01:44 +03:00
  • 35aa1c4520 merge conflict fixes timothyteakettle 2020-06-15 23:56:46 +01:00
  • 61c338ca8c Merge branch 'embed-changes' of https://github.com/timothyteakettle/Citadel-Station-13 into embed-changes timothyteakettle 2020-06-15 23:50:35 +01:00
  • e010212180 please work timothyteakettle 2020-06-15 23:49:38 +01:00
  • ae7aea43b2 Annoying map shjit Artur 2020-06-16 01:37:25 +03:00
  • eba1e8f301 fixes the merge conflicts Timothy Teakettle 2020-06-15 23:29:49 +01:00
  • ceba739231 Cooonflicts Artur 2020-06-16 01:23:42 +03:00
  • 86331912e7 Fucking vr sleeper aaa Artur 2020-06-16 01:18:59 +03:00
  • 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes Timothy Teakettle 2020-06-15 22:48:26 +01:00
  • c1d966ca44 Merge branch 'master' into embed-changes Timothy Teakettle 2020-06-15 22:45:09 +01:00
  • 513a4e3d92 fixes udders more Timothy Teakettle 2020-06-15 22:44:05 +01:00
  • 1fe25ce420 fixes udders Timothy Teakettle 2020-06-15 22:40:10 +01:00
  • 92148e24aa missed a file and some sprites Timothy Teakettle 2020-06-15 22:01:49 +01:00
  • 7f2155ea2e fix sprite Timothy Teakettle 2020-06-15 21:44:18 +01:00
  • 3811fcbcf1 some fixes Timothy Teakettle 2020-06-15 21:30:14 +01:00
  • 8d0ac2b5fd fix some sprites Timothy Teakettle 2020-06-15 20:57:44 +01:00
  • d7bce8aec0 ports some events Timothy Teakettle 2020-06-15 20:22:40 +01:00
  • 1d3cad02ef Automatic changelog generation for PR #12521 [ci skip] CitadelStationBot 2020-06-15 14:07:17 -05:00
  • 106a79d50b Merge pull request #12521 from Citadel-Station-13/kevinz000-patch-21 Lin 2020-06-15 14:07:13 -05:00
  • cb9bb35823 Automatic changelog generation for PR #12520 [ci skip] CitadelStationBot 2020-06-15 14:06:35 -05:00
  • 898b0b6337 Merge pull request #12520 from Citadel-Station-13/kevinz000-patch-20 Lin 2020-06-15 14:06:32 -05:00
  • 9e4081ddca Merge pull request #12522 from Citadel-Station-13/kevinz000-patch-22 Lin 2020-06-15 14:04:50 -05:00
  • b215c5ed1f Automatic changelog generation for PR #12518 [ci skip] CitadelStationBot 2020-06-15 13:59:44 -05:00
  • fd662047f3 Merge pull request #12518 from kevinz000/pp_fix Lin 2020-06-15 13:59:41 -05:00
  • 3670818cbb more damage, no dismember, combat lock Timothy Teakettle 2020-06-15 14:40:33 +01:00
  • 1683829a21 Automatic changelog generation for PR #12393 [ci skip] CitadelStationBot 2020-06-15 01:06:47 -05:00
  • c054b55d98 Automatic changelog generation for PR #12375 [ci skip] CitadelStationBot 2020-06-15 01:06:09 -05:00
  • d7fd26c2a9 Moves decal painting from BEPIS into venders (#12393) Trilbyspaceclone 2020-06-15 02:04:51 -04:00
  • 7513e032e3 petrification improvements (#12375) Ghom 2020-06-15 08:04:12 +02:00
  • 8ee2f46ca2 Automatic changelog generation for PR #12509 [ci skip] CitadelStationBot 2020-06-15 01:02:26 -05:00
  • 6798699b18 slimes can change their body color using alter form (#12509) Timothy Teakettle 2020-06-15 07:02:23 +01:00
  • a436692b4e Automatic changelog generation for PR #12523 [ci skip] CitadelStationBot 2020-06-15 00:51:36 -05:00
  • 5df4931266 fix food cart (#12523) Timothy Teakettle 2020-06-15 06:50:16 +01:00
  • 90bc874876 ok Ghommie 2020-06-15 02:27:49 +02:00