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

Commit Graph

  • c05ee11533 Fixes buggy interfaces for chemical stuff Artur 2020-01-16 12:16:13 +02:00
  • 3a132d0a25 Linter fixes Artur 2020-01-16 11:45:46 +02:00
  • 472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties Artur 2020-01-16 11:38:09 +02:00
  • 6e4829e971 Really works properly now Artur 2020-01-16 11:33:05 +02:00
  • b22e1a1cb4 compile kevinz000 2020-01-16 02:27:35 -07:00
  • 1d184b8cad s kevinz000 2020-01-16 00:21:21 -07:00
  • 350c5aa060 compile kevinz000 2020-01-16 00:18:40 -07:00
  • 26525b8fa7 s kevinz000 2020-01-16 00:14:03 -07:00
  • 1acac87da3 compile kevinz000 2020-01-15 23:54:30 -07:00
  • dd9e62c8bb Sillycon law prevention clause removal. Tupinambis 2020-01-15 23:15:18 -06:00
  • 88d6c1a166 OKFINE kevinz000 2020-01-15 22:02:07 -07:00
  • 327c1e04e0 s kevinz000 2020-01-15 22:00:08 -07:00
  • f98f033bb3 Fix linter r4d6 2020-01-15 23:57:13 -05:00
  • fa0080d8d6 made climax with partner require EXPLICIT consent Putnam 2020-01-15 20:55:39 -08:00
  • 253a3a44ba moved "aphro" magic string to a define Putnam 2020-01-15 20:15:40 -08:00
  • a1922a459e Moved Arousal tab stuff to IC tab Putnam 2020-01-15 20:14:23 -08:00
  • de4e65c467 Savefile conversion for inesct Putnam 2020-01-15 20:13:09 -08:00
  • 512b112154 happythink kevinz000 2020-01-15 20:45:05 -07:00
  • 925dc0185e dme kevinz000 2020-01-15 19:36:56 -07:00
  • ab0c1f3f59 oh it's a list kevinz000 2020-01-15 19:36:20 -07:00
  • 4f665930cc a a kevinz000 2020-01-15 19:32:38 -07:00
  • 04f4cf5c36 Automatic changelog generation for PR #10417 [ci skip] CitadelStationBot 2020-01-15 20:21:51 -06:00
  • 7d9f4f9fe5 Merge pull request #10417 from kevinz000/nightshift_1 Ghom 2020-01-16 03:21:49 +01:00
  • 70c1b0635a early returns. Ghom 2020-01-16 03:14:39 +01:00
  • eca7eeace3 aa kevinz000 2020-01-15 19:11:49 -07:00
  • 162a0def29 parentheses kevinz000 2020-01-15 19:09:38 -07:00
  • 45c92bcb6f s kevinz000 2020-01-15 19:07:47 -07:00
  • 1a82289f49 fix .dme r4d6 2020-01-15 21:00:34 -05:00
  • ded4d1bed6 compile kevinz000 2020-01-15 18:58:26 -07:00
  • 9c526d0348 riot foam dart design cost consistency. Ghommie 2020-01-16 02:56:58 +01:00
  • 02841f8e92 compile kevinz000 2020-01-15 18:49:37 -07:00
  • b42de8d457 compile kevinz000 2020-01-15 18:49:29 -07:00
  • 8bc8edb56f Fixes r4d6 2020-01-15 20:46:28 -05:00
  • c710c332e4 compile kevinz000 2020-01-15 18:37:09 -07:00
  • e8d8d32a33 ree kevinz000 2020-01-15 18:34:16 -07:00
  • 6c2c9008c0 more dmemania kevinz000 2020-01-15 18:30:48 -07:00
  • 90be124730 Merge remote-tracking branch 'citadel/master' into map_network_helpers kevinz000 2020-01-15 18:30:14 -07:00
  • 2a4e2204c5 no definemania then.. kevinz000 2020-01-15 18:29:45 -07:00
  • 8f7460ff96 definemania kevinz000 2020-01-15 18:24:13 -07:00
  • c5b95ff5d0 Mapping helpers kevinz000 2020-01-15 18:22:43 -07:00
  • 554f23e790 aight bet kevinz000 2020-01-15 18:04:05 -07:00
  • 872628d9aa Apply suggestions from code review kevinz000 2020-01-15 18:02:23 -07:00
  • b303340b29 Update tgstation.dme r4d6 2020-01-15 19:37:06 -05:00
  • 755b0fac3c Merge branch 'master' into Passive-Vents r4d6 2020-01-15 19:15:50 -05:00
  • 6045d818d8 Add passive vents r4d6 2020-01-15 19:12:13 -05:00
  • d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad Putnam 2020-01-15 15:57:32 -08:00
  • f7791c3db7 Hopefully help travis r4d6 2020-01-15 17:27:09 -05:00
  • 85e71c4d60 fix conflicts. r4d6 2020-01-15 17:18:18 -05:00
  • e685c3fc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit r4d6 2020-01-15 17:15:21 -05:00
  • b21b3fee3c Automatic changelog generation for PR #10567 [ci skip] CitadelStationBot 2020-01-15 14:42:30 -06:00
  • 7bad8d00ad Merge pull request #10567 from Ghommie/Ghommie-cot506 Lin 2020-01-15 20:42:27 +00:00
  • 4b090f938c ok Ghommie 2020-01-15 20:51:36 +01:00
  • 0b66a01d4a Automatic changelog generation for PR #10563 [ci skip] CitadelStationBot 2020-01-15 08:51:18 -06:00
  • 7b34daae48 Merge pull request #10563 from Trilbyspaceclone/patch-268 Ghom 2020-01-15 15:51:15 +01:00
  • 31c3b0f7bb Merge pull request #10415 from kevinz000/tg_update_1 Ghom 2020-01-15 15:23:09 +01:00
  • 327444a1bb Automatic changelog generation for PR #10557 [ci skip] CitadelStationBot 2020-01-15 07:54:14 -06:00
  • 5eb26682e2 Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1 Ghom 2020-01-15 14:54:11 +01:00
  • a31150ab6c Automatic changelog generation for PR #10535 [ci skip] CitadelStationBot 2020-01-15 07:53:29 -06:00
  • b896a233d4 Merge pull request #10535 from Hatterhat/greytide-standard-uniform Ghom 2020-01-15 14:53:26 +01:00
  • 7fb515173d FUCK kevinz000 2020-01-15 01:35:03 -07:00
  • 5c94813267 WHYISTHISLITERALLYWASTINGCPUONANULLFUCKINGLIST kevinz000 2020-01-15 01:31:49 -07:00
  • ca47a4e762 a kevinz000 2020-01-15 01:23:49 -07:00
  • b0c2e4cbdd Revert "shotgun pointblanking people actually throws them" kevinz000 2020-01-15 01:13:26 -07:00
  • bede695ebd Undoes minter changes Artur 2020-01-08 15:23:53 +01:00
  • 2208aa0f09 citadelification Artur 2020-01-15 09:49:18 +02:00
  • 5c9b59aa74 Ready for testmerge Artur 2020-01-15 09:44:29 +02:00
  • d04c09aba0 Compiles, just need to fix goonchat Artur 2019-12-31 23:20:36 +02:00
  • 8b8a112d2c Ohkay Artur 2020-01-15 09:41:33 +02:00
  • 6e3206a2e4 Why the fuck did the rest of the stuff dissapear Artur 2019-12-28 05:59:56 +01:00
  • 25ce2f545b iNITIAL Artur 2020-01-15 09:33:17 +02:00
  • a8e4989d74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics Seris02 2020-01-15 12:15:13 +08:00
  • 7b322ff467 Merge branch 'master' into greytide-standard-uniform Hatterhat 2020-01-14 19:39:16 -06:00
  • 3622dd118b forgive me, grey jumpsuit entry Hatterhat 2020-01-14 19:38:11 -06:00
  • 97ded4b27b ok kevinz000 2020-01-14 18:09:12 -07:00
  • 5f315ab418 ok kevinz000 2020-01-14 18:04:19 -07:00
  • 41bbdae220 micro optimization kevinz000 2020-01-14 17:50:14 -07:00
  • 59ab4c0670 hm kevinz000 2020-01-14 17:32:54 -07:00
  • 6ead30eab3 more shit kevinz000 2020-01-14 17:22:54 -07:00
  • 5351bc9f8a Update miscellaneous.dm Trilbyspaceclone 2020-01-14 19:15:35 -05:00
  • 8a06f2f45c Merge pull request #10499 from Hatterhat/tg-40046 Ghom 2020-01-15 01:05:36 +01:00
  • a5aebcd6ff Automatic changelog generation for PR #10530 [ci skip] CitadelStationBot 2020-01-14 17:47:41 -06:00
  • 5dee355381 Merge pull request #10530 from kappa-sama/modularer Ghom 2020-01-15 00:47:38 +01:00
  • eff86a449f wew kevinz000 2020-01-14 16:45:22 -07:00
  • 3510bf5150 Merge pull request #10560 from Ghommie/Ghommie-cit505 Lin 2020-01-14 22:01:35 +00:00
  • 26d6e7f05c Work. Ghommie 2020-01-14 22:04:38 +01:00
  • 3984943b0d [s] makes master compile. Ghommie 2020-01-14 20:02:26 +01:00
  • 1e14c0e09a Automatic changelog generation for PR #10531 [ci skip] CitadelStationBot 2020-01-14 11:26:37 -06:00
  • 2cc87c3127 Merge pull request #10531 from Trilbyspaceclone/Seed-to-points Ghom 2020-01-14 18:26:34 +01:00
  • 61885d0cd6 Automatic changelog generation for PR #10454 [ci skip] CitadelStationBot 2020-01-14 11:24:52 -06:00
  • 03ebab6ec5 Merge pull request #10454 from Commandersand/clothsfix Ghom 2020-01-14 18:24:50 +01:00
  • 66c608512b Merge branch 'Seed-to-points' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Seed-to-points TrilbySpaceClone 2020-01-14 10:45:00 -05:00
  • cb3a4caa63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics Seris02 2020-01-14 23:42:37 +08:00
  • ccfaa294bc Update research.dm TrilbySpaceClone 2020-01-14 10:40:47 -05:00
  • 11cb7357c5 Stop web-editing like that, little one. Ghom 2020-01-14 16:22:41 +01:00
  • 8ce7ac8854 custom reagent creampie Seris02 2020-01-14 22:10:41 +08:00
  • bf3f8536a2 hi kappa-sama 2020-01-14 09:05:05 -05:00
  • dcfa8df8f1 bye kappa-sama 2020-01-14 09:04:50 -05:00
  • 17604a672d epic kappa-sama 2020-01-14 09:04:35 -05:00
  • bc1e24cb7b Update tips.txt Trilbyspaceclone 2020-01-14 08:40:58 -05:00
  • c320143d53 Update tips.txt Trilbyspaceclone 2020-01-14 08:39:24 -05:00