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

Commit Graph

  • 404d202f2b Automatic changelog generation for PR #9908 [ci skip] CitadelStationBot 2019-11-22 17:42:56 -06:00
  • 4fbd42995c Merge pull request #9908 from Ghommie/Ghommie-cit389 Putnam3145 2019-11-22 15:42:54 -08:00
  • b7f7342e43 Merge pull request #9900 from Ghommie/Ghommie-cit388 Putnam3145 2019-11-22 15:41:52 -08:00
  • a7918717ff fixes compile errors. GrayRachnid 2019-11-22 18:22:53 -05:00
  • 61299fee42 ready for review/testing GrayRachnid 2019-11-22 15:32:09 -05:00
  • 3544885b73 reverts fermis changes, woops. GrayRachnid 2019-11-22 15:26:20 -05:00
  • c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs GrayRachnid 2019-11-22 15:24:15 -05:00
  • febceaa2d6 Apply suggestions from code review Trilbyspaceclone 2019-11-22 14:39:31 -05:00
  • 03dae580a9 Minor QoL and Wardrobe Updates Winter Flare 2019-11-22 14:08:12 -05:00
  • 7d3599b2f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 Ghommie 2019-11-22 18:53:58 +01:00
  • 783fef394c b kappa-sama 2019-11-22 09:12:42 -05:00
  • 386dd6aa8a Made Medical Emergency Crate Drop-Pod only. Winter Flare 2019-11-22 06:44:59 -05:00
  • 216790d442 Merge branch 'master' into HeadCorgi lolman360 2019-11-22 21:54:05 +11:00
  • f53918682c re-adds hats TrilbySpaceClone 2019-11-22 05:52:18 -05:00
  • b01be3b1ff Merge branch 'master' into crow TrilbySpaceClone 2019-11-22 05:48:36 -05:00
  • 05b22caaa3 Added 12 new crates, fixed issues raised in #9901 Winter Flare 2019-11-22 02:37:57 -05:00
  • 9999d87b42 fixed hands kiwedespars 2019-11-21 22:59:57 -08:00
  • 66a97cb224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 Ghommie 2019-11-22 05:17:42 +01:00
  • 9f6d595ad5 Ouch Ghommie 2019-11-22 05:08:58 +01:00
  • 0ac188bde9 Unmodularize gamemodes folder. Ghommie 2019-11-22 05:00:53 +01:00
  • 98998ca85f un-moths the anthromorphic insects kiwedespars 2019-11-21 19:47:48 -08:00
  • b4b80ef314 un-superfluffs the fluff kiwedespars 2019-11-21 19:46:53 -08:00
  • 10b16b2442 reverts insect sprites kiwedespars 2019-11-21 19:39:51 -08:00
  • 3310a2c435 Little APC overlays tweak. Removing rogue pixels from the energy gun. Ghommie 2019-11-22 04:26:00 +01:00
  • 2136968585 Ring ring TrilbySpaceClone 2019-11-21 21:55:17 -05:00
  • 0f9ec5ebb3 Automatic changelog generation for PR #9887 [ci skip] CitadelStationBot 2019-11-21 20:39:32 -06:00
  • 522a664f55 Merge pull request #9887 from Ghommie/Ghommie-cit385 Lin 2019-11-22 02:39:29 +00:00
  • 05e3fc1a01 Automatic changelog generation for PR #9530 [ci skip] CitadelStationBot 2019-11-21 20:37:52 -06:00
  • 1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245 Lin 2019-11-22 02:37:49 +00:00
  • 0cbfd22c95 Automatic changelog generation for PR #9518 [ci skip] CitadelStationBot 2019-11-21 19:36:50 -06:00
  • 3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243 Lin 2019-11-22 01:36:47 +00:00
  • 72a119da2e Prevents VR mobs from being midround antags. Putnam 2019-11-21 17:31:22 -08:00
  • 318709b5c0 Automatic changelog generation for PR #9823 [ci skip] CitadelStationBot 2019-11-21 19:16:38 -06:00
  • c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix Lin 2019-11-22 01:16:35 +00:00
  • 584455aca0 Automatic changelog generation for PR #9871 [ci skip] CitadelStationBot 2019-11-21 19:15:07 -06:00
  • 6323d9d7c8 Merge pull request #9871 from dzahlus/buff-sounds Lin 2019-11-22 01:15:05 +00:00
  • cf1e9021d0 Automatic changelog generation for PR #9889 [ci skip] CitadelStationBot 2019-11-21 19:14:41 -06:00
  • 2412bad483 Merge pull request #9889 from GrayRachnid/fixgoldbox Lin 2019-11-22 01:14:39 +00:00
  • 6062ab0c9b Also make it log ALL threat changes. Putnam 2019-11-21 16:39:16 -08:00
  • 3cc0207e73 Ready for merge. Ghommie 2019-11-22 01:04:39 +01:00
  • 78a6f225c9 Merge branch 'xantholne-berets01' into xantholne-berets02 Unknown 2019-11-21 14:39:07 -07:00
  • 9af48caa62 OKAY DONE ARGH Thalpy 2019-11-21 20:46:00 +00:00
  • b0b3a4d5e9 hmm TrilbySpaceClone 2019-11-21 15:45:58 -05:00
  • 7b17bf2acd god damn bitflags ARGH Thalpy 2019-11-21 20:30:49 +00:00
  • db74091dd4 Strange revert Thalpy 2019-11-21 19:47:00 +00:00
  • 7460c28b60 Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL Thalpy 2019-11-21 19:39:58 +00:00
  • 0cce3a01f4 Ghommie's requiem Thalpy 2019-11-21 19:39:55 +00:00
  • a0a52018f3 Apply suggestions from code review Thalpy 2019-11-21 19:06:34 +00:00
  • da1da717d2 Update code/game/objects/items/devices/scanners.dm Thalpy 2019-11-21 19:03:48 +00:00
  • bd07ff4bf7 This should be the one! Thalpy 2019-11-21 18:55:43 +00:00
  • 2b8ea0f7a6 Whoops DeltaFire 2019-11-21 19:14:38 +01:00
  • 157c0c487a Holy canoli batman imagine me not having upstream set right Unknown 2019-11-21 11:03:43 -07:00
  • 4974400ccb Merge branch 'master' into xantholne-berets01 Unknown 2019-11-21 11:01:42 -07:00
  • ca79f21bf2 Another merge conflict Unknown 2019-11-21 10:17:23 -07:00
  • 51c3b160d7 Fix for an extra thing added by accident Unknown 2019-11-21 10:19:47 -07:00
  • b90ac6b626 .dmi merge conflicts Unknown 2019-11-21 10:14:49 -07:00
  • 75a730e688 Merge remote-tracking branch 'origin/xantholne-berets01' into xantholne-berets01 Unknown 2019-11-21 10:12:44 -07:00
  • b009ffc95c master kappa-sama 2019-11-21 11:38:41 -05:00
  • edd1946bf9 Changes code as requested by kev DeltaFire 2019-11-21 17:20:33 +01:00
  • 00bffba7ea Why do surgeries always end up with jank Thalpy 2019-11-21 15:57:21 +00:00
  • 46076c95c7 Ghommie is a good friend Thalpy 2019-11-21 14:22:04 +00:00
  • 8256a206cf Update code/modules/surgery/emergency_cardioversion_recovery.dm Thalpy 2019-11-21 13:24:57 +00:00
  • 29ae9eb962 Added reagent IDs. Useroth 2019-11-21 12:52:49 +01:00
  • 863b2398ac Removes the night vision quirk Persi 2019-11-21 06:19:37 -05:00
  • 1bc4a788df Another touch to the missing icons. Useroth 2019-11-21 11:47:31 +01:00
  • 76d72f6f6e Fixed a couple missing icons. Useroth 2019-11-21 11:38:54 +01:00
  • 2ced7db508 Ported a bunch of tg hydroponic stuff. Useroth 2019-11-21 10:53:57 +01:00
  • bfeece4c6e fixing a get_idcard runtime. The betrayal of the ?. Ghommie 2019-11-21 09:23:05 +01:00
  • ee73806616 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352 Ghommie 2019-11-21 09:18:14 +01:00
  • a95b78af52 Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm loginsandylogout 2019-11-21 00:52:52 -06:00
  • 6a0bd7c925 THE REVENGE OF THE WHITESPACES Ghommie 2019-11-21 07:40:49 +01:00
  • 253464e508 fixes icons fully Seris02 2019-11-21 14:10:55 +08:00
  • 4650cf9f12 gets rid of the bad icon, switching to see other icon and fix again, just one more commit to go, yeet Seris02 2019-11-21 14:07:57 +08:00
  • 2dd20c63f9 fixes the icons added Seris02 2019-11-21 14:03:37 +08:00
  • 5153ed04ec aaa Ghommie 2019-11-21 06:48:26 +01:00
  • 911a33bfd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387 Ghommie 2019-11-21 06:36:59 +01:00
  • dccb3c2e22 part 3 Ghommie 2019-11-21 06:36:22 +01:00
  • 71b3b8fdc6 Ports/Adds new Berets Unknown 2019-11-20 21:59:12 -07:00
  • 976ac6ad0c Automatic changelog generation for PR #9880 [ci skip] CitadelStationBot 2019-11-20 23:12:44 -06:00
  • c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix kevinz000 2019-11-20 22:12:42 -07:00
  • 33be109eac Automatic changelog generation for PR #9866 [ci skip] CitadelStationBot 2019-11-20 23:09:56 -06:00
  • 1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds kevinz000 2019-11-20 22:09:53 -07:00
  • 75f83944ca Automatic changelog generation for PR #9865 [ci skip] CitadelStationBot 2019-11-20 23:09:24 -06:00
  • 61c759f7a2 Merge pull request #9865 from Useroth/bagsort kevinz000 2019-11-20 22:09:22 -07:00
  • b1b30b8150 Automatic changelog generation for PR #9868 [ci skip] CitadelStationBot 2019-11-20 23:08:57 -06:00
  • 30aefd050a Merge pull request #9868 from Ghommie/Ghommie-cit376 kevinz000 2019-11-20 22:08:54 -07:00
  • 60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix Seris02 2019-11-21 13:08:23 +08:00
  • fda0905b9f Automatic changelog generation for PR #9323 [ci skip] CitadelStationBot 2019-11-20 23:03:42 -06:00
  • 8d363b8e9d Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85 nik707 2019-11-20 23:03:39 -06:00
  • 345d1af88e Automatic changelog generation for PR #9831 [ci skip] CitadelStationBot 2019-11-20 23:01:52 -06:00
  • 42de0d5ebe Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix kevinz000 2019-11-20 22:01:49 -07:00
  • 0300927974 Merge pull request #9487 from Citadel-Station-13/spooky nik707 2019-11-20 23:00:09 -06:00
  • 3fc5dad491 Ports/Adds new Berets Unknown 2019-11-20 21:59:12 -07:00
  • e941a10d4d Automatic changelog generation for PR #9681 [ci skip] CitadelStationBot 2019-11-20 22:55:24 -06:00
  • 56d2c0edad Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107 nik707 2019-11-20 22:55:21 -06:00
  • 1071147214 Automatic changelog generation for PR #9828 [ci skip] CitadelStationBot 2019-11-20 22:53:07 -06:00
  • 540a57b518 Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat kevinz000 2019-11-20 21:53:05 -07:00
  • c0b22a80be Automatic changelog generation for PR #9703 [ci skip] CitadelStationBot 2019-11-20 22:52:13 -06:00
  • 28190bc168 Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109 nik707 2019-11-20 22:52:11 -06:00
  • df11e75414 Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110 nik707 2019-11-20 22:51:32 -06:00