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

Commit Graph

  • 633294c590 adds a basic sanity check to server_hop deathride58 2020-01-07 20:03:44 -05:00
  • cd35e516ac back by popular demand: maso/nympho Putnam 2020-01-07 17:01:14 -08:00
  • b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw Putnam3145 2020-01-07 16:50:21 -08:00
  • c4dd0a393a Revert "Test" BlackMajor 2020-01-08 13:38:35 +13:00
  • 3424862746 Revert "Adds borg spawns to every map, and fixes a shit load of null vars on them." BlackMajor 2020-01-08 13:38:25 +13:00
  • 8aaa6db732 Revert "Test" BlackMajor 2020-01-08 13:38:17 +13:00
  • 0520d3d9b9 Revert "Conflcits are pretty bothersome I tell ya hwat" BlackMajor 2020-01-08 13:38:10 +13:00
  • e6f11aa275 Conflcits are pretty bothersome I tell ya hwat BlackMajor 2020-01-08 13:20:24 +13:00
  • 7ddc356a6f Revert "Test 2" BlackMajor 2020-01-08 13:19:33 +13:00
  • 6670de8e64 Test 2 BlackMajor 2020-01-08 13:19:07 +13:00
  • 8746e6091d Test BlackMajor 2020-01-08 13:17:49 +13:00
  • cfb553b828 Adds borg spawns to every map, and fixes a shit load of null vars on them. BlackMajor 2020-01-08 12:37:31 +13:00
  • 5414f09b80 Test BlackMajor 2020-01-08 12:29:45 +13:00
  • 05a644cc41 Revert "Merge branch 'master' into Yeehaw" BlackMajor 2020-01-08 12:26:45 +13:00
  • 972c03f79f Merge branch 'master' into Yeehaw BlackMajor 2020-01-08 12:25:50 +13:00
  • b41c9cd844 Sync with master BlackMajor 2020-01-08 12:25:22 +13:00
  • 1e5d6719ee Fixes Dermal Button Sprites keronshb 2020-01-07 15:52:29 -05:00
  • cff6a094d7 Aaand buffs stakes Artur 2020-01-07 21:21:12 +01:00
  • 5b2c4deaa0 lockcharge --> locked_down kevinz000 2020-01-07 12:04:41 -08:00
  • e4cfb1fa39 more kevinz000 2020-01-07 12:03:46 -08:00
  • 606ea46314 parentheses kevinz000 2020-01-07 11:48:41 -08:00
  • 2a304800df more reformatting kevinz000 2020-01-07 11:46:32 -08:00
  • c162e9bb5d Merge pull request #10453 from Ghommie/Ghommie-cit500 Lin 2020-01-07 19:37:49 +00:00
  • 7c757900f2 Fix the category r4d6 2020-01-07 13:27:44 -05:00
  • 97a9ad4714 Nerfs cloak some more Artur 2020-01-07 19:22:39 +01:00
  • 81f1349cea Nerf Stamina and cloneloss Artur 2020-01-07 18:41:17 +01:00
  • 7141223f49 All ready now, forgot how stat worked Artur 2020-01-07 18:39:13 +01:00
  • f6fef84984 Make the RCD effect not right-clickable. r4d6 2020-01-07 11:23:25 -05:00
  • a91f31d9e6 Fix a typo r4d6 2020-01-07 11:21:00 -05:00
  • 6f2cf0b636 [s] adds a cooldown to area creation attempts deathride58 2020-01-07 10:04:09 -05:00
  • cde9946e25 is this why wrench refuses to work deathride58 2020-01-07 09:00:30 -05:00
  • 686601334e suggested changes deathride58 2020-01-07 08:52:13 -05:00
  • 0114f9e223 whitelist kevinz000 2020-01-07 04:54:32 -08:00
  • fa7dcad49a compile kevinz000 2020-01-07 04:54:11 -08:00
  • ab2292dfd5 Fail2Topic kevinz000 2020-01-07 04:48:39 -08:00
  • 19887691f3 added deadchat toggle to dojo mobs too Putnam 2020-01-07 04:39:04 -08:00
  • 5f7f1b09f3 Update observer.dm kevinz000 2020-01-07 02:41:05 -08:00
  • ae73927b67 patches kevinz000 2020-01-07 02:39:16 -08:00
  • 8a29c5a7a9 Update mob_defines.dm kevinz000 2020-01-07 02:20:44 -08:00
  • 91c8bb2e95 Update experiment.dm kevinz000 2020-01-07 02:17:56 -08:00
  • b9260a62df Update observer.dm kevinz000 2020-01-07 02:16:52 -08:00
  • 8ebd698763 Give my lad Blade mining borg a rest sprite BlackMajor 2020-01-07 23:14:07 +13:00
  • 5975f4c17d Update observer.dm kevinz000 2020-01-07 02:12:47 -08:00
  • 5fae814e42 did it thanks Seris02 2020-01-07 17:52:46 +08:00
  • 70a1a0a9c1 better way to do it tbh Putnam 2020-01-07 00:39:14 -08:00
  • 6a2696f1f8 ghommie said TrilbySpaceClone 2020-01-07 03:10:22 -05:00
  • 9750eb3d42 "quotation marks" Putnam 2020-01-06 23:52:07 -08:00
  • d461e70a9b Update life.dm kevinz000 2020-01-06 23:45:39 -08:00
  • 05c903e4a3 Update life.dm kevinz000 2020-01-06 23:44:33 -08:00
  • b5026256db aaand a few more Putnam 2020-01-06 23:42:27 -08:00
  • 6f6f0cbb62 Tweaks to ghost dojo Putnam 2020-01-06 23:33:29 -08:00
  • 23a0d17d4c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 r4d6 2020-01-07 02:05:10 -05:00
  • 68e48209da Fix r4d6 2020-01-07 02:04:06 -05:00
  • 20d5e4f480 Make the RCD show its upgrades on examination. r4d6 2020-01-07 01:45:59 -05:00
  • 3efdf013e6 mobility flags kevinz000 2020-01-06 21:47:27 -08:00
  • c3f47e713a Merge branch 'master' into RCD-Updates r4d6 2020-01-07 00:04:43 -05:00
  • f7aa4f3050 Merge branch 'master' into glassware Trilbyspaceclone 2020-01-06 23:55:44 -05:00
  • d7718c8dd1 Revert "Conflict Fix part 1" r4d6 2020-01-06 23:43:27 -05:00
  • 2ab07fdb82 Conflict Fix part 1 r4d6 2020-01-06 23:43:04 -05:00
  • 62b8513795 fix kevinz000 2020-01-06 19:50:46 -08:00
  • 82ca801c0c Merge remote-tracking branch 'citadel/master' into isbanned2 kevinz000 2020-01-06 19:50:21 -08:00
  • d1533d4d06 Merge remote-tracking branch 'citadel/master' into isbanned2 kevinz000 2020-01-06 19:49:46 -08:00
  • c39862711a Automatic changelog generation for PR #10420 [ci skip] CitadelStationBot 2020-01-06 21:46:45 -06:00
  • 4599abde4a Merge pull request #10420 from MrJWhit/radiation-plasma-usage kevinz000 2020-01-06 19:46:42 -08:00
  • bbc8785f5e Automatic changelog generation for PR #10439 [ci skip] CitadelStationBot 2020-01-06 21:45:31 -06:00
  • f6b9396096 Merge pull request #10439 from LetterN/tachelon-logs kevinz000 2020-01-06 19:45:28 -08:00
  • 5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger BlackMajor 2020-01-07 15:33:16 +13:00
  • a7af5203e7 This is a test to see if they all work together keronshb 2020-01-06 20:29:44 -05:00
  • 1fca1901da Adds the nanite remote for some programs keronshb 2020-01-06 15:17:26 -05:00
  • 35cd77d433 Adds the nanite remote for some programs keronshb 2020-01-06 15:17:26 -05:00
  • 2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501 Lin 2020-01-07 01:00:25 +00:00
  • da43d336c3 Merge pull request #10047 from Ghommie/Ghommie-cit425 Lin 2020-01-07 00:55:19 +00:00
  • 7d4a52a91c Automatic changelog generation for PR #9878 [ci skip] CitadelStationBot 2020-01-06 18:31:26 -06:00
  • 718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382 Lin 2020-01-07 00:31:24 +00:00
  • 46420a693d Merge branch 'master' into Ghommie-cit425 Lin 2020-01-07 00:28:37 +00:00
  • f728c4746f Allowed random engines to be weighted. Putnam 2020-01-06 16:25:17 -08:00
  • 201a2056b9 Automatic changelog generation for PR #10384 [ci skip] CitadelStationBot 2020-01-06 14:47:18 -06:00
  • d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo Ghom 2020-01-06 21:47:15 +01:00
  • d283532d97 Removes tresspass handcuff removal Artur 2020-01-06 20:49:14 +01:00
  • 41f96c0dc9 Whoopsie Artur 2020-01-06 20:31:55 +01:00
  • 4fc6aa10be Adds a cooldown for revival Artur 2020-01-06 20:29:10 +01:00
  • 8a193304ee Buffs torpor without coffin Artur 2020-01-06 20:22:39 +01:00
  • d204c0044c Merge remote-tracking branch 'origin/master' keronshb 2020-01-06 12:41:57 -05:00
  • b0cb6aab5c Final commit hopefully Artur 2020-01-06 17:26:36 +01:00
  • 7006f2b1be more compile stuff kevinz000 2020-01-06 04:23:52 -08:00
  • c77005af8a changes kevinz000 2020-01-06 04:17:53 -08:00
  • a8cc37eaf0 ok kevinz000 2020-01-06 03:57:58 -08:00
  • 7378d91684 ([\W\.])Knockdown\( kevinz000 2020-01-06 03:39:20 -08:00
  • 00d0d8c415 Whoops indentation Artur 2020-01-06 12:31:54 +01:00
  • 2859e6e5ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cold-blooded Putnam 2020-01-06 02:07:09 -08:00
  • 72dded26f2 cold-blooded trait Putnam 2020-01-06 02:06:19 -08:00
  • 32043a9062 whoops forgot permaboner Putnam 2020-01-06 01:14:00 -08:00
  • 9006412a6a Automatic changelog generation for PR #10401 [ci skip] CitadelStationBot 2020-01-06 01:08:52 -06:00
  • 3b6cf8c952 Merge pull request #10401 from r4d6/SM Putnam3145 2020-01-05 23:08:49 -08:00
  • 218e701fa9 whoops forgot update appearance Putnam 2020-01-05 21:48:04 -08:00
  • f6099f341b Allow Voice Analyzers to recognize languages r4d6 2020-01-05 23:55:31 -05:00
  • 6d3345d166 Add the Playback Device r4d6 2020-01-05 23:32:44 -05:00
  • da830d3449 Added scores for my own dastardly reasons Putnam 2020-01-05 19:49:54 -08:00
  • 2533af0cfe Automatic changelog generation for PR #10437 [ci skip] CitadelStationBot 2020-01-05 21:49:54 -06:00
  • 7ad6021472 Merge pull request #10437 from Ghommie/Ghommie-cit497 Lin 2020-01-06 03:49:52 +00:00