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

Commit Graph

  • 85186a9714 Porting updates related to material datums. (#12317) Ghom 2020-05-25 23:21:00 +02:00
  • e11908a357 Oranges and Paperwork can be picked up again. (#12351) Ghom 2020-05-25 23:20:10 +02:00
  • d7a37b8a6c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit739 Ghommie 2020-05-25 22:14:52 +02:00
  • 900aae1c97 unrelated. Ghommie 2020-05-25 16:28:45 +02:00
  • 841bb86181 Fixing blindness stuff. Ghommie 2020-05-25 16:10:25 +02:00
  • d04d6ae9eb WIP Ghommie 2020-05-25 15:06:31 +02:00
  • 8fd8b6a0bb Update tactical.dm Ghom 2020-05-25 11:16:51 +02:00
  • be02287dca category + compile kevinz000 2020-05-24 15:21:52 -07:00
  • 79f7ba9ac5 keybindings kevinz000 2020-05-24 15:10:11 -07:00
  • f0ae864454 dme order kevinz000 2020-05-24 15:03:48 -07:00
  • e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework kevinz000 2020-05-24 15:03:06 -07:00
  • 95c6c7345c implementations kevinz000 2020-05-24 14:56:01 -07:00
  • ad57647e64 Merge pull request #12173 from kevinz000/projectiles_2 Lin 2020-05-24 21:21:41 +00:00
  • a41a06bc4b Fixing beam rifles lacking pin and pacifism checks. (#12349) Ghom 2020-05-24 22:29:45 +02:00
  • 07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) Ghom 2020-05-24 22:21:14 +02:00
  • 0a6b755eff Apotechary chem dispenser nerf. (#12292) Ghom 2020-05-24 22:20:32 +02:00
  • c8cd97351d Makes gun weight akimbo restrictions work the other way around. (#12297) Ghom 2020-05-24 22:19:28 +02:00
  • 292f1afa3c Quick bandaid for table telescreens/buttons. (#12339) Ghom 2020-05-24 22:13:20 +02:00
  • 83709de1a2 Removes Krihelimeter, and updates README.md (#12341) Letter N 2020-05-25 04:12:59 +08:00
  • 9fef1b62e1 Removing duplicate total item attack force modifiers. (#12342) Ghom 2020-05-24 22:12:44 +02:00
  • 293e3fea28 Removing that maint dorm carbin beside the disposal room, and excess wardrobe. (#12308) Ghom 2020-05-24 22:12:18 +02:00
  • da772b9cb7 Adds the "Space Diner" space ruin. (#12337) EmeraldSundisk 2020-05-24 13:11:49 -07:00
  • 32135cc008 Makes bloodsuckers unguttable and undecappable (#12335) Arturlang 2020-05-24 23:08:18 +03:00
  • 4fcb0451a1 Makes bloodsuckers unable to suck through thick clothing (#12334) Arturlang 2020-05-24 23:08:06 +03:00
  • 6756b564b7 Removing that one keg. (#12333) Ghom 2020-05-24 22:07:53 +02:00
  • ba3151bf1e Pills and pill bottles are now volumetric. (#12332) Ghom 2020-05-24 22:07:35 +02:00
  • ce1f1bdf5e Turning a few components into elements. (#12325) Ghom 2020-05-24 22:06:27 +02:00
  • 02f467654e Adds a few more usefull tips (#12266) Trilbyspaceclone 2020-05-24 16:05:47 -04:00
  • ab5d65a454 Porting the BEPIS research machinery. (#12277) Ghom 2020-05-24 22:05:15 +02:00
  • 78df30d8e0 Merge pull request #41 from Citadel-Station-13/master EmeraldSundisk 2020-05-23 19:00:59 -07:00
  • a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 Ghommie 2020-05-24 04:00:51 +02:00
  • e9068f05eb let's play the optimization game featuring lighting (#12310) kevinz000 2020-05-23 13:47:42 -07:00
  • a6d7170d5b Merge pull request #12313 from kevinz000/click_logs Lin 2020-05-23 20:21:45 +00:00
  • 807a5c7d1e Fix stuff that no one care about (#12340) Sonic121x 2020-05-23 20:48:39 +08:00
  • c857dc9cd1 Merge pull request #12321 from Ghommie/Ghommie-cit779 Lin 2020-05-22 21:36:00 +00:00
  • cc427f18ec Reset travis Artur 2020-05-23 00:26:32 +03:00
  • ffb2678eb0 Lets hope this fixes it Artur 2020-05-22 22:52:41 +03:00
  • d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 Detective Google 2020-05-22 13:52:56 -05:00
  • ddc9118b46 adds disposals courtesy of friend Detective Google 2020-05-22 13:52:44 -05:00
  • 00db2cdc64 Tempoary removal.. Artur 2020-05-22 19:33:31 +03:00
  • 6a0426a094 Undefined procs... Artur 2020-05-22 19:32:57 +03:00
  • 04dcd6a02c Dos2unix Artur 2020-05-22 19:20:59 +03:00
  • 2c670055b4 Forgot this Artur 2020-05-22 17:31:45 +03:00
  • c5d86e9722 Removing HTML... Artur 2020-05-22 17:29:20 +03:00
  • d5b891552f Updates clockworkslab Artur 2020-05-22 17:15:57 +03:00
  • ff57c5a294 Fixes APC and makes sleeper work again Artur 2020-05-22 16:44:21 +03:00
  • 22797eb47d Fixing interfaces... Artur 2020-05-22 16:34:57 +03:00
  • 098b6642ae Merge remote-tracking branch 'upstream/master' into TGUI-3.0 Artur 2020-05-22 16:19:17 +03:00
  • bcd911070a Fixing dwarfism. (#12331) Ghom 2020-05-21 21:38:42 +02:00
  • 4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat Lin 2020-05-21 19:26:31 +00:00
  • 8dd4fd4e66 Actually fixes mesmerize (#12330) Arturlang 2020-05-21 22:26:05 +03:00
  • 8ca1bcd237 Merge pull request #12315 from DeltaFire15/styp-silsulf-OD-fix Lin 2020-05-21 19:22:28 +00:00
  • 9d04b0835b Conflicts galore Artur 2020-05-21 21:08:12 +03:00
  • 8a0ed38a58 Fixing a few issues with the nutrition adjustment proc and the circuit printer. (#12320) Ghom 2020-05-21 19:10:59 +02:00
  • e3922400a1 swift item action skills fix. (#12324) Ghom 2020-05-21 19:09:54 +02:00
  • 3430f0130d little canvas fix. (#12328) Ghom 2020-05-21 19:07:28 +02:00
  • 6192a0646c Fucks with the clockwork slab UI Artur 2020-05-21 18:45:19 +03:00
  • 24a05bb03a Empty commit to redo the travis check DeltaFire 2020-05-21 17:13:12 +02:00
  • e792600115 Update movement.dm (#12327) kevinz000 2020-05-21 06:00:21 -07:00
  • 0fbbd51418 Add the pie-cannon sound to the circuit version of the pneumatic cannon (#12319) Funce 2020-05-22 00:55:25 +12:00
  • 0fc2d5d3b7 Merge pull request #12326 from kevinz000/rust_g Putnam3145 2020-05-20 23:28:32 -07:00
  • f35263f13e no kevinz000 2020-05-20 23:19:13 -07:00
  • ab2efa0485 rustg fix kevinz000 2020-05-20 23:18:37 -07:00
  • fac705669a rustg dm kevinz000 2020-05-20 23:14:36 -07:00
  • fcb2b58664 Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112) Trilbyspaceclone 2020-05-20 22:03:20 -04:00
  • 861734d119 Updates icebox atmos to box atmos (#12299) MrJWhit 2020-05-20 21:47:54 -04:00
  • b43a2861b6 Update watertank.dm (#12283) Trilbyspaceclone 2020-05-20 21:47:41 -04:00
  • 7337993d8e Lavaland Gear Tweaks - Armor balancing (#12270) Trilbyspaceclone 2020-05-20 21:47:30 -04:00
  • 3ac61c0704 Porting tg painting code. (#12305) Ghom 2020-05-21 03:45:36 +02:00
  • 6696560656 slendermen fix. (#12303) Ghom 2020-05-21 03:43:14 +02:00
  • 7f38e0714b Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302) Ghom 2020-05-21 03:42:58 +02:00
  • a7053a978f Ports a tail from the RP server (#12301) Kraseo 2020-05-21 03:37:38 +02:00
  • 22d2200fc1 aaa Ghommie 2020-05-21 03:20:22 +02:00
  • 50171db408 Makes fermichem properly logged in the reagents logs, tiny astrogen fix. Ghommie 2020-05-21 03:04:26 +02:00
  • dfcbee5045 Update pandemic.dm (#12318) kevinz000 2020-05-20 17:34:09 -07:00
  • b57e1c1e93 Rebindable Hotkeys (#12138) kevinz000 2020-05-20 14:40:20 -07:00
  • f73f5211f9 fixed converters.dm (#12316) ArbyTheDragon 2020-05-20 16:38:15 -05:00
  • 761d014f6f fixes silver sulf and styptic OD effects DeltaFire 2020-05-20 18:52:20 +02:00
  • 55891e8d50 fixes ninja adrenals not being able to be activated when stamcritted because that is incredibly bad (#12312) zeroisthebiggay 2020-05-20 12:07:29 -04:00
  • b25a20e3f9 typo kevinz000 2020-05-20 07:49:55 -07:00
  • 89a14a82f0 ok kevinz000 2020-05-20 07:46:58 -07:00
  • ed90c59d65 Removal of """silk""" (#12221) Ghom 2020-05-20 08:43:46 +02:00
  • bbbb4c611d Fixes asset cache Artur 2020-05-19 21:13:00 +03:00
  • ee66a2d396 Ports https://github.com/tgstation/tgstation/pull/50991/ Artur 2020-05-19 20:50:22 +03:00
  • a16f2df71c Cleans up after oracleUI Artur 2020-05-19 20:34:45 +03:00
  • e00cafd7e4 Kills oracleUI Artur 2020-05-19 19:03:45 +03:00
  • c73295279e Fixes asset cache client Artur 2020-05-19 19:02:46 +03:00
  • c0881fb222 Ports https://github.com/tgstation/tgstation/pull/50759 Artur 2020-05-19 18:43:41 +03:00
  • fc921289d6 Merge pull request #12149 from kevinz000/DMAPI5 BlackMajor 2020-05-19 22:32:17 +12:00
  • fc77954be3 Merge pull request #12290 from Ghommie/Ghommie-cit767 Lin 2020-05-19 05:15:12 +00:00
  • 494770017c Merge pull request #39 from Citadel-Station-13/master EmeraldSundisk 2020-05-18 21:42:59 -07:00
  • 4c3dac467f Mining inquisitor/berserker hardsuit nerf, slight drake armor buff. (#12289) Ghom 2020-05-19 01:55:40 +02:00
  • 8bc066877f Merge pull request #2 from SiliconMain/patch-4 kevinz000 2020-05-18 16:46:33 -07:00
  • 30f296b2c7 Clockies now can summon shields to bash nonbelievers into orbit. (#12252) DeltaFire15 2020-05-18 14:47:44 +02:00
  • 1f4340103e Update suit.dm SiliconMain 2020-05-18 07:06:21 -05:00
  • f624ce5fd4 Update species.dm (#12295) Ghom 2020-05-18 13:49:42 +02:00
  • 08392c7ae7 Fixing horns/wings colors not being loaded, and another couple misc issues. (#12287) Ghom 2020-05-18 13:47:19 +02:00
  • 9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268) Ghom 2020-05-18 13:46:57 +02:00
  • 75dec8ce2c Ports "Removes the absolute istype fest from footsteps" (#12259) Ghom 2020-05-18 13:46:22 +02:00
  • 20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) Ghom 2020-05-18 13:45:50 +02:00