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

Commit Graph

  • e111429a30 the hippie thing kappa-sama 2019-12-08 23:37:33 -05:00
  • 8d7427a9f4 Automatic changelog generation for PR #9538 [ci skip] CitadelStationBot 2019-12-08 22:33:25 -06:00
  • 7794cea49c Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99 Lin 2019-12-09 04:33:23 +00:00
  • c0f8a42e0f Update eyes.dm kevinz000 2019-12-08 19:49:15 -07:00
  • 3e559b6d38 Update lighting.dm kevinz000 2019-12-08 19:46:38 -07:00
  • c38f4989be Update eyes.dm kevinz000 2019-12-08 19:45:27 -07:00
  • 6cbb0e3ca8 Update good.dm kevinz000 2019-12-08 19:44:26 -07:00
  • 994a9ecbc6 Automatic changelog generation for PR #9903 [ci skip] CitadelStationBot 2019-12-08 20:37:08 -06:00
  • 3cacb998dd Merge pull request #9903 from PersianXerxes/removeFreeNVG kevinz000 2019-12-08 19:37:06 -07:00
  • 442355e86d Automatic changelog generation for PR #10099 [ci skip] CitadelStationBot 2019-12-08 20:05:12 -06:00
  • 9869c1c440 Merge pull request #10099 from Ghommie/Ghommie-cit446 kevinz000 2019-12-08 19:05:10 -07:00
  • 2c08f7ac95 oops loginsandylogout 2019-12-08 17:25:17 -06:00
  • 1bae17a2de gauze loginsandylogout 2019-12-08 17:24:12 -06:00
  • 17782a8c87 ports refactor loginsandylogout 2019-12-08 17:10:50 -06:00
  • 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 Ghommie 2019-12-09 00:04:22 +01:00
  • 9a5c7a0631 Automatic changelog generation for PR #10044 [ci skip] CitadelStationBot 2019-12-08 16:18:18 -06:00
  • 6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423 Lin 2019-12-08 22:18:15 +00:00
  • d184bdd77a Whoops Artur 2019-12-08 22:22:30 +02:00
  • 1d3fdad459 Merge branch 'abductor-update' of https://github.com/Linzolle/Citadel-Station-13 into abductor-update Linzolle 2019-12-08 14:17:38 -06:00
  • 1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update Linzolle 2019-12-08 14:17:00 -06:00
  • ef01bbd222 Merge pull request #10075 from Ghommie/Ghommie-cit436 Lin 2019-12-08 20:15:01 +00:00
  • e300bb6b84 Automatic changelog generation for PR #10071 [ci skip] CitadelStationBot 2019-12-08 14:01:54 -06:00
  • 9c7ac9a469 Merge pull request #10071 from Ghommie/Ghommie-cit434 Lin 2019-12-08 20:01:50 +00:00
  • 9773b530f8 More fixes. Urgh Artur 2019-12-08 21:47:25 +02:00
  • 3e176bb79a should interrupt always Putnam 2019-12-08 11:41:08 -08:00
  • 1d0438800e Touched up a copy-paste leftover. Useroth 2019-12-08 17:04:11 +01:00
  • ea4f57beb6 Spaghettid my way around the errors. Useroth 2019-12-08 16:47:21 +01:00
  • 83ab577a6a Update launchpad_control.dm kevinz000 2019-12-08 07:30:05 -07:00
  • 2eca1657ab Add a N2O Pressure Tank r4d6 2019-12-08 08:54:50 -05:00
  • 5e836c51e4 Forgot to track the new files Useroth 2019-12-08 14:05:05 +01:00
  • a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. Useroth 2019-12-08 14:00:08 +01:00
  • a9335aa946 Fixes a long lasting runtime with filter data sorting. Ghommie 2019-12-08 13:21:29 +01:00
  • cdda28f85c tabs kappa-sama 2019-12-08 03:54:55 -05:00
  • 48be47d4d1 yes? kappa-sama 2019-12-08 03:54:29 -05:00
  • 52a050e9ee maybe kappa-sama 2019-12-08 03:54:02 -05:00
  • b015d2571a ==? kappa-sama 2019-12-08 03:51:36 -05:00
  • 10c844e70d does this even work kappa-sama 2019-12-08 03:36:09 -05:00
  • 379a01c3fe packin some more doo dee doo Hatterhat 2019-12-08 01:42:56 -06:00
  • 6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits Hatterhat 2019-12-07 00:48:30 -06:00
  • c0433ec944 I scream DeltaFire 2019-12-08 04:25:37 +01:00
  • 59e97989c0 I scream DeltaFire 2019-12-08 04:20:04 +01:00
  • 6b8441baed Bruh DeltaFire 2019-12-08 03:49:39 +01:00
  • 88acc15fe5 scream if you want, it won't help you. DeltaFire 2019-12-08 03:46:55 +01:00
  • e9b96650f5 Automatic changelog generation for PR #10068 [ci skip] CitadelStationBot 2019-12-07 15:52:13 -06:00
  • a91139c470 Merge pull request #10068 from Ghommie/Ghommie-cit433 Lin 2019-12-07 21:52:10 +00:00
  • ceaf097597 Automatic changelog generation for PR #10057 [ci skip] CitadelStationBot 2019-12-07 15:49:20 -06:00
  • 24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431 Lin 2019-12-07 21:49:18 +00:00
  • 969638a92d More changlog updates as per its been a month TrilbySpaceClone 2019-12-07 14:24:24 -05:00
  • 67d3d19cb9 correctiosn TrilbySpaceClone 2019-12-07 13:43:34 -05:00
  • 5824162b72 Automatic changelog generation for PR #10100 [ci skip] CitadelStationBot 2019-12-07 11:59:08 -06:00
  • 3e9acf73d0 Merge pull request #10100 from Thalpy/Botany-pH Putnam3145 2019-12-07 09:59:06 -08:00
  • e5c8f7bf06 Merge branch 'master' into glassware TrilbySpaceClone 2019-12-07 12:50:32 -05:00
  • f59bdbe14e Tweaks botany related ragent pHes so they're less likely to blow up. Thalpy 2019-12-07 17:42:29 +00:00
  • 60c555c7e1 Merge branch 'master' into Superbases-goodbye Thalpy 2019-12-07 17:37:05 +00:00
  • cece6dd43d Merge pull request #10098 from Ghommie/Ghommie-cit445 Putnam3145 2019-12-07 08:48:21 -08:00
  • c35acf00fe Empty commit to make travis recompile. Useroth 2019-12-07 15:18:37 +01:00
  • 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers Artur 2019-12-07 15:53:11 +02:00
  • 28ddfd29b6 Merge branch 'master' into new-tg-plants Useroth 2019-12-07 14:25:38 +01:00
  • 95cc84e69e Fixes a few holo barriers' transparency. Ghommie 2019-12-07 12:13:33 +01:00
  • d38475f06d i'm tired of this Ghommie 2019-12-07 12:05:12 +01:00
  • bffe3b6da0 should be the last fix! Trilbyspaceclone 2019-12-07 05:21:48 -05:00
  • 0c82357159 Update condiment.dm Trilbyspaceclone 2019-12-07 05:18:14 -05:00
  • f4aca7cf85 Update meat.dm Trilbyspaceclone 2019-12-07 05:17:39 -05:00
  • 2e0b019bd7 Update utility.dm kevinz000 2019-12-07 03:11:54 -07:00
  • c27e507bca Update food_reagents.dm Trilbyspaceclone 2019-12-07 05:01:12 -05:00
  • f83d1c4763 Made kevlar and armor padding accessories inconspicious and examine-proof. Ghommie 2019-12-07 10:53:10 +01:00
  • 89b9df23bc le sigh Trilbyspaceclone 2019-12-07 04:43:58 -05:00
  • 46ad42708c massive TG sigh Trilbyspaceclone 2019-12-07 04:42:48 -05:00
  • 156b7cabb1 Update recipes_misc.dm Trilbyspaceclone 2019-12-07 04:41:28 -05:00
  • c9ee29ad02 hmm TrilbySpaceClone 2019-12-07 04:33:42 -05:00
  • 562bf2d492 fix TrilbySpaceClone 2019-12-07 04:04:07 -05:00
  • 19b9cbbb69 F Ghommie 2019-12-07 09:58:37 +01:00
  • fd9e09d7e6 Automatic changelog generation for PR #9912 [ci skip] CitadelStationBot 2019-12-07 02:52:37 -06:00
  • c706720dd1 Merge pull request #9912 from Owai-Seek/cargocleanupv2boogaloo kevinz000 2019-12-07 01:52:35 -07:00
  • 7ab66fd2e2 no wounder why I didnt push it, it never complied Trilbyspaceclone 2019-12-07 03:50:20 -05:00
  • 6faad2e30b Update recipes_misc.dm Trilbyspaceclone 2019-12-07 03:46:25 -05:00
  • a82e0b9ee5 Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks. Ghommie 2019-12-07 09:45:38 +01:00
  • 025a7cd79a more ports TrilbySpaceClone 2019-12-07 03:04:02 -05:00
  • bb83d69aa0 Deepfries the trekkie security alert sounds to be three times more annoying, as well as replace the delta alert with the THX Deep Note... actually not. Ghommie 2019-12-07 08:06:30 +01:00
  • c4450579ac Why does breakfast have a timer? TrilbySpaceClone 2019-12-07 01:53:55 -05:00
  • 5f56d40f58 Incorporated the bamboo grammar fixes. Useroth 2019-12-07 06:41:24 +01:00
  • 7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 Ghommie 2019-12-07 05:30:07 +01:00
  • 0a0094e80c Fixes stuff I broke with my coding extravaganza. Ghommie 2019-12-07 05:11:29 +01:00
  • 9152fe49e6 Typo. Ghommie 2019-12-07 04:49:18 +01:00
  • b9751006bb Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago. Ghommie 2019-12-07 04:46:54 +01:00
  • d1bfe3d840 i hate Hatterhat 2019-12-06 21:43:15 -06:00
  • e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... Ghommie 2019-12-07 04:02:33 +01:00
  • 2d9c6e64c5 Update launchpad_control.dm kevinz000 2019-12-06 19:55:54 -07:00
  • 5c43a68b71 Automatic changelog generation for PR #9932 [ci skip] CitadelStationBot 2019-12-06 20:37:56 -06:00
  • e4a41c6169 Merge pull request #9932 from Putnam3145/fix-genital-contam nik707 2019-12-06 20:37:53 -06:00
  • 019ab63e09 Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove() Ghommie 2019-12-07 02:06:51 +01:00
  • 602bc57060 Merge pull request #10064 from Citadel-Station-13/kevinz000-patch-121 Lin 2019-12-07 00:51:44 +00:00
  • dd70610cae 🦀 travis is dead 🦀 Ghommie 2019-12-07 01:47:54 +01:00
  • 825f553a5d Merge Conflicts Unknown 2019-12-06 17:25:31 -07:00
  • 97e686cf23 Merge branch 'master' into xantholne-christmas01 Unknown 2019-12-06 17:21:08 -07:00
  • 3d42744d8a conflict with a certain framework for tech node discounts or something I guess. Ghommie 2019-12-07 00:38:32 +01:00
  • 7cb2092fcb typo Ghommie 2019-12-07 00:04:05 +01:00
  • ae94e1cfbe Fixed alien tech node not being unlockable with subtypes of the accepted items. Ghommie 2019-12-06 23:45:36 +01:00
  • 19ab4a5f70 Review fixes and tweaks Artur 2019-12-07 00:43:02 +02:00
  • 723690bab0 Demodularize defib disks and projectiles icons. Ghommie 2019-12-06 23:07:50 +01:00