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

Commit Graph

  • ae3b2a58f9 Merge pull request #12129 from Ghommie/Ghommie-cit726 Lin 2020-05-08 03:00:20 +00:00
  • aaa31c24ce Demodularizing a few sprite assets. Ghommie 2020-05-08 04:02:31 +02:00
  • 51081fcb1a ok (#12083) kevinz000 2020-05-07 18:36:08 -07:00
  • 192c0dcc1a Demodularizing the arousal module. Ghommie 2020-05-08 03:35:29 +02:00
  • 3dfef3c393 . Ghommie 2020-05-08 02:50:14 +02:00
  • 4041fce0f7 whops. Ghommie 2020-05-08 02:30:57 +02:00
  • ddb50e2845 colors. Ghommie 2020-05-08 02:24:49 +02:00
  • 835753a02d ! Ghommie 2020-05-08 02:14:07 +02:00
  • 60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. Ghommie 2020-05-08 02:12:41 +02:00
  • 80687bb17f Update recipes_misc.dm Trilbyspaceclone 2020-05-07 18:00:50 -04:00
  • 86fc39a777 le sigh Trilbyspaceclone 2020-05-07 17:55:25 -04:00
  • 74e7f7ea46 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit726 Ghommie 2020-05-07 22:14:11 +02:00
  • 3914c1bd65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit727 Ghommie 2020-05-07 21:41:47 +02:00
  • 9c08df761f fixes kevinz000 2020-05-07 11:50:38 -07:00
  • 05068f80db Merge remote-tracking branch 'citadel/master' into combat_rework kevinz000 2020-05-07 10:57:10 -07:00
  • 5e0235bd76 Merge pull request #12139 from Citadel-Station-13/kevinz000-patch-8 Putnam3145 2020-05-07 10:51:04 -07:00
  • 2a33060c98 Update world.dm kevinz000 2020-05-07 10:44:45 -07:00
  • b2d8e70998 Chemheater and sleeper fixes Artur 2020-05-07 20:00:34 +03:00
  • 942c2feed8 Gives the chem heater PH display Artur 2020-05-07 19:33:49 +03:00
  • 9212969657 Makes it prim and proper Artur 2020-05-07 19:31:09 +03:00
  • ebb6eaa69a a kevinz000 2020-05-07 09:30:34 -07:00
  • 4b143ac9af Merge pull request #12098 from Ghommie/Ghommie-cit721 kevinz000 2020-05-07 09:21:14 -07:00
  • a273fc0fed Merge branch 'master' into Ghommie-cit721 Ghom 2020-05-07 18:18:54 +02:00
  • 7c54da65a2 The great material rebalance (#12123) kevinz000 2020-05-07 09:16:14 -07:00
  • 7828c4a5ab Merge pull request #12102 from Ghommie/Ghommie-cit722 kevinz000 2020-05-07 09:11:45 -07:00
  • f642148218 Merge pull request #12126 from Trilbyspaceclone/patch-365 kevinz000 2020-05-07 09:10:16 -07:00
  • 888f0a932f Merge pull request #12124 from Ghommie/Ghommie-cit725 kevinz000 2020-05-07 09:10:08 -07:00
  • 73144a4f92 Merge branch 'master' into typing_indicators kevinz000 2020-05-07 09:04:44 -07:00
  • 4be522ff30 more bitflag memes kevinz000 2020-05-07 09:02:03 -07:00
  • 50881d42fd Reverting changes for citadels modifications Artur 2020-05-07 18:56:38 +03:00
  • f02e8da23a blockdirs kevinz000 2020-05-07 08:54:21 -07:00
  • 532aba9157 fixes kevinz000 2020-05-07 08:36:15 -07:00
  • cb432761d5 Update SDQL_2.dm (#12135) kevinz000 2020-05-07 05:47:17 -07:00
  • bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002) Detective-Google 2020-05-07 07:46:16 -05:00
  • 1c389abea6 hm kevinz000 2020-05-07 05:39:17 -07:00
  • 67d8dd9ab9 Merge pull request #1 from Citadel-Station-13/master Heretical Lizard 2020-05-07 04:07:26 -04:00
  • e24bda9a9f this (#12122) kappa-sama 2020-05-06 19:08:48 -04:00
  • a09c7180cb Dims the lights again. Ghommie 2020-05-06 23:55:36 +02:00
  • c97f86ae5a Update mob_movement.dm Ghom 2020-05-06 23:36:40 +02:00
  • eaf486dbaa more epic progress Detective Google 2020-05-06 16:17:05 -05:00
  • f3ee184672 Clockwerkslab Artur 2020-05-06 21:23:12 +03:00
  • 5c5fc37959 Introducing noitatsxoB (#12073) kevinz000 2020-05-06 08:50:50 -07:00
  • b5a4bceafb Fixing some sprite issues and nit-picks. Ghommie 2020-05-06 17:46:15 +02:00
  • 3397c2284a Merge pull request #12128 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-05-06 08:35:08 -07:00
  • 5e947df0a8 Merge pull request #12114 from Ghommie/Ghommie-cit724 kevinz000 2020-05-06 08:34:03 -07:00
  • 13eeffbf27 Update wings.dm Ghom 2020-05-06 17:19:52 +02:00
  • d13ed03861 Update tails.dm Ghom 2020-05-06 17:18:03 +02:00
  • 9c31a89fde Update spines.dm Ghom 2020-05-06 17:15:50 +02:00
  • 7477878062 Update snouts.dm Ghom 2020-05-06 17:12:15 +02:00
  • ac30079026 Make dust-on-leaving-area code less bad (#12110) Putnam3145 2020-05-06 08:03:53 -07:00
  • 106fb6496e Update hypospray.dm Trilbyspaceclone 2020-05-06 05:30:54 -04:00
  • f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework kevinz000 2020-05-05 17:38:43 -07:00
  • 3a843f6da4 a kevinz000 2020-05-05 17:06:07 -07:00
  • 94d67ab640 Update mob_movement.dm Ghom 2020-05-06 01:15:30 +02:00
  • e9ccc3ac62 Test and update. Ghommie 2020-05-06 01:03:54 +02:00
  • b36e44d983 Merge branch 'master' into Ghommie-cit724 Ghom 2020-05-05 23:32:51 +02:00
  • 56fe430a25 ok (#12119) kevinz000 2020-05-05 14:18:09 -07:00
  • 32204093b2 Merge pull request #12108 from Putnam3145/replace-pAI-button Lin 2020-05-05 20:54:57 +00:00
  • 91d6faaf21 more obligatory changes. Ghommie 2020-05-05 21:06:53 +02:00
  • 81dde7debd Obligatory. Ghommie 2020-05-05 21:04:19 +02:00
  • 001109cfcd About ready. Ghommie 2020-05-05 20:58:44 +02:00
  • 4327d8eb87 why did i design this way why why why kevinz000 2020-05-05 04:32:35 -07:00
  • ccfce7cb64 Makes wings/horns colors dna features instead of human defines Ghommie 2020-05-05 06:22:58 +02:00
  • f50e661e0a Merge pull request #12106 from Putnam3145/revert-supermatter kevinz000 2020-05-04 21:21:09 -07:00
  • 066479da5f mandatory bump to savefile version. Ghom 2020-05-05 06:13:17 +02:00
  • 395e3e41cc Merge pull request #11874 from Ghommie/Ghommie-cit682 kevinz000 2020-05-04 20:52:33 -07:00
  • e26bf5b2af Merge pull request #12115 from Kraseo/the-funny-aheal kevinz000 2020-05-04 20:46:40 -07:00
  • 3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 Ghommie 2020-05-05 05:44:55 +02:00
  • 0acec2e56f vendors now accept dollar bills again (#12109) Lin 2020-05-05 03:38:19 +00:00
  • 791b05871f Hey. Ghommie 2020-05-05 05:24:40 +02:00
  • f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 Ghommie 2020-05-05 05:09:29 +02:00
  • c34655d094 Uh uh. Ghommie 2020-05-05 04:48:49 +02:00
  • 0adca2d9b8 Oh. Ghommie 2020-05-05 04:45:43 +02:00
  • 643ef48f0e Macros, generic skill implementations. Ghommie 2020-05-05 04:42:34 +02:00
  • 367bb0f71c Merge pull request #12072 from Psody-Mordheim/browhatifweusedallthejobslotsduringroundstart Lin 2020-05-05 00:49:25 +00:00
  • e1c97d4261 Merge pull request #12090 from coldud13/radradio Lin 2020-05-05 00:47:23 +00:00
  • c3dfcf1cfe Merge pull request #12104 from timothyteakettle/food-quality-2 Lin 2020-05-05 00:46:44 +00:00
  • f760919108 actually makes your speed reset to normal once the status is gone rather then when you get hit again Kraseo 2020-05-04 21:06:15 +02:00
  • 3cf7fd5105 pleases the travis god Kraseo 2020-05-04 18:47:57 +02:00
  • c79ece7449 really surprised this wasn't done earlier Kraseo 2020-05-04 18:30:27 +02:00
  • 86c80dbbd9 Fixes felinid's cat ears and removes two unused variables. Ghommie 2020-05-04 18:20:10 +02:00
  • 87389243e6 r p g skills WIP. Ghommie 2020-05-04 17:30:15 +02:00
  • c1cd4d104f Replaces the pAI candidate button with a ghost roles button Putnam 2020-05-03 20:31:11 -07:00
  • e36bd50ad9 Makes G gluid calcs only happen when it's required (#12095) Putnam3145 2020-05-03 20:08:01 -07:00
  • 2ce118f851 MetaStation atmos update (#12099) MrJWhit 2020-05-03 23:05:27 -04:00
  • bb2942d0b8 Fixes a gibber runtime. (#12103) Putnam3145 2020-05-03 20:05:13 -07:00
  • 87858e8f60 Update sentience.dm (#12101) kevinz000 2020-05-03 19:59:04 -07:00
  • 071735c5fd these weren't checked, QUIRKY Detective Google 2020-05-03 20:04:40 -05:00
  • f812cddf93 unfucks this and makes it use the icebox framework Detective Google 2020-05-03 20:04:20 -05:00
  • 801956a1f9 Reverts #10352. Putnam 2020-05-03 17:44:00 -07:00
  • 5f14ae28a1 food quality with sliced foods Timothy Teakettle 2020-05-03 23:06:54 +01:00
  • 793cbd6cbd Merge pull request #12094 from Ghommie/Ghommie-cit719 Lin 2020-05-03 21:24:44 +00:00
  • 65899bf906 Removing cargo "paperwork" and a few other bloat packs. Ghommie 2020-05-03 19:56:00 +02:00
  • 8dee57b3d7 Merge pull request #12093 from Citadel-Station-13/Ghommie-patch-4 kevinz000 2020-05-03 01:54:53 -07:00
  • 2f99957711 fixes the snowed plating getting fucked when tiles are placed on it Detective Google 2020-05-03 02:06:25 -05:00
  • e197513bcc fixes lone ops and ninjas Detective Google 2020-05-03 01:22:18 -05:00
  • bad9e76e50 Fixes pirates, ops, the mining base, and gives pirates and ops drills Detective Google 2020-05-03 00:28:28 -05:00
  • 161da560b6 Update autolathe.dm Ghom 2020-05-03 07:17:18 +02:00
  • 76e1ee80b7 Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them" Ghommie 2020-05-03 07:12:41 +02:00
  • 843f43b4ad Some autolathe issue. Ghommie 2020-05-03 06:27:38 +02:00