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

Commit Graph

  • a379391dd3 Cleans up touch spells (#37715) AnturK 2018-05-15 07:34:37 +02:00
  • b161047f71 Merge pull request #6747 from Citadel-Station-13/upstream-merge-37851 LetterJay 2018-05-14 22:16:12 -05:00
  • da5d266aae Merge pull request #6750 from Citadel-Station-13/upstream-merge-37832 LetterJay 2018-05-14 22:12:06 -05:00
  • e32efcba92 Fixes wumborian fugu dead sprite letterjay 2018-05-14 18:55:55 -05:00
  • a7b5415a19 Fixes wumborian fugu dead sprite (#37832) YPOQ 2018-05-14 17:55:08 -06:00
  • b501677999 fuck deathride58 2018-05-14 19:48:45 -04:00
  • fd63ae9dbf Poojawa is gone, comrade deathride58 2018-05-14 19:21:11 -04:00
  • 799cc77f72 Emag QoL and addition of emag recharging deathride58 2018-05-14 19:05:38 -04:00
  • 8f1fb99e85 Send jquery asset when initializing tooltips letterjay 2018-05-14 16:51:20 -05:00
  • ef7be078b5 Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2 oranges 2018-05-15 09:50:32 +12:00
  • 3b03fa3a37 Replaces loose tech storage boards with spawners Jordan Brown 2018-05-14 16:17:57 -04:00
  • 4155b0ae4f Adds basic electronics to techwebs letterjay 2018-05-14 15:17:01 -05:00
  • 9a1dfefb97 Merge pull request #37810 from 81Denton/techweb-electronics Jordan Brown 2018-05-14 16:16:04 -04:00
  • 37e7146eb2 Fixes curator hud icon letterjay 2018-05-14 15:14:46 -05:00
  • d4428a4114 Merge pull request #37824 from DaxDupont/hud-icon Jordan Brown 2018-05-14 16:13:28 -04:00
  • 42e3d7ef87 Fix some missing icons letterjay 2018-05-14 15:13:33 -05:00
  • 7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons Jordan Brown 2018-05-14 16:13:20 -04:00
  • a98e1387c1 trait => quirk LetterJay 2018-05-14 12:31:49 -05:00
  • f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 LetterJay 2018-05-14 12:28:41 -05:00
  • 402115d3c7 Remove a duplicate pipe in MetaStation maint letterjay 2018-05-14 11:01:08 -05:00
  • 5a76b56d04 Merge pull request #37743 from AutomaticFrenzy/patch/meta-pipe Jordan Brown 2018-05-14 12:00:30 -04:00
  • 21bc6c48ef Update preferences.dm LetterJay 2018-05-14 09:53:00 -05:00
  • 5f25c8c5f7 Merge pull request #6730 from Citadel-Station-13/Donator20 LetterJay 2018-05-14 09:45:20 -05:00
  • c92a18f733 Update syndicate.dm LetterJay 2018-05-13 22:07:01 -05:00
  • e990ac3ef7 Update preferences.dm LetterJay 2018-05-13 22:06:35 -05:00
  • ccaddb17e2 Update wallets.dm CitadelStationBot 2018-05-13 20:59:02 -05:00
  • 1123df32b3 Merge pull request #6740 from Citadel-Station-13/upstream-merge-37794 CitadelStationBot 2018-05-13 20:39:21 -05:00
  • 8b5c2d3108 Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525 CitadelStationBot 2018-05-13 20:38:49 -05:00
  • ca9f309ddb Merge pull request #6738 from Citadel-Station-13/upstream-merge-37789 CitadelStationBot 2018-05-13 20:38:29 -05:00
  • 4e8b096710 Merge pull request #6737 from Citadel-Station-13/upstream-merge-37765 CitadelStationBot 2018-05-13 20:37:54 -05:00
  • 6be04e0c21 Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. letterjay 2018-05-13 19:47:01 -05:00
  • c462c16cc7 Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. (#37794) JStheguy 2018-05-13 19:45:59 -05:00
  • 0511aaa5d5 Merge pull request #6736 from Citadel-Station-13/upstream-merge-37788 CitadelStationBot 2018-05-13 18:59:05 -05:00
  • 3e090c4537 Merge pull request #6735 from Citadel-Station-13/upstream-merge-37816 CitadelStationBot 2018-05-13 18:58:40 -05:00
  • c4a46ae194 Merge pull request #6734 from Citadel-Station-13/upstream-merge-37809 CitadelStationBot 2018-05-13 18:58:10 -05:00
  • bd9482aec8 Merge pull request #6733 from Citadel-Station-13/upstream-merge-37804 CitadelStationBot 2018-05-13 18:57:25 -05:00
  • 3f4f48dd2d Merge pull request #6732 from Citadel-Station-13/upstream-merge-37805 CitadelStationBot 2018-05-13 18:57:03 -05:00
  • b30b0c3764 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component letterjay 2018-05-13 18:55:57 -05:00
  • bcd2b0a3b0 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525) Barhandar 2018-05-14 02:55:31 +03:00
  • fa16d0e0d9 Log dchat to the individual say log for a mob letterjay 2018-05-13 16:59:45 -05:00
  • 0f9f43067d Log dchat to the individual say log for a mob (#37789) oranges 2018-05-14 09:59:31 +12:00
  • 41093831c3 Adds swapping disks to the plantmanipulator letterjay 2018-05-13 16:52:27 -05:00
  • 6cee0ebac9 Adds swapping disks to the plantmanipulator (#37765) Dax Dupont 2018-05-13 23:51:53 +02:00
  • ccc0260e88 Make admin heals also max out mood letterjay 2018-05-13 13:49:10 -05:00
  • 0cac640dc8 Make admin heals also max out mood Tad Hardesty 2018-05-10 18:58:03 -07:00
  • e089a8254f Merge pull request #6725 from Citadel-Station-13/upstream-merge-37731 CitadelStationBot 2018-05-13 12:19:50 -05:00
  • 03c531e85c Fixes bike horn attack letterjay 2018-05-13 12:12:17 -05:00
  • 9d4fe1d85c Merge pull request #37816 from YPOQ/bikehornfix vuonojenmustaturska 2018-05-13 20:11:08 +03:00
  • a063e87a7d Adds security jumpskirts this time with less broken github letterjay 2018-05-13 12:11:02 -05:00
  • 998e49da06 Merge pull request #37809 from Qbopper/secskirts vuonojenmustaturska 2018-05-13 20:10:21 +03:00
  • 2d23a79f2a Fixes living robots appearing as deactivated at round end letterjay 2018-05-13 12:08:46 -05:00
  • 9bb2d02feb Fixes robots appearing as deactivated at round end (#37804) KorPhaeron 2018-05-13 12:07:48 -05:00
  • 864ccc8458 Buckled/pulled cultists cant be teleport summoned letterjay 2018-05-13 12:08:37 -05:00
  • 53ea3dcfe1 Buckled/held cultists cant be teleport summoned (#37805) KorPhaeron 2018-05-13 12:08:17 -05:00
  • ff8e5e92bf Update medical.dm CitadelStationBot 2018-05-13 12:01:55 -05:00
  • 884b8b8c4d Update smokebomb.dm LetterJay 2018-05-13 11:54:34 -05:00
  • ca86c93e70 Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406 LetterJay 2018-05-13 11:52:23 -05:00
  • 3ce9fba8bf Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589 LetterJay 2018-05-13 11:52:12 -05:00
  • 51b6ade3ef Update bombspawner.dm LetterJay 2018-05-13 10:18:12 -05:00
  • b90ca78092 Update bitfields.dm LetterJay 2018-05-13 10:17:50 -05:00
  • 37f972dc6c Update obj_flags.dm LetterJay 2018-05-13 10:17:36 -05:00
  • e1fef511cf Update flags.dm LetterJay 2018-05-13 10:17:28 -05:00
  • 440d123972 Update boozeomat.dm LetterJay 2018-05-13 10:16:04 -05:00
  • aee0160a25 Update drink_reagents.dm LetterJay 2018-05-13 10:15:57 -05:00
  • 34bf8d11aa Update drinks_recipes.dm LetterJay 2018-05-13 10:15:47 -05:00
  • 6d5e085fd0 Update alcohol_reagents.dm LetterJay 2018-05-13 10:15:26 -05:00
  • a3fb8d5ed4 Update drinks_recipes.dm LetterJay 2018-05-13 10:15:12 -05:00
  • 45e597c19a Merge pull request #6724 from Citadel-Station-13/upstream-merge-37673 LetterJay 2018-05-13 10:14:25 -05:00
  • 28947e1c89 Merge pull request #6729 from Citadel-Station-13/upstream-merge-37792 LetterJay 2018-05-13 10:14:07 -05:00
  • cf28aee1ee Merge pull request #6728 from Citadel-Station-13/upstream-merge-37464 LetterJay 2018-05-13 10:12:28 -05:00
  • 53f2fd27ca Merge pull request #6727 from Citadel-Station-13/upstream-merge-37684 LetterJay 2018-05-13 10:12:13 -05:00
  • 6230a5ee9e Merge pull request #6726 from Citadel-Station-13/upstream-merge-37737 LetterJay 2018-05-13 10:12:00 -05:00
  • 14f0f21c88 Update chat_commands.dm LetterJay 2018-05-13 09:53:04 -05:00
  • 2424ee0539 Quirk limit now only applies to positive quirks Jordan Brown 2018-05-08 13:36:41 -04:00
  • 4fcca6ea4c Update custom_items.dm LetterJay 2018-05-13 07:26:57 -05:00
  • 38628753d1 Update __donator.dm LetterJay 2018-05-13 07:26:44 -05:00
  • 1e84547584 Update custom_items.dm LetterJay 2018-05-13 07:26:15 -05:00
  • 1a1341989d labcat thingy LetterJay 2018-05-13 07:06:27 -05:00
  • c6d49a1940 Fixes defibs/backpack watertanks/gatling lasers letterjay 2018-05-13 06:13:45 -05:00
  • 23f6567872 Fixes defibs/watertanks/gatling lasers (#37792) YPOQ 2018-05-12 23:05:35 -06:00
  • 6aa48c3e4a Adds plasma rein glass to the ORM & adjusts material values on the various glass sheets. letterjay 2018-05-13 06:13:37 -05:00
  • e9ef82513c Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464) FrozenGuy5 2018-05-13 07:04:07 +01:00
  • 5973f855ce Linked teleporters now teleport to the hub instead of the power station letterjay 2018-05-13 06:13:27 -05:00
  • 5847268db3 Linked teleporters now teleport to the hub instead of the power station (#37684) XDTM 2018-05-13 08:43:30 +02:00
  • 9794304626 Merge pull request #6723 from Citadel-Station-13/upstream-merge-37801 LetterJay 2018-05-13 03:30:42 -05:00
  • 156b0529e1 Merge pull request #6722 from Citadel-Station-13/upstream-merge-37797 LetterJay 2018-05-13 03:30:26 -05:00
  • c1bbdd2f65 Merge pull request #6721 from Citadel-Station-13/upstream-merge-37752 LetterJay 2018-05-13 03:30:15 -05:00
  • 65fd97000c Merge pull request #6719 from Citadel-Station-13/upstream-merge-37707 LetterJay 2018-05-13 03:29:21 -05:00
  • 289cbbb375 Merge pull request #6718 from Citadel-Station-13/upstream-merge-37697 LetterJay 2018-05-13 03:28:57 -05:00
  • ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742 LetterJay 2018-05-13 03:28:39 -05:00
  • 80aad142a4 Merge branch 'master' into upstream-merge-37406 LetterJay 2018-05-13 03:28:37 -05:00
  • e31829a7e9 Merge pull request #6716 from Citadel-Station-13/upstream-merge-37754 LetterJay 2018-05-12 21:37:53 -05:00
  • 646403e6e1 Merge pull request #6715 from Citadel-Station-13/upstream-merge-37772 LetterJay 2018-05-12 21:37:34 -05:00
  • e164668c5e Update negative.dm LetterJay 2018-05-12 21:37:26 -05:00
  • cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558 LetterJay 2018-05-12 21:36:51 -05:00
  • cbaeed3f1e Fixes possession funtime letterjay 2018-05-12 19:26:55 -05:00
  • 1c164ff28f Fixes possession funtime (#37737) AnturK 2018-05-13 02:26:40 +02:00
  • b11e600cff Makes gauze deconstructable into cloth Mickyan 2018-05-13 02:14:30 +02:00
  • 8463204549 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers 81Denton 2018-05-13 01:53:46 +02:00
  • d3f8ad1e96 Adds wizard randomname letterjay 2018-05-12 17:54:45 -05:00