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

Commit Graph

  • 2f30735fcb yes kappa-sama 2019-10-21 20:36:17 -04:00
  • 259946b496 kill travis kappa-sama 2019-10-21 20:35:10 -04:00
  • 412aa0feeb Update traumas.json MrJWhit 2019-10-21 20:33:28 -04:00
  • 6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-10-21 19:13:19 -05:00
  • 2c72b91fbd Triv curb kick Trilbyspaceclone 2019-10-21 19:16:13 -04:00
  • 5fced4427b buffs paperwork Trilbyspaceclone 2019-10-21 19:05:53 -04:00
  • 8ce8246182 lowers paperwork Trilbyspaceclone 2019-10-21 19:01:59 -04:00
  • 7adba39e82 Update misc.dm Trilbyspaceclone 2019-10-21 19:00:02 -04:00
  • 0b03b879b3 adds more crates Trilbyspaceclone 2019-10-21 18:51:39 -04:00
  • cdd24550dd Make Cells not a viable replacement for the Stock Part Cheese r4d6 2019-10-21 18:50:58 -04:00
  • 1a722a7b52 Update golems.dm BlackMajor 2019-10-22 11:28:07 +13:00
  • b77a94bd7d Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88 BlackMajor 2019-10-22 11:04:30 +13:00
  • a2bb6bb07a Merge pull request #9417 from Citadel-Station-13/kevinz000-patch-91 BlackMajor 2019-10-22 11:01:20 +13:00
  • c901f796f8 Merge pull request #8963 from Citadel-Station-13/kevinz000-patch-61 BlackMajor 2019-10-22 10:50:04 +13:00
  • 69a125d996 Update neurotoxin.dm kevinz000 2019-10-21 14:41:40 -07:00
  • 1d649c27de Update robot_movement.dm kevinz000 2019-10-21 14:38:38 -07:00
  • c0d4d32dee Update robot_upgrades.dm kevinz000 2019-10-21 14:36:21 -07:00
  • 70c7894155 Update emergency.dm Trilbyspaceclone 2019-10-21 17:20:44 -04:00
  • 6379807370 Update armory.dm Trilbyspaceclone 2019-10-21 17:10:48 -04:00
  • 4767a91ad2 Update _techweb.dm kappa-sama 2019-10-21 17:04:47 -04:00
  • 216ec5783c Merge branch 'master' of https://github.com/kappa-sama/Citadel-Station-13 kappa-sama 2019-10-21 16:33:16 -04:00
  • 7ace15d846 oops Thalpy 2019-10-21 20:58:15 +01:00
  • 32e863ac80 slightly less band-aidy way to do it Linzolle 2019-10-21 14:12:09 -05:00
  • 36357b3280 Eh this way is probably better. Thalpy 2019-10-21 19:54:44 +01:00
  • 805079b62c Goodbye, superpH, you were too wild for our world. Thalpy 2019-10-21 19:44:52 +01:00
  • ffa98e9da9 Automatic changelog generation for PR #9536 [ci skip] CitadelStationBot 2019-10-21 13:16:59 -05:00
  • cbf7509749 Merge pull request #9536 from r4d6/patch-2 kevinz000 2019-10-21 11:16:56 -07:00
  • 7ba8b55942 Automatic changelog generation for PR #9524 [ci skip] CitadelStationBot 2019-10-21 10:57:48 -05:00
  • 8090d58baf Merge pull request #9524 from Linzolle/wingcolors nik707 2019-10-21 10:57:45 -05:00
  • 3940128897 Automatic changelog generation for PR #9525 [ci skip] CitadelStationBot 2019-10-21 10:26:55 -05:00
  • 6a9d8f1981 Merge pull request #9525 from Linzolle/angel-wings nik707 2019-10-21 10:26:53 -05:00
  • ba90df997f Merge branch 'master' into wingcolors nik707 2019-10-21 10:25:46 -05:00
  • d1b8dc58d2 Automatic changelog generation for PR #9520 [ci skip] CitadelStationBot 2019-10-21 10:24:32 -05:00
  • 671fdf32c9 Merge pull request #9520 from r4d6/master nik707 2019-10-21 10:24:30 -05:00
  • 6fe65368f6 roboticists can have some love kappa-sama 2019-10-21 10:00:52 -04:00
  • d7c6950788 scientists can now buy alien tech disk kappa-sama 2019-10-21 09:30:11 -04:00
  • 211a3f2f93 bad humor kappa-sama 2019-10-21 09:29:42 -04:00
  • 2078fdae66 GOD-- Anonymous 2019-10-21 16:26:31 +03:00
  • 797d6b4795 copy paste spaghetti kappa-sama 2019-10-21 09:23:33 -04:00
  • 3077d538ec makes alien tech unlocking more consistent kappa-sama 2019-10-21 09:21:48 -04:00
  • b728050882 alien research disk kappa-sama 2019-10-21 09:15:11 -04:00
  • 901be0d04a update master kappa-sama 2019-10-21 09:02:44 -04:00
  • 32d2476112 Moves stuff from modular, updates sprites Anonymous 2019-10-21 15:24:06 +03:00
  • 296ce4fb78 suggested changes Putnam 2019-10-21 05:18:44 -07:00
  • 74ca1a9ccf concept: actually let admins do it Putnam 2019-10-21 04:56:06 -07:00
  • da7d4345b5 Added a toggle dynamic vote verb for admins. Putnam 2019-10-21 03:18:27 -07:00
  • 760522cf6a Fixing some ayy overlays and client images oddities. Ghommie 2019-10-21 11:29:43 +02:00
  • 208d3fadd6 Update emergency_bar.dmm BlackMajor 2019-10-21 22:11:27 +13:00
  • 959c4b35ce Update all them shuttles BlackMajor 2019-10-21 22:00:18 +13:00
  • 015789ac45 fixes invisible men. Ghommie 2019-10-21 10:08:48 +02:00
  • 1d4b76e10a Automatic changelog generation for PR #9547 [ci skip] CitadelStationBot 2019-10-21 03:07:29 -05:00
  • 4a28b7ea2d Merge pull request #9547 from Ghommie/Ghommie-cit250 kevinz000 2019-10-21 01:07:27 -07:00
  • 0d749e53bd Automatic changelog generation for PR #9545 [ci skip] CitadelStationBot 2019-10-21 03:07:03 -05:00
  • 814f91ee8e Merge pull request #9545 from Ghommie/Ghommie-cit248 kevinz000 2019-10-21 01:07:00 -07:00
  • 0a000f3165 Division by zero. Putnam 2019-10-21 01:05:18 -07:00
  • 43f429c58c Automatic changelog generation for PR #9537 [ci skip] CitadelStationBot 2019-10-21 03:05:15 -05:00
  • 84c5de29f7 Merge pull request #9537 from Hatterhat/patch-2 kevinz000 2019-10-21 01:05:13 -07:00
  • 2963ff6a80 Automatic changelog generation for PR #9466 [ci skip] CitadelStationBot 2019-10-21 03:04:37 -05:00
  • 9e63413911 Merge pull request #9466 from deathride58/yawnborgs kevinz000 2019-10-21 01:04:34 -07:00
  • 68cdc6c050 Automatic changelog generation for PR #9503 [ci skip] CitadelStationBot 2019-10-21 03:00:00 -05:00
  • 838575da50 Merge pull request #9503 from deathride58/tasernerf kevinz000 2019-10-21 00:59:58 -07:00
  • 95b81b5938 fix kevinz000 2019-10-21 00:55:15 -07:00
  • c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again kevinz000 2019-10-21 00:47:03 -07:00
  • 3d24d18622 Update soulstone.dm kevinz000 2019-10-20 21:27:34 -07:00
  • 142144ebad Update traumas.json MrJWhit 2019-10-20 23:31:35 -04:00
  • 6fb205c17b Update traumas.json MrJWhit 2019-10-20 22:17:50 -04:00
  • 770d95ce83 rename indifferent to balanced Putnam 2019-10-20 19:05:24 -07:00
  • d1326398dd make extended vote majority instead of plurality Putnam 2019-10-20 19:00:22 -07:00
  • 933e4c5812 grammar Putnam 2019-10-20 18:57:25 -07:00
  • 07064298b0 Dynamic voting (draft) Putnam 2019-10-20 18:54:17 -07:00
  • 4ff2c36f6e Merge branch 'master' of https://github.com/kappa-sama/Citadel-Station-13 kappa-sama 2019-10-20 21:29:26 -04:00
  • aacbb0ec8a dunk kappa-sama 2019-10-20 21:27:40 -04:00
  • 74de40a70a Digi variant added Anonymous 2019-10-21 01:04:56 +03:00
  • 6ddd1181a8 paper code is weird rn Linzolle 2019-10-20 16:53:47 -05:00
  • 6a73abfe32 Adds ASSU suit+helmet and loadout stuff Anonymous 2019-10-20 23:52:06 +03:00
  • ef35aefe4e Fixes recycler deleting all clothing for mobs found inside items (e.g. bluespace bodybags) Ghommie 2019-10-20 15:41:48 +02:00
  • 6ae9349dfe Fixes temporary transformation sting triggering heart attacks on heartless humans. Ghommie 2019-10-20 15:27:19 +02:00
  • 1e669f25a4 Fixes identity transfer not copying digi legs. Ghommie 2019-10-20 13:43:35 +02:00
  • e935a5a150 Merge pull request #13 from Citadel-Station-13/master BlackMajor 2019-10-20 23:57:26 +13:00
  • 7e9298d5ac Fixing radio emotes conflict with drunk memes. Ghommie 2019-10-20 12:21:21 +02:00
  • 12192de0cd also records consoles. Ghommie 2019-10-20 10:14:50 +02:00
  • bcd6902f06 Fixes silicons being unable to use the teleporter console from a distance. Ghommie 2019-10-20 10:08:58 +02:00
  • 964372b047 Ports "UTTERLY CATASTROPHIC pumpkin meteors will now only happen when it's catastrophic meteor wave, instead of 100% ending the round every time any kind of dust appears" Ghommie 2019-10-20 09:34:16 +02:00
  • 7e8101abc3 Changes brain damage lines MrJWhit 2019-10-20 03:30:18 -04:00
  • ec22088534 Complying with suggestions. Also stops dnr observers from getting ghost role notifications Ghommie 2019-10-20 09:15:35 +02:00
  • ca1e4b6e65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235 Ghommie 2019-10-20 07:29:32 +02:00
  • 8cd93f2085 bad. Ghommie 2019-10-20 07:28:04 +02:00
  • 656ff4d943 Lowers exotic carpet to 7k from 10k Trilbyspaceclone 2019-10-20 00:18:11 -04:00
  • 9c8356d9ea Update defib.dm kevinz000 2019-10-19 20:48:55 -07:00
  • 579f5c785c Update tgstation.dme YakumoChen 2019-10-20 03:11:29 +00:00
  • 37481b681a Delete gatling.ogg YakumoChen 2019-10-20 03:10:36 +00:00
  • e39a087dc8 remove beam YakumoChen 2019-10-20 03:09:32 +00:00
  • 6a5d1c20bd delete minigun YakumoChen 2019-10-20 03:08:20 +00:00
  • 61bc735ee7 remove gatling laser YakumoChen 2019-10-20 03:07:23 +00:00
  • 37f58798ab no crafting YakumoChen 2019-10-20 03:05:21 +00:00
  • 8a8e36ba1c Update uplink_items.dm kevinz000 2019-10-19 20:01:21 -07:00
  • c59f15a8bc Merge pull request #9529 from BlackMajor/Yeet kevinz000 2019-10-19 19:53:40 -07:00
  • 4a63789de5 Automatic changelog generation for PR #9522 [ci skip] CitadelStationBot 2019-10-19 21:52:24 -05:00
  • 659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds kevinz000 2019-10-19 19:52:21 -07:00
  • 094fdbd271 Update defib.dm kevinz000 2019-10-19 19:49:48 -07:00