Commit Graph

  • 003eced6af [s] Removes some stationloving-related failure surface (#37727) vuonojenmustaturska 2018-05-09 00:39:59 +03:00
  • 8ef19de8a1 Track admin observer time letterjay 2018-05-08 13:38:13 -05:00
  • baee4dead5 Merge pull request #37396 from KorPhaeron/mrcitruswantsyoutoclockin Jordan Brown 2018-05-08 14:37:05 -04:00
  • ee322f9a6b Makes eye of god lava & fire proof letterjay 2018-05-08 13:21:38 -05:00
  • a4410b2aec Makes eye of god lava & fire proof (#37710) FrozenGuy5 2018-05-08 19:21:22 +01:00
  • 3d0ae0255b Merge pull request #6677 from Citadel-Station-13/upstream-merge-37745 LetterJay 2018-05-08 09:30:31 -05:00
  • c64faefec3 Removes fusion, again letterjay 2018-05-08 09:21:36 -05:00
  • eb4743e5a9 every fucking time Naksu 2018-05-08 12:56:51 +03:00
  • bc6fbeb9fe Adds (fake) ambient occlusion as a client preference deathride58 2018-05-07 22:06:44 +00:00
  • 37d65a54ff Merge pull request #6666 from Citadel-Station-13/upstream-merge-37632 deathride58 2018-05-07 19:41:21 +00:00
  • 0f3475680c Merge pull request #6674 from Citadel-Station-13/upstream-merge-37688 deathride58 2018-05-07 19:40:44 +00:00
  • 6b1bf38dc1 Geiger counters can now scan items letterjay 2018-05-07 13:51:26 -05:00
  • 9d39b2859a Geiger counters can now scan the radiation of anything! (#37688) kevinz000 2018-05-07 11:50:23 -07:00
  • a7196f0d4c Unlocks the booze locker GrayRachnid 2018-05-07 12:29:36 -04:00
  • 5d18d53566 Merge pull request #6673 from Citadel-Station-13/kevinz000-patch-2 LetterJay 2018-05-07 09:20:59 -05:00
  • 893783188f Merge pull request #6672 from Citadel-Station-13/kevinz000-patch-1 LetterJay 2018-05-07 09:20:42 -05:00
  • d85fd94570 Update photocopier.dm deathride58 2018-05-07 08:54:43 -04:00
  • a5c165fea0 Update photocopier.dm deathride58 2018-05-07 08:51:21 -04:00
  • c1755468b7 Update reverse_bear_trap.dm deathride58 2018-05-07 08:50:32 -04:00
  • be42e97101 Update helpers.dm deathride58 2018-05-07 08:47:44 -04:00
  • 5d38c10581 Merge pull request #6661 from Citadel-Station-13/upstream-merge-37712 deathride58 2018-05-07 12:46:00 +00:00
  • f15f3ffea4 Merge pull request #6662 from Citadel-Station-13/upstream-merge-37648 deathride58 2018-05-07 12:45:42 +00:00
  • e3ad766f33 Merge pull request #6664 from Citadel-Station-13/upstream-merge-37668 deathride58 2018-05-07 12:45:09 +00:00
  • 9b7518e1e2 Merge pull request #6665 from Citadel-Station-13/upstream-merge-37578 deathride58 2018-05-07 12:44:35 +00:00
  • 8bc97a10d6 Merge pull request #6667 from Citadel-Station-13/upstream-merge-37676 deathride58 2018-05-07 12:44:12 +00:00
  • 757cd6aa73 Merge pull request #6668 from Citadel-Station-13/upstream-merge-37680 deathride58 2018-05-07 12:43:47 +00:00
  • d897dd5182 Merge pull request #6669 from Citadel-Station-13/upstream-merge-37681 deathride58 2018-05-07 12:43:16 +00:00
  • ab07f4a878 Merge pull request #6670 from Citadel-Station-13/upstream-merge-37679 deathride58 2018-05-07 12:42:57 +00:00
  • 0c6c4d9c1d Merge pull request #6671 from Citadel-Station-13/upstream-merge-37468 deathride58 2018-05-07 12:42:30 +00:00
  • 79d0a12884 Allows anyone to reboot on OOM situations kevinz000 2018-05-07 03:07:09 -07:00
  • 33e6ef93f1 runtime fix kevinz000 2018-05-06 20:17:15 -07:00
  • 034bf6ce79 Update verbs.dm deathride58 2018-05-06 17:38:25 -04:00
  • 31a7783b90 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough CitadelStationBot 2018-05-06 16:38:25 -05:00
  • 06fc24e953 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough (#37468) deathride58 2018-05-06 09:22:49 +00:00
  • bf0bed7326 Fixes rhumba beat as requested by naksu CitadelStationBot 2018-05-06 16:38:16 -05:00
  • 0d7a0c0418 Merge pull request #37679 from DaxDupont/death vuonojenmustaturska 2018-05-06 15:01:07 +03:00
  • d71e920ac1 Fixes supply pod duping CitadelStationBot 2018-05-06 16:38:08 -05:00
  • 4b36831fbe Merge pull request #37681 from kevinz000/patch-499 vuonojenmustaturska 2018-05-06 15:01:39 +03:00
  • 21b46a5d7b Improves skittish code CitadelStationBot 2018-05-06 16:37:57 -05:00
  • 8e791af911 Merge pull request #37680 from kevinz000/patch-498 vuonojenmustaturska 2018-05-06 15:02:20 +03:00
  • 6a198d40b9 Prevents electric grills from mass producing lightning through exploits CitadelStationBot 2018-05-06 16:37:49 -05:00
  • ed41503127 Merge pull request #37676 from AverageJoe82/electric-grill-engine vuonojenmustaturska 2018-05-06 15:03:43 +03:00
  • 6415ecdbe9 Shows assemblies some love. ♥ ShizCalev 2018-05-06 08:05:37 -04:00
  • af5e898dab Fix the top menus in the skin not working Tad Hardesty 2018-05-06 05:08:01 -07:00
  • af5f1ec040 Axes the robotic fabricator (not the exofab) CitadelStationBot 2018-05-06 16:37:22 -05:00
  • ba0dc700df Axes the robotic fabricator (not the exofab) (#37668) 81Denton 2018-05-06 14:20:13 +02:00
  • e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code oranges 2018-05-07 00:21:35 +12:00
  • 10d6681463 Moves removing the cell to screwdriver_act for APCs CitadelStationBot 2018-05-06 16:37:04 -05:00
  • 81deaaca6d Merge pull request #37648 from vuonojenmustaturska/apcunsmash Jordan Brown 2018-05-06 12:44:18 -04:00
  • 0393fa91ec Fixes a radiation runtime related to going off the map edge CitadelStationBot 2018-05-06 16:36:55 -05:00
  • 56e9fcd29c Merge pull request #37712 from ninjanomnom/dont-step-off-the-edge Jordan Brown 2018-05-06 16:11:36 -04:00
  • e22259a77d mapmerger GrayRachnid 2018-05-06 16:37:44 -04:00
  • 41ce1b1e5b Now ready for all your ERP needs. GrayRachnid 2018-05-06 16:20:49 -04:00
  • 50f8779fc0 Merge branch 'master' into upstream-merge-37486 deathride58 2018-05-06 07:15:48 +00:00
  • 083fa00a14 Update tgstation.dme deathride58 2018-05-06 03:12:14 -04:00
  • 474d980a9b Update _ears.dm deathride58 2018-05-06 03:11:29 -04:00
  • e0e950e9ff Update spellbook.dm deathride58 2018-05-06 03:10:54 -04:00
  • d4d052bae2 Update radio.dm deathride58 2018-05-06 03:10:20 -04:00
  • 725634c9ea Update material_container.dm deathride58 2018-05-06 03:09:47 -04:00
  • 309b992371 Update bitfields.dm deathride58 2018-05-06 03:09:17 -04:00
  • b7b7112382 Update flags.dm deathride58 2018-05-06 03:08:53 -04:00
  • e8e0d8f77f Update components.dm deathride58 2018-05-06 03:08:14 -04:00
  • 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 deathride58 2018-05-06 07:07:02 +00:00
  • 11c1e8fbf7 Merge pull request #6632 from Citadel-Station-13/upstream-merge-37620 deathride58 2018-05-06 07:03:37 +00:00
  • 50eae25c92 Merge pull request #6656 from Citadel-Station-13/upstream-merge-37654 deathride58 2018-05-06 07:02:39 +00:00
  • 16ad31516c Merge pull request #6658 from Citadel-Station-13/upstream-merge-37647 deathride58 2018-05-06 07:02:17 +00:00
  • e6b04e5f24 Adds desc to vendor circuit board CitadelStationBot 2018-05-05 17:54:55 -05:00
  • d44b1b9b2e Adds desc to vendor circuit board (#37647) 81Denton 2018-05-06 00:54:32 +02:00
  • 9659062dc2 Morphs can no longer eat or attack while disguised CitadelStationBot 2018-05-05 14:54:07 -05:00
  • 6669328929 alt morph nerf (#37654) kevinz000 2018-05-05 12:53:56 -07:00
  • bf66827936 Merge pull request #6652 from Citadel-Station-13/upstream-merge-37641 LetterJay 2018-05-05 09:44:39 -05:00
  • f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 LetterJay 2018-05-05 09:40:11 -05:00
  • 4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447 LetterJay 2018-05-05 09:38:11 -05:00
  • 889716fbd6 Merge pull request #6645 from Citadel-Station-13/upstream-merge-37640 LetterJay 2018-05-05 09:35:31 -05:00
  • bdd613fa05 Merge pull request #6650 from Citadel-Station-13/upstream-merge-37659 CitadelStationBot 2018-05-05 09:35:01 -05:00
  • e1bdd0d21c Merge pull request #6646 from Citadel-Station-13/upstream-merge-37649 CitadelStationBot 2018-05-05 09:32:34 -05:00
  • 6468c7b809 Merge pull request #6653 from Citadel-Station-13/upstream-merge-37651 CitadelStationBot 2018-05-05 09:30:11 -05:00
  • eb60353808 Merge pull request #6651 from Citadel-Station-13/donator1 deathride58 2018-05-05 14:17:08 +00:00
  • 08758e72e7 Adds missing donksoft vendor board to illegal tech node CitadelStationBot 2018-05-05 08:11:05 -05:00
  • 7104f28ed8 Merge pull request #37651 from 81Denton/donksoft-board Jordan Brown 2018-05-05 09:09:36 -04:00
  • a5237eb1ee Use bundled rather than remote jquery in tooltips CitadelStationBot 2018-05-05 08:10:54 -05:00
  • 6a940a7149 Merge pull request #37641 from AutomaticFrenzy/patch/tooltip-jquery Jordan Brown 2018-05-05 09:10:06 -04:00
  • 1fbc06234f Update __donator.dm LetterJay 2018-05-05 07:24:37 -05:00
  • bbebcc85e7 Update __donator.dm LetterJay 2018-05-05 07:23:33 -05:00
  • bf42b89677 Merge pull request #6634 from Citadel-Station-13/upstream-merge-37625 LetterJay 2018-05-04 23:22:36 -05:00
  • 65cd679e86 Merge pull request #6644 from Citadel-Station-13/upstream-merge-37657 LetterJay 2018-05-04 23:20:00 -05:00
  • 24776123f0 Merge pull request #6637 from Citadel-Station-13/upstream-merge-37636 LetterJay 2018-05-04 22:59:57 -05:00
  • db6f0727d2 Merge pull request #6638 from Citadel-Station-13/upstream-merge-37451 LetterJay 2018-05-04 22:58:40 -05:00
  • 908394f1e2 Merge pull request #6640 from Citadel-Station-13/upstream-merge-37432 LetterJay 2018-05-04 22:57:32 -05:00
  • 0c5912c834 Merge pull request #6635 from Citadel-Station-13/upstream-merge-37626 LetterJay 2018-05-04 22:54:00 -05:00
  • 4f3f344369 Merge pull request #6643 from Citadel-Station-13/upstream-merge-37637 LetterJay 2018-05-04 22:52:32 -05:00
  • 58973fac50 Merge pull request #6629 from Citadel-Station-13/upstream-merge-37639 LetterJay 2018-05-04 22:52:13 -05:00
  • 354371fcfc Merge pull request #6631 from Citadel-Station-13/upstream-merge-37621 LetterJay 2018-05-04 22:51:58 -05:00
  • 7bab794c6b Merge pull request #6627 from Citadel-Station-13/upstream-merge-37455 CitadelStationBot 2018-05-04 22:47:13 -05:00
  • b38083fa81 Crayons no longer use charge when used on a canvas CitadelStationBot 2018-05-04 22:27:00 -05:00
  • d5be66cf9a Crayons no longer use charge when used on a canvas oranges 2018-05-04 02:30:24 +00:00
  • 6a473380ac Fixes runtimestation RnD machinery, adds circ printer+analyzer CitadelStationBot 2018-05-04 11:17:40 -05:00
  • 5fae4a6c90 Merge pull request #37649 from 81Denton/watch-me-mash-my-keyboard-fwgiupghebipuernbvepw9vb85344355v Jordan Brown 2018-05-04 12:17:30 -04:00
  • 95e5464fff Lengthen commit hashes in Show Server Revision CitadelStationBot 2018-05-04 08:42:45 -05:00
  • 1aa0091ec1 Merge pull request #37640 from AutomaticFrenzy/patch/server-revision Jordan Brown 2018-05-04 09:42:02 -04:00