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

Commit Graph

  • e870830a72 Update preferences.dm Ghom 2020-04-20 17:52:10 +02:00
  • 9919a23966 This fixes everyone being a pugilist holy fuck necromanceranne 2020-04-21 00:36:54 +10:00
  • e703e12c88 WIP Ghommie 2020-04-20 16:25:08 +02:00
  • 7c6c20ec7a Update game_options.dm Ghom 2020-04-20 16:04:55 +02:00
  • c3a2e85076 Ah. Ghommie 2020-04-20 15:15:12 +02:00
  • 0bef955806 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 Ghommie 2020-04-20 15:14:30 +02:00
  • 60e89f154a Fixes missing inv/dropped icon of glass gasmask Anonymous 2020-04-20 14:44:19 +03:00
  • 10ae9bb51d Merge pull request #11944 from Trilbyspaceclone/patch-349 Ghom 2020-04-20 13:39:07 +02:00
  • bb5c4d9dd4 Merge pull request #11948 from kevinz000/woops Ghom 2020-04-20 13:38:36 +02:00
  • dc97b65681 Revert "Revert "Update mobs.dm"" kevinz000 2020-04-20 04:03:13 -07:00
  • d8d6ae8555 Revert "Update mobs.dm" kevinz000 2020-04-20 04:01:57 -07:00
  • 1b9bfe9674 Update mobs.dm kevinz000 2020-04-20 04:00:47 -07:00
  • f498fb106a Update BoxStation.dmm MrJWhit 2020-04-20 05:25:20 -04:00
  • 10d8ef79db Update CogStation.dmm EmeraldSundisk 2020-04-19 20:33:35 -07:00
  • 6fcec77e9b Update shields.dm Trilbyspaceclone 2020-04-19 23:18:17 -04:00
  • e311aafbc0 Update snacks_meat.dm Trilbyspaceclone 2020-04-19 22:21:07 -04:00
  • 31d7fad1b4 Update time_track.dm Ghom 2020-04-20 02:39:40 +02:00
  • d2cfb7608a Merge pull request #11926 from MrJWhit/adds-another-power-line-in-box Ghom 2020-04-20 02:35:23 +02:00
  • 2cf8dad8ae Merge pull request #11928 from Putnam3145/traitor-class-reroll Ghom 2020-04-20 02:30:33 +02:00
  • 3bef4b88ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 Ghommie 2020-04-20 02:29:34 +02:00
  • 850c08cb0e Merge pull request #11894 from NopemanMcHalt/trek_tmp Ghom 2020-04-20 02:21:24 +02:00
  • 842483190a Update code/game/objects/items/storage/uplink_kits.dm kiwedespars 2020-04-19 17:18:14 -07:00
  • b21ee932cf maybe this is travis's issue? kiwedespars 2020-04-19 17:06:21 -07:00
  • 42fac43807 Merge branch 'master' into punch-bundle kiwedespars 2020-04-19 16:50:01 -07:00
  • 25e0c47225 oops kiwedespars 2020-04-19 16:48:37 -07:00
  • ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization kevinz000 2020-04-19 16:45:44 -07:00
  • d98f536003 map fix + cube fix TrilbySpaceClone 2020-04-19 19:38:23 -04:00
  • 3a78da9332 commit clearifcation TrilbySpaceClone 2020-04-19 19:18:19 -04:00
  • 25b1b889dc amazing truely amazing TrilbySpaceClone 2020-04-19 19:09:20 -04:00
  • 2c362dd84f Update uplink_bundles.dm kiwedespars 2020-04-19 15:58:31 -07:00
  • c3905c8c2b Update uplink_kits.dm kiwedespars 2020-04-19 15:56:31 -07:00
  • 0c2f0a99d5 fixes the fact that some citadel null rods aren't null rod subtypes Detective Google 2020-04-19 17:18:40 -05:00
  • 5376ca81b5 Turns chaplain null rod selection into a radial function(port TG#50512) Detective Google 2020-04-19 16:57:02 -05:00
  • b8ff1b16bd Better. Winter Flare 2020-04-19 17:28:07 -04:00
  • 8e3f48a761 Reduces (or gives) weight classes to several items. Winter Flare 2020-04-19 17:13:19 -04:00
  • dc5c8fb657 Ups Crab Meat from 1 to 4 Winter Flare 2020-04-19 17:00:48 -04:00
  • 22dd41925f Merge pull request #11937 from Citadel-Station-13/Ghommie-patch-3 CitadelStationBot 2020-04-19 15:11:28 -05:00
  • 37a0fb558c with fixes and new gauze TrilbySpaceClone 2020-04-19 15:29:48 -04:00
  • 88b5ca72b7 Merge pull request #11906 from Citadel-Station-13/Ghommie-patch-2 Lin 2020-04-19 16:53:54 +00:00
  • d75e3f79bd Merge pull request #11917 from Ghommie/Ghommie-cit688 Lin 2020-04-19 16:52:33 +00:00
  • 8551998833 Update critter.dm Ghom 2020-04-19 14:07:13 +02:00
  • 792af56b67 Update riding.dm kevinz000 2020-04-19 00:48:51 -07:00
  • 043950a3ee Merge branch 'master' into trek_tmp Anonymous 2020-04-19 09:51:21 +03:00
  • f714403d6e Merge pull request #11895 from Seris02/piggybackfix Ghom 2020-04-19 04:56:04 +02:00
  • ddf0480ec9 Merge pull request #11933 from Trilbyspaceclone/patch-348 Ghom 2020-04-19 04:54:09 +02:00
  • 2039fb80e6 Update fancy.dm Trilbyspaceclone 2020-04-18 22:37:05 -04:00
  • 24370db5eb Merge pull request #11930 from Ghommie/Ghommie-cit693 kevinz000 2020-04-18 19:33:10 -07:00
  • ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687 kevinz000 2020-04-18 19:32:50 -07:00
  • b65ad491b4 Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2 kevinz000 2020-04-18 19:32:34 -07:00
  • 5fd862e19d Merge pull request #11860 from Trilbyspaceclone/shields! kevinz000 2020-04-18 19:32:09 -07:00
  • 42b81fee3d Update drink_reagents.dm Trilbyspaceclone 2020-04-18 21:57:36 -04:00
  • b08ad2dd2b Merge pull request #11907 from Linzolle/ripicon Ghom 2020-04-19 03:40:27 +02:00
  • e8b5ebecc3 Merge pull request #11911 from kevinz000/compression Ghom 2020-04-19 03:26:19 +02:00
  • 98081aa56b Some mispelled filepaths. Ghommie 2020-04-19 03:15:51 +02:00
  • d5a43be181 Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart. Ghommie 2020-04-19 03:07:45 +02:00
  • 6e62f7a2a3 Merge pull request #11878 from Arturlang/fixes_zipties_being_red Ghom 2020-04-19 02:45:31 +02:00
  • 39aef14924 More ToS Compliance. Ghommie 2020-04-19 02:40:58 +02:00
  • 8d8a0b0f45 Merge pull request #11899 from Ghommie/Ghommie-cit686 Lin 2020-04-19 00:24:29 +00:00
  • 877c912dc1 Automatic changelog compile [ci skip] Changelogs 2020-04-19 00:04:27 +00:00
  • 9c8f6cd00f peeves. Ghommie 2020-04-19 02:03:05 +02:00
  • e3fb978465 Shielded element. Ghommie 2020-04-19 01:48:51 +02:00
  • 998b199dba Merge pull request #11927 from kappa-sama/patch-22 Ghom 2020-04-19 01:21:23 +02:00
  • 7e57a3410e Merge pull request #11905 from Putnam3145/fix-rads-again Ghom 2020-04-19 00:32:41 +02:00
  • 9976fab42b Made traitor classes rerollable, reassignable by admins Putnam 2020-04-18 14:40:41 -07:00
  • 2654352d0c tg surgery fixes time kappa-sama 2020-04-18 17:37:19 -04:00
  • ba9d7c7dbc Fixing up of boxstation MrJWhit 2020-04-18 17:12:16 -04:00
  • efdab85261 Update crayons.dm Trilbyspaceclone 2020-04-18 17:10:31 -04:00
  • a5b7f506f9 Update chem_dispenser.dm Trilbyspaceclone 2020-04-18 16:42:46 -04:00
  • 63524b47c3 Why is ice and water so filling? Trilbyspaceclone 2020-04-18 16:28:51 -04:00
  • 26facfa37a honey changes + complie Trilbyspaceclone 2020-04-18 16:24:05 -04:00
  • 54cce75679 Update food_reagents.dm Trilbyspaceclone 2020-04-18 16:15:40 -04:00
  • b9413eb4f1 Merge pull request #34 from Citadel-Station-13/master EmeraldSundisk 2020-04-18 12:07:32 -07:00
  • 97bd52f03e haha me too necromanceranne 2020-04-19 04:49:11 +10:00
  • cb39ba3491 Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps necromanceranne 2020-04-19 04:25:41 +10:00
  • 957e92ed8f Update microwave.dm Ghom 2020-04-18 19:53:31 +02:00
  • 811f65e48b Removing troublesome and filler uplink items. Ghommie 2020-04-18 19:51:09 +02:00
  • cc16027d1a Nerfing the bonus reagents from upgraded microwaves. Ghommie 2020-04-18 19:30:14 +02:00
  • 59f2b66fd9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit689 Ghommie 2020-04-18 18:44:46 +02:00
  • 0663a3f01c ceiling to avoid infinity ez nutriment. Ghommie 2020-04-18 18:18:22 +02:00
  • 08b0a2460e Comment. Ghommie 2020-04-18 17:55:34 +02:00
  • beb34321e7 nerf to biogenerator upgrades and purge of inorganic glass bottles designs. Ghommie 2020-04-18 17:53:00 +02:00
  • 42bb01057f now with working code! TrilbySpaceClone 2020-04-18 10:09:15 -04:00
  • 8ca7bb7535 Right... TrilbySpaceClone 2020-04-18 09:46:56 -04:00
  • 8d4a67fedc Makes warm donk pockets cooling after 7 minutes canon again. Ghommie 2020-04-18 15:40:18 +02:00
  • 64116857cf Merge branch 'master' into trek_tmp Anonymous 2020-04-18 16:34:21 +03:00
  • 344c8b1334 Hmm TrilbySpaceClone 2020-04-18 08:28:14 -04:00
  • bd03d2a362 Merge pull request #11908 from Putnam3145/fix-tactical-destroy Ghom 2020-04-18 13:32:49 +02:00
  • 6d50b5daf0 Merge pull request #11887 from Citadel-Station-13/kevinz000-patch-1 Ghom 2020-04-18 13:28:38 +02:00
  • 9b981d0749 Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9 Ghom 2020-04-18 13:28:34 +02:00
  • bbd038bba6 Ghommies suggestion Artur 2020-04-18 14:06:38 +03:00
  • f0823bc2b6 Combat looks better Artur 2020-04-18 13:57:34 +03:00
  • edb7b1d61c Fixes catstuffs Artur 2020-04-18 13:52:27 +03:00
  • 85c5548d1a Ports https://github.com/tgstation/tgstation/pull/50521/ Artur 2020-04-18 13:49:06 +03:00
  • cc82f08ebc weh Seris02 2020-04-18 18:28:35 +08:00
  • 320c33e375 Vore compression kevinz000 2020-04-18 01:46:59 -07:00
  • 18b9d1cc16 Sound compression kevinz000 2020-04-18 01:39:50 -07:00
  • 14a5985891 Adds more service stuff to lathes. Putnam 2020-04-17 23:00:05 -07:00
  • d361a8d6ae Makes tactical destroy() work properly. Putnam 2020-04-17 22:33:11 -07:00
  • 64647318df Merge pull request #11883 from Putnam3145/fix-dynamic-on-by-default Ghom 2020-04-18 05:47:21 +02:00
  • 50ee5b9de5 Merge pull request #11885 from kappa-sama/patch-21 Ghom 2020-04-18 05:44:53 +02:00