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

Commit Graph

  • 53642c5104 Merge pull request #8842 from UristMcAstronaut/master kevinz000 2019-07-12 07:36:48 -07:00
  • febde0833f Automatic changelog generation for PR #8847 [ci skip] CitadelStationBot 2019-07-12 09:36:31 -05:00
  • 57891813db Merge pull request #8847 from Ghommie/Ghommie-cit123 kevinz000 2019-07-12 07:36:29 -07:00
  • 0f839a6692 Automatic changelog generation for PR #8854 [ci skip] CitadelStationBot 2019-07-12 09:36:03 -05:00
  • 650842b384 Merge pull request #8854 from Ghommie/Ghommie-cit126 kevinz000 2019-07-12 07:36:01 -07:00
  • 557f7b6ea3 Automatic changelog generation for PR #8846 [ci skip] CitadelStationBot 2019-07-12 09:35:27 -05:00
  • e5d445c4d3 Merge pull request #8846 from Ghommie/Ghommie-cit122 kevinz000 2019-07-12 07:35:25 -07:00
  • 032ac19373 Automatic changelog generation for PR #8872 [ci skip] CitadelStationBot 2019-07-12 09:35:06 -05:00
  • e26277b67c Merge pull request #8872 from deathride58/lightermops kevinz000 2019-07-12 07:35:04 -07:00
  • 6caacbe962 Automatic changelog generation for PR #8853 [ci skip] CitadelStationBot 2019-07-12 09:34:21 -05:00
  • 1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 kevinz000 2019-07-12 07:34:19 -07:00
  • 410db33193 Automatic changelog generation for PR #8843 [ci skip] CitadelStationBot 2019-07-12 09:33:38 -05:00
  • aeb2216551 Merge pull request #8843 from Coolgat3/tacticoolness kevinz000 2019-07-12 07:33:36 -07:00
  • daf2f85827 Automatic changelog generation for PR #8852 [ci skip] CitadelStationBot 2019-07-12 09:32:31 -05:00
  • bb568d633b Merge pull request #8852 from Tupinambis/CursedPlush kevinz000 2019-07-12 07:32:29 -07:00
  • 2e0053aa86 Update traumas.json Poojawa 2019-07-12 03:06:35 -05:00
  • 5bd2f28d69 Removed #C8A5DC BurgerLua 2019-07-12 01:02:43 -07:00
  • d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements Ghommie 2019-07-12 07:39:17 +02:00
  • ed9213066c Speedports "Fixes clockwork armor armor" Ghommie 2019-07-12 06:09:16 +02:00
  • 8df59b0b5c Recompiling TGUI. Ghommie 2019-07-12 05:56:21 +02:00
  • befbcdabb0 Update mecha_control_console.dm Sishen 2019-07-11 23:11:45 -04:00
  • cc901128c4 Oops I broke descriptions and sounds. Let me fix that. Tupinambis 2019-07-11 18:03:32 -05:00
  • 8d4c3b8ce9 Janitors are no longer diabetic - nerfs mop stamina usage to be more in-line with how much effort mopping takes IRL deathride58 2019-07-11 18:37:59 -04:00
  • c76f6b8a54 Merge pull request #8862 from BlackMajor/Burgit-Branch-2 kevinz000 2019-07-11 04:57:50 -07:00
  • a737da13d3 Update tgstation.dme kevinz000 2019-07-11 03:27:26 -07:00
  • b59c2837f6 "that's a penis" Ghommie 2019-07-11 12:04:50 +02:00
  • 517cfe227f toning down many species' standard female chest. Ghommie 2019-07-11 11:43:13 +02:00
  • 92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 Ghommie 2019-07-11 09:07:11 +02:00
  • 6fa454dfe7 r Ghommie 2019-07-11 09:01:57 +02:00
  • bef0027287 In a haste, we forget thousand things. Ghommie 2019-07-11 08:50:47 +02:00
  • 26ab7cc522 Ports "Show codewords on round end screen" Ghommie 2019-07-11 08:40:11 +02:00
  • 081c07098f randomizing colors. Ghommie 2019-07-11 08:08:07 +02:00
  • c30a3aafb6 Update nanites.dm kevinz000 2019-07-10 22:49:31 -07:00
  • 239d688fe4 Update weapon.dm kevinz000 2019-07-10 22:47:29 -07:00
  • db05432778 Update nanites.dm kevinz000 2019-07-10 22:44:21 -07:00
  • 143410c176 Blame Poojawa for the issue. Ghommie 2019-07-11 07:39:29 +02:00
  • 2995b22907 Update nanites.dm kevinz000 2019-07-10 22:38:43 -07:00
  • 27a8876e99 I dont care anymore, It works in testing to function fine Trilbyspaceclone 2019-07-11 01:15:39 -04:00
  • 05a01fe028 Update nanite_program_hub.dm kevinz000 2019-07-10 22:11:16 -07:00
  • d24b02f414 Automatic changelog generation for PR #8761 [ci skip] CitadelStationBot 2019-07-11 00:02:21 -05:00
  • 564904adf0 Merge pull request #8761 from Trilbyspaceclone/patch-187 kevinz000 2019-07-10 22:02:19 -07:00
  • 84d6fbe249 Update weapon.dm kevinz000 2019-07-10 22:00:28 -07:00
  • 55afc07a40 Automatic changelog generation for PR #8858 [ci skip] CitadelStationBot 2019-07-10 23:58:46 -05:00
  • 739ea950d1 Merge pull request #8858 from Trilbyspaceclone/patch-191 kevinz000 2019-07-10 21:58:44 -07:00
  • 146276014c Update other_reagents.dm Trilbyspaceclone 2019-07-10 20:42:12 -04:00
  • c4f736eb94 Merge branch 'master' into job-menu-improvements Poojawa 2019-07-10 18:55:29 -05:00
  • 48e15307c5 Update other_reagents.dm Trilbyspaceclone 2019-07-10 19:14:57 -04:00
  • ac9c672fa8 I guess this is better Trilbyspaceclone 2019-07-10 18:56:32 -04:00
  • ed89ac874b this was fine Trilbyspaceclone 2019-07-10 18:44:14 -04:00
  • 5ea9d998fd k_elasticity = 0 Trilbyspaceclone 2019-07-10 18:32:55 -04:00
  • baf4529e52 Update other_reagents.dm Trilbyspaceclone 2019-07-10 18:32:10 -04:00
  • d53d11de6b Apply suggestions from code review Trilbyspaceclone 2019-07-10 18:21:03 -04:00
  • 8f555b0fdd Reworked Astral, doubled lung damage, fixed lung damage oopsie. Fermi 2019-07-10 21:35:47 +01:00
  • a9c41c0fc7 hm kevinz000 2019-07-10 10:00:45 -07:00
  • c14a052eeb Update weapon.dm kevinz000 2019-07-10 03:06:32 -07:00
  • 2717590e9f No more fat smites BlackMajor 2019-07-10 21:01:41 +12:00
  • c9e13f8d62 better wording* Trilbyspaceclone 2019-07-10 02:43:18 -04:00
  • 54c28b19af Zelus indeed TrilbySpaceClone 2019-07-10 02:29:42 -04:00
  • e1ed96f419 Update other_reagents.dm Trilbyspaceclone 2019-07-09 23:08:11 -04:00
  • b03c197d0e forgot the var Trilbyspaceclone 2019-07-09 22:58:13 -04:00
  • 6240222ed7 Update other_reagents.dm Trilbyspaceclone 2019-07-09 21:58:22 -04:00
  • aece9b31ed Mistakessss! Fermi 2019-07-09 23:28:12 +01:00
  • ce390fb595 Tweaks to MK Fermi 2019-07-09 23:27:37 +01:00
  • ba7c24a0ec Refactoring underwear to allow custom color preferences. Ghommie 2019-07-09 23:25:54 +02:00
  • c12c5be2b6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 Fermi 2019-07-09 20:36:19 +01:00
  • 3a2192ec2e Hotfix for captain. Fermi 2019-07-09 20:36:16 +01:00
  • e5b2d7f5b8 Automatic changelog generation for PR #8844 [ci skip] CitadelStationBot 2019-07-09 10:30:46 -05:00
  • b5cb68fc68 Merge pull request #8844 from Ghommie/Ghommie-cit120 kevinz000 2019-07-09 08:30:44 -07:00
  • 69f06444e6 smgs kevinz000 2019-07-09 08:20:45 -07:00
  • a2d52c0ed9 HERE WE GO AGAIN. kevinz000 2019-07-09 07:55:44 -07:00
  • 444a8ef59b ah kevinz000 2019-07-09 07:37:24 -07:00
  • f37e1bf01b Merge branch 'master' into Unmodular Trilbyspaceclone 2019-07-09 03:14:49 -04:00
  • 7bca0c6d88 Update nanites.dm kevinz000 2019-07-08 23:48:22 -07:00
  • fafac3fba6 Update utility.dm kevinz000 2019-07-08 23:45:21 -07:00
  • 9cf2dea999 Grille spam. Ghommie 2019-07-09 08:35:32 +02:00
  • 3546ed9799 Stamina damtype weaponry fixes. Ghommie 2019-07-09 08:33:43 +02:00
  • 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" Ghommie 2019-07-09 07:58:22 +02:00
  • 8c0c80fc39 Removes references to the character of another underage player. Tupinambis 2019-07-09 00:02:16 -05:00
  • c418312cc6 Merge branch 'master' into master Thalpy 2019-07-09 05:33:09 +01:00
  • 0057ac7c5c Removed a plush representing the character of a player that was banned for being underaged. Tupinambis 2019-07-08 22:23:16 -05:00
  • 5b97a7533d it only affects maploaded items anyway. Ghommie 2019-07-09 04:34:13 +02:00
  • 1b3de620f9 BM requests. Fermi 2019-07-09 02:44:17 +01:00
  • 30a006e42f additions, and it now nulls out. kevinz000 2019-07-08 18:21:04 -07:00
  • 22cb46cb22 Update shields.dm Trilbyspaceclone 2019-07-08 20:30:46 -04:00
  • e56fc559ed Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15 deathride58 2019-07-08 18:15:20 -04:00
  • 9c0c4c8f59 Merge pull request #8683 from Citadel-Station-13/kevinz000-patch-3 deathride58 2019-07-08 18:14:08 -04:00
  • b8229b365c Merge pull request #8655 from Citadel-Station-13/kevinz000-patch-2 deathride58 2019-07-08 18:12:02 -04:00
  • 0303e5074b Automatic changelog generation for PR #8709 [ci skip] CitadelStationBot 2019-07-08 17:10:49 -05:00
  • 42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 deathride58 2019-07-08 18:10:46 -04:00
  • b8e34d1cab Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12 deathride58 2019-07-08 18:07:27 -04:00
  • 7a7e99d7fe Automatic changelog generation for PR #8750 [ci skip] CitadelStationBot 2019-07-08 17:07:06 -05:00
  • 59577f8818 Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix deathride58 2019-07-08 18:07:04 -04:00
  • c4692640bd Automatic changelog generation for PR #8740 [ci skip] CitadelStationBot 2019-07-08 17:06:13 -05:00
  • d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87 deathride58 2019-07-08 18:06:11 -04:00
  • e7224991b7 Few fixes Fermi 2019-07-08 23:06:01 +01:00
  • 947d33129c Merge pull request #8771 from Citadel-Station-13/kevinz000-patch-20 deathride58 2019-07-08 18:05:15 -04:00
  • ae75497e52 Automatic changelog generation for PR #8765 [ci skip] CitadelStationBot 2019-07-08 17:04:29 -05:00
  • 82d527b760 Merge pull request #8765 from Ghommie/Ghommie-cit91 deathride58 2019-07-08 18:04:27 -04:00
  • f2976caa59 Merge branch 'master' into patch-190 deathride58 2019-07-08 17:58:41 -04:00
  • e19c622b08 Merge pull request #8837 from Citadel-Station-13/revert-8244-iv-dripper-punctures deathride58 2019-07-08 17:57:30 -04:00