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

Commit Graph

  • 8d54e8afcc Merge pull request #10214 from Ghommie/Ghommie-cit472 Lin 2019-12-19 23:42:06 +00:00
  • 1e7e66b8c5 Automatic changelog generation for PR #10207 [ci skip] CitadelStationBot 2019-12-19 17:41:40 -06:00
  • f38747ed70 Merge pull request #10207 from Ghommie/Ghommie-cit468 Lin 2019-12-19 23:41:36 +00:00
  • 8511c44f0f Merge pull request #10199 from Ghommie/Ghommie-cit467 Lin 2019-12-19 23:39:17 +00:00
  • d9002bbe8b Automatic changelog generation for PR #10079 [ci skip] CitadelStationBot 2019-12-19 17:26:56 -06:00
  • 138b460af3 Merge pull request #10079 from Ghommie/Ghommie-cit438 Lin 2019-12-19 23:26:53 +00:00
  • 3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390 Lin 2019-12-19 23:23:20 +00:00
  • f3aa363a2e drop Linzolle 2019-12-19 17:19:07 -06:00
  • 42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320 Lin 2019-12-19 23:03:48 +00:00
  • 73a0976d4e Automatic changelog generation for PR #10160 [ci skip] CitadelStationBot 2019-12-19 17:00:55 -06:00
  • 66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453 Lin 2019-12-19 23:00:52 +00:00
  • 53abbbaf85 Automatic changelog generation for PR #10067 [ci skip] CitadelStationBot 2019-12-19 16:03:25 -06:00
  • c1be6ba222 Merge pull request #10067 from Sishen1542/botnayn nik707 2019-12-19 16:03:22 -06:00
  • 88d57cd879 Make it include my files r4d6 2019-12-19 15:37:02 -05:00
  • 44592fe03f Add the sprite for the landmark r4d6 2019-12-19 15:36:10 -05:00
  • df05788f0e Merge pull request #1 from r4d6/master r4d6 2019-12-19 15:35:08 -05:00
  • 4608b3852d Add the file for making the submaps actual ruins r4d6 2019-12-19 15:28:46 -05:00
  • dbf3e7d246 Add the landmarks r4d6 2019-12-19 15:27:45 -05:00
  • 22d89a9435 Add the stuff to seed the station with rooms r4d6 2019-12-19 15:26:43 -05:00
  • 9672f98de3 Fix a possible alert r4d6 2019-12-19 15:24:56 -05:00
  • ac1719810f Adding a list for the stations rooms r4d6 2019-12-19 15:23:23 -05:00
  • ffdfa5c409 Update Boxstation to have Engines landmark r4d6 2019-12-19 15:21:36 -05:00
  • 8a4b3f2681 Add Engines submaps r4d6 2019-12-19 15:20:32 -05:00
  • f4cbc986da Automatic changelog generation for PR #10090 [ci skip] CitadelStationBot 2019-12-19 14:11:30 -06:00
  • 63dd3487b3 Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed nik707 2019-12-19 14:11:27 -06:00
  • dd62a9ca87 Merge pull request #10084 from Hatterhat/i-dont-test-my-code nik707 2019-12-19 14:10:18 -06:00
  • f2b46f0951 ROBUST OPTING MECHANICS Putnam 2019-12-19 11:14:02 -08:00
  • 9ec2c8a7f1 MKUltra made double opt-in Putnam 2019-12-19 09:54:34 -08:00
  • a46982efe3 F Ghommie 2019-12-19 17:40:22 +01:00
  • fb2b259d92 Ports "Refactors can_see_reagents" Ghommie 2019-12-19 17:17:18 +01:00
  • f1154bf840 wew Ghommie 2019-12-19 16:45:08 +01:00
  • 88978209fa Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly" Ghommie 2019-12-19 16:42:25 +01:00
  • 17306dbab4 Converts the main timsorts file from relative pathing to absolute pathing. Ghommie 2019-12-19 16:14:40 +01:00
  • 871a1aebdc Hello darkness my old friend. Ghommie 2019-12-19 13:56:00 +01:00
  • 12aa266efe Missed this one too. Ghommie 2019-12-19 12:27:30 +01:00
  • e8e97021b3 Merge pull request #10229 from B1gb3ast/master kevinz000 2019-12-19 04:06:07 -07:00
  • 06b38d0263 Automatic changelog generation for PR #10204 [ci skip] CitadelStationBot 2019-12-19 05:01:55 -06:00
  • 23f7815c52 Merge pull request #10204 from r4d6/patch-2 kevinz000 2019-12-19 04:01:52 -07:00
  • 8aca8b8f25 thank you based ghomtainer (when) 2x how did i not notice this kevinz000 2019-12-19 04:00:37 -07:00
  • 9436d218b4 thank you based ghomtainer (when) kevinz000 2019-12-19 03:59:57 -07:00
  • 70e8026411 two more PRs. Ghommie 2019-12-19 11:59:15 +01:00
  • dcca9eb0d6 Merge pull request #10223 from BlackMajor/Yeehaw kevinz000 2019-12-19 03:24:36 -07:00
  • b56d2ff276 Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway. Ghommie 2019-12-19 11:19:00 +01:00
  • eee52655ef Update flashbang.dm kevinz000 2019-12-19 01:57:28 -07:00
  • e8dc9480b0 AAAAAAAAAAAAAAAAAAAA lolman360 2019-12-19 18:30:38 +11:00
  • d8f0e983f1 lolman acctually knows how the stuff work lolman360 2019-12-19 18:24:24 +11:00
  • 8fc095d63e Update carbon.dm lolman360 2019-12-19 17:29:35 +11:00
  • 8566e2396d Brings in some mapping code updates. Ghommie 2019-12-19 00:44:14 +01:00
  • 21c77cbdf1 modular man bad. B1gb3ast 2019-12-18 23:36:32 +01:00
  • 03b2bf5321 Fix Ghommie 2019-12-18 19:49:02 +01:00
  • ba851d55b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456 Ghommie 2019-12-18 19:42:41 +01:00
  • d011a7a3d9 oh hey macros. B1gb3ast 2019-12-18 19:35:36 +01:00
  • 19b20f8385 im baby dumb and removed "a hint of" by accident. B1gb3ast 2019-12-18 19:29:57 +01:00
  • e546a59214 Magic number man bad, also all heads can spam CC now DeltaFire 2019-12-18 19:29:35 +01:00
  • 7841faa3a9 Actually hold on B1gb3ast 2019-12-18 19:24:25 +01:00
  • f945577655 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320 Ghommie 2019-12-18 19:20:38 +01:00
  • ae2a31851f fixes the sprites Seris02 2019-12-19 01:38:32 +08:00
  • 6df739a045 changes holofan, adds holofirelock Seris02 2019-12-19 00:39:29 +08:00
  • 5be981e026 Automatic changelog generation for PR #10228 [ci skip] CitadelStationBot 2019-12-18 10:39:11 -06:00
  • cdb26e4916 Merge pull request #10228 from Putnam3145/quirk-fix kevinz000 2019-12-18 09:39:08 -07:00
  • 84a413a43a Chef buffs chef buffs tastier food. B1gb3ast 2019-12-18 17:37:08 +01:00
  • 0e6ac60a66 Merge pull request #1 from Citadel-Station-13/master B1gb3ast 2019-12-18 17:17:44 +01:00
  • 114026f9ae argk Putnam 2019-12-18 02:40:51 -08:00
  • d276fa6900 fixes merge conflict Seris02 2019-12-18 15:35:35 +08:00
  • ab4be051c8 pull from src and makes the code better Seris02 2019-12-18 15:32:38 +08:00
  • 5ec5650c6f Automatic changelog generation for PR #10227 [ci skip] CitadelStationBot 2019-12-18 00:41:44 -06:00
  • 29d6820ef0 Merge pull request #10227 from Putnam3145/quirk-fix kevinz000 2019-12-17 23:41:42 -07:00
  • 3dbf813817 probably fixes only neutral traits existing Putnam 2019-12-17 22:34:28 -08:00
  • 4e6377e319 no need for this much whitespace Putnam 2019-12-17 21:29:48 -08:00
  • e178db6949 screw it. minimax Putnam 2019-12-17 21:29:33 -08:00
  • fab65a3dbc actually condorcet not IRV Putnam 2019-12-17 20:12:23 -08:00
  • e3844ee1f9 wups kevinz000 2019-12-17 21:05:21 -07:00
  • 5a2ef22633 buckle others kevinz000 2019-12-17 21:03:37 -07:00
  • cb78fc9188 pai_buckle kevinz000 2019-12-17 20:58:11 -07:00
  • 8f06f91324 what the fuck kevinz000 2019-12-17 20:54:40 -07:00
  • 7900af7574 ?? kevinz000 2019-12-17 20:52:30 -07:00
  • fdb4296adc whew kevinz000 2019-12-17 20:49:58 -07:00
  • 94b7a48bbc aaa Putnam 2019-12-17 18:29:49 -08:00
  • 70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update Linzolle 2019-12-17 20:21:49 -06:00
  • f25d75fed9 thanks linter Putnam 2019-12-17 16:29:24 -08:00
  • 5ef7d9cbf7 why did i not have revs as conversion Putnam 2019-12-17 16:09:40 -08:00
  • 04f82f3153 it works Putnam 2019-12-17 15:48:28 -08:00
  • e6e68ae1a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers Putnam 2019-12-17 14:18:19 -08:00
  • 9f21fca798 workin on IRV Putnam 2019-12-17 14:18:13 -08:00
  • 8da0ddda1b oops kappa-sama 2019-12-17 16:40:06 -05:00
  • 17a5fd849e Update snacks.dm Trilbyspaceclone 2019-12-17 15:58:01 -05:00
  • d6b1b76037 ?? Trilbyspaceclone 2019-12-17 15:28:48 -05:00
  • ddd3676903 Merge branch 'master' into glassware Trilbyspaceclone 2019-12-17 15:18:30 -05:00
  • 0f5c8db456 Merge branch 'master' into donut Trilbyspaceclone 2019-12-17 15:12:51 -05:00
  • 8b61c07713 Automatic changelog generation for PR #10153 [ci skip] CitadelStationBot 2019-12-17 14:09:11 -06:00
  • 6b8f9427d0 Merge pull request #10153 from Linzolle/fireman-clarity Putnam3145 2019-12-17 12:09:08 -08:00
  • 952880eecc Update drinks.dm Trilbyspaceclone 2019-12-17 15:01:23 -05:00
  • 844e9861b0 Automatic changelog generation for PR #10076 [ci skip] CitadelStationBot 2019-12-17 13:58:42 -06:00
  • c0e548427b Merge pull request #10076 from Ghommie/Ghommie-cit437 Putnam3145 2019-12-17 11:58:39 -08:00
  • 27a03aa30f Automatic changelog generation for PR #10026 [ci skip] CitadelStationBot 2019-12-17 13:58:03 -06:00
  • b8c5290011 Merge pull request #10026 from Linzolle/neck-slice Putnam3145 2019-12-17 11:58:00 -08:00
  • cfe35ce2fd Merge pull request #10167 from Ghommie/Ghommie-cit458 Putnam3145 2019-12-17 11:52:41 -08:00
  • 5d6c2e9f82 Automatic changelog generation for PR #10172 [ci skip] CitadelStationBot 2019-12-17 13:51:05 -06:00
  • ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 Putnam3145 2019-12-17 11:51:03 -08:00
  • d215aa2d79 Automatic changelog generation for PR #10216 [ci skip] CitadelStationBot 2019-12-17 13:47:21 -06:00