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

Commit Graph

  • ca7bdf5f88 clockwork cuirass now compatible with snakes. The original author is very lazy. Ghommie 2020-01-18 22:06:14 +01:00
  • 4e6ad84317 Fix conflict r4d6 2020-01-18 16:05:56 -05:00
  • 810556cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents r4d6 2020-01-18 16:03:49 -05:00
  • bb6101f9a3 Automatic changelog generation for PR #10571 [ci skip] CitadelStationBot 2020-01-18 14:46:19 -06:00
  • 760bbfa8b6 Merge pull request #10571 from Ghommie/Ghommie-cit507 Lin 2020-01-18 20:46:16 +00:00
  • 0cc3795f15 Automatic changelog generation for PR #10578 [ci skip] CitadelStationBot 2020-01-18 13:32:17 -06:00
  • d709edb1c2 Merge pull request #10578 from r4d6/Mining Ghom 2020-01-18 20:32:14 +01:00
  • 0bc10319d9 Automatic changelog generation for PR #10501 [ci skip] CitadelStationBot 2020-01-18 13:16:32 -06:00
  • ce2fc37df3 Merge pull request #10501 from Putnam3145/more-atmos Ghom 2020-01-18 20:16:30 +01:00
  • e9f626dd59 Automatic changelog generation for PR #10600 [ci skip] CitadelStationBot 2020-01-18 11:52:17 -06:00
  • 9f2bc48d74 Merge pull request #10600 from Kraseo/ricetriangles Ghom 2020-01-18 18:52:14 +01:00
  • a2e1c8ecf1 GLOB. Ghommie 2020-01-18 18:45:20 +01:00
  • 47b031dad2 Update. Ghommie 2020-01-18 18:40:13 +01:00
  • 82b65f13f4 RPD anti-ventcrawler escapist sanity check. Ghommie 2020-01-18 18:23:54 +01:00
  • f1ea68c977 Automatic changelog generation for PR #10580 [ci skip] CitadelStationBot 2020-01-18 10:47:34 -06:00
  • 07b3bac674 Merge pull request #10580 from Putnam3145/craft-log Ghom 2020-01-18 17:47:31 +01:00
  • bbe5b0e281 Automatic changelog generation for PR #10586 [ci skip] CitadelStationBot 2020-01-18 10:42:32 -06:00
  • c00be1a9b1 Merge pull request #10586 from Tupinambis/RLDNerf Ghom 2020-01-18 17:42:30 +01:00
  • 29c3e72335 You jelly. Ghom 2020-01-18 17:41:31 +01:00
  • c7907e9173 Automatic changelog generation for PR #10481 [ci skip] CitadelStationBot 2020-01-18 09:56:34 -06:00
  • 0a1277c28f Merge pull request #10481 from dapnee/BEEES Ghom 2020-01-18 16:56:31 +01:00
  • ea3d6a1977 Automatic changelog generation for PR #10599 [ci skip] CitadelStationBot 2020-01-18 09:54:55 -06:00
  • 5a613809f5 Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix Ghom 2020-01-18 16:54:52 +01:00
  • 133cb89b32 hilbert's hotel for ghost dojo Putnam 2020-01-18 06:55:26 -08:00
  • 6708607073 fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly Kraseo 2020-01-18 15:05:07 +01:00
  • b30948a60a Fixed gibtonite instantly exploding on pick mining Putnam 2020-01-18 04:37:44 -08:00
  • 81cd277db2 Made metabolic synthesis stop if not fed Putnam 2020-01-18 03:47:40 -08:00
  • 95dc861ad8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter Putnam 2020-01-18 03:39:35 -08:00
  • c612462b8c some demodularization + new eligibility stuff Putnam 2020-01-18 03:39:27 -08:00
  • fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup Seris02 2020-01-18 18:30:51 +08:00
  • 04b34ec8ed hijack implant Seris02 2020-01-18 18:04:31 +08:00
  • c13a5687d6 HOW MANY TIMES DO I GOTTA SCREAM AT YOU TO MERGE THIS OLD MAN Dap 2020-01-18 02:53:03 -07:00
  • 28c9700308 Merge remote-tracking branch 'upstream/master' into BEEES Dap 2020-01-18 02:27:15 -07:00
  • 6d4f400f5c updated the tgui file for the conflict Putnam 2020-01-17 21:34:41 -08:00
  • 3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos Putnam 2020-01-17 21:33:13 -08:00
  • a8569fa7e5 Makes it so that opting out of ass slapping is OPT OUT Putnam 2020-01-17 21:31:23 -08:00
  • 54a2b32f42 Update console.dm chefferz 2020-01-17 23:55:44 -05:00
  • 0d3706b7f9 Make public shuttle not require access r4d6 2020-01-17 22:15:29 -05:00
  • 4e114d399c Readding Cryo Sleeper in the gulag r4d6 2020-01-17 22:13:19 -05:00
  • 2fe23b67db fug Ghommie 2020-01-18 03:37:30 +01:00
  • 224146ee1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444 Ghommie 2020-01-18 03:36:09 +01:00
  • fd440ac379 Merge pull request #10592 from Ghommie/Ghommie-cit508 kevinz000 2020-01-17 17:34:13 -07:00
  • 61804e4147 Automatic changelog generation for PR #10579 [ci skip] CitadelStationBot 2020-01-17 18:32:32 -06:00
  • f848b58f2c Merge pull request #10579 from r4d6/map-fix Ghom 2020-01-18 01:32:29 +01:00
  • 201f234364 Automatic changelog generation for PR #10591 [ci skip] CitadelStationBot 2020-01-17 18:25:37 -06:00
  • da8b29dd23 Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-01-18 01:25:34 +01:00
  • 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 Ghommie 2020-01-18 01:23:08 +01:00
  • eaff51ff40 Kevinz let some files fall back to CRLF. Ghommie 2020-01-17 23:26:05 +01:00
  • eb3597ecc3 Automatic changelog generation for PR #10125 [ci skip] CitadelStationBot 2020-01-17 16:15:12 -06:00
  • aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449 kevinz000 2020-01-17 15:15:08 -07:00
  • fcd76cae21 Merge remote-tracking branch 'upstream/master' Artur 2020-01-17 22:35:23 +01:00
  • 32c496f70e Automatic changelog generation for PR #10570 [ci skip] CitadelStationBot 2020-01-17 15:34:40 -06:00
  • 34872f6969 Merge pull request #10570 from kevinz000/map_network_helpers Ghom 2020-01-17 22:34:38 +01:00
  • eddb6fda68 Update others.dm kevinz000 2020-01-17 14:32:51 -07:00
  • 3c2e6a959d whitespace renormalize kevinz000 2020-01-17 14:25:29 -07:00
  • 7c3d671eb1 Automatic changelog generation for PR #10569 [ci skip] CitadelStationBot 2020-01-17 15:24:15 -06:00
  • 05e2b6a441 Merge pull request #10569 from keronshb/RemoteMoodResearch kevinz000 2020-01-17 14:24:13 -07:00
  • edccfa3523 Update others.dm kevinz000 2020-01-17 14:15:08 -07:00
  • e69253bf87 Update others.dm kevinz000 2020-01-17 14:12:51 -07:00
  • 2b2e694341 Update code/modules/cargo/packs/science.dm Trilbyspaceclone 2020-01-17 15:56:09 -05:00
  • c4be412564 Fixes bugs KathrinBailey 2020-01-17 20:55:13 +00:00
  • 300fdb431c 0 clue if itll even work. Cowabunga it is. Artur 2020-01-17 19:46:27 +01:00
  • 22dbd3d265 Nerfs RLDs in general. You know I had to do it to em. Tupinambis 2020-01-17 12:23:13 -06:00
  • ef47cf23d1 Merge remote-tracking branch 'upstream/master' Artur 2020-01-17 18:10:52 +01:00
  • 541a9cf9e7 Automatic changelog generation for PR #10375 [ci skip] CitadelStationBot 2020-01-17 10:36:45 -06:00
  • 72a83f05b5 Merge pull request #10375 from r4d6/radsuit Ghom 2020-01-17 17:36:43 +01:00
  • 1a604e6d9e Automatic changelog generation for PR #10584 [ci skip] CitadelStationBot 2020-01-17 10:16:39 -06:00
  • eaca04a1c2 Merge pull request #10584 from AffectedArc07/patch-1 Ghom 2020-01-17 17:16:36 +01:00
  • 835500980b Hotfix for CI line endings AffectedArc07 2020-01-17 16:00:15 +00:00
  • 7c77e30a2e Automatic changelog generation for PR #10582 [ci skip] CitadelStationBot 2020-01-17 07:44:07 -06:00
  • e7b925e779 Merge pull request #10582 from Putnam3145/more_flavor Ghom 2020-01-17 14:44:04 +01:00
  • ae4afdd904 made it work (wow!) Putnam 2020-01-17 03:09:46 -08:00
  • c735123e4e consent logging and arousal tweaks Putnam 2020-01-17 02:47:16 -08:00
  • a4e2591223 typo kevinz000 2020-01-16 21:22:07 -07:00
  • 2cc0e8ee6c k kevinz000 2020-01-16 21:17:43 -07:00
  • 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-01-16 21:12:56 -07:00
  • d7a8494d2d fix kevinz000 2020-01-16 21:03:28 -07:00
  • 4d4f3b32b3 Making forcefield projectors less stupid Persi 2020-01-16 22:59:19 -05:00
  • 9ef4cbfa76 refactor tags kevinz000 2020-01-16 20:58:00 -07:00
  • 2ba226b912 aa kevinz000 2020-01-16 20:57:02 -07:00
  • 5ace1df9af better logging, that also works Putnam 2020-01-16 19:09:13 -08:00
  • a4cc73f219 some craft logging Putnam 2020-01-16 18:40:00 -08:00
  • b505c1e087 WEH kevinz000 2020-01-16 19:22:47 -07:00
  • 14aaca8fa5 compile kevinz000 2020-01-16 19:18:54 -07:00
  • 98bb9397ea fix cyborgs spawns r4d6 2020-01-16 21:05:51 -05:00
  • c1e9618757 Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs Ghom 2020-01-16 23:18:37 +01:00
  • 1860d553e4 Automatic changelog generation for PR #10347 [ci skip] CitadelStationBot 2020-01-16 15:51:40 -06:00
  • d110d7bae9 Merge pull request #10347 from deathride58/stambufferbuff kevinz000 2020-01-16 14:51:38 -07:00
  • 4dc85dd4ef the compile file for this keronshb 2020-01-16 16:28:11 -05:00
  • 1413990ea2 Fix another TG snowflake variable. r4d6 2020-01-16 16:15:54 -05:00
  • 69b5164103 Merge branch 'master' into RemoteMoodResearch keronshb 2020-01-16 15:50:11 -05:00
  • 79256fa698 Fix TG's snowflake on_station_override var r4d6 2020-01-16 15:50:01 -05:00
  • a360a89f86 Map Changes r4d6 2020-01-16 15:10:57 -05:00
  • ce16c91b2f Code changes r4d6 2020-01-16 14:08:14 -05:00
  • 1108de8c37 Automatic changelog generation for PR #10456 [ci skip] CitadelStationBot 2020-01-16 06:30:34 -06:00
  • ca13be3c92 Merge pull request #10456 from Putnam3145/arousal-bad Ghom 2020-01-16 13:30:31 +01:00
  • 1f718df41a Reverts crafting changes Artur 2020-01-16 14:26:36 +02:00
  • 6500d0d9a9 Fixes ghost role descriptions Artur 2020-01-16 13:43:21 +02:00
  • eb77c6b86b This too Artur 2020-01-16 12:57:11 +02:00
  • 329b37cd67 Removes uplink Artur 2020-01-16 12:32:46 +02:00