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

Commit Graph

  • 63aa6eeee6 Update lava.dm LetterJay 2018-05-22 07:58:44 -05:00
  • e7a3f6e128 Update reverse_bear_trap.dm LetterJay 2018-05-22 07:56:52 -05:00
  • a659e3c0b3 Update photocopier.dm LetterJay 2018-05-22 07:56:25 -05:00
  • 664f2ac150 Merge branch 'master' into upstream-merge-37623 LetterJay 2018-05-22 07:23:41 -05:00
  • 5f27ac30c7 Merge branch 'master' into upstream-merge-37582 LetterJay 2018-05-22 07:22:42 -05:00
  • 6a575f19d1 Merge branch 'master' into upstream-merge-37597 LetterJay 2018-05-22 07:21:53 -05:00
  • 467819beba Update flags.dm LetterJay 2018-05-22 07:20:27 -05:00
  • c1aab03bb5 Merge branch 'master' into upstream-merge-37530 LetterJay 2018-05-22 07:19:06 -05:00
  • b3e5513185 Automatic changelog generation for PR #6558 [ci skip] CitadelStationBot 2018-05-22 07:18:36 -05:00
  • adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 LetterJay 2018-05-22 07:18:34 -05:00
  • 6bbab2ab06 Automatic changelog generation for PR #6555 [ci skip] CitadelStationBot 2018-05-22 07:17:44 -05:00
  • 01fc8cf128 Merge pull request #6555 from Citadel-Station-13/upstream-merge-37293 LetterJay 2018-05-22 07:17:41 -05:00
  • 9afa6b9290 Merge pull request #6779 from Citadel-Station-13/upstream-merge-37883 deathride58 2018-05-22 02:30:01 +00:00
  • 2d8002ca36 Merge pull request #6826 from Citadel-Station-13/upstream-merge-37935 deathride58 2018-05-22 02:29:38 +00:00
  • d0297e326d Merge pull request #6827 from Citadel-Station-13/upstream-merge-37957 deathride58 2018-05-22 02:29:19 +00:00
  • ce0dac200b Merge pull request #6828 from Citadel-Station-13/upstream-merge-37965 deathride58 2018-05-22 02:28:38 +00:00
  • c150988997 Automatic changelog generation for PR #6829 [ci skip] CitadelStationBot 2018-05-21 21:28:23 -05:00
  • 2c73811b1f Merge pull request #6829 from Citadel-Station-13/upstream-merge-37955 deathride58 2018-05-22 02:28:21 +00:00
  • da36ad5f41 Automatic changelog generation for PR #6830 [ci skip] CitadelStationBot 2018-05-21 21:27:57 -05:00
  • fd4e6b880a Merge pull request #6830 from Citadel-Station-13/upstream-merge-37943 deathride58 2018-05-22 02:27:55 +00:00
  • f07710c570 Automatic changelog generation for PR #6831 [ci skip] CitadelStationBot 2018-05-21 21:27:41 -05:00
  • 32c63c2e70 Merge pull request #6831 from Citadel-Station-13/upstream-merge-37961 deathride58 2018-05-22 02:27:39 +00:00
  • 29a6589336 Automatic changelog generation for PR #6832 [ci skip] CitadelStationBot 2018-05-21 21:27:23 -05:00
  • 1e7839342f Merge pull request #6832 from Citadel-Station-13/upstream-merge-37944 deathride58 2018-05-22 02:27:21 +00:00
  • c376ef6268 Merge pull request #6833 from Citadel-Station-13/upstream-merge-37956 deathride58 2018-05-22 02:27:01 +00:00
  • efc5828284 Automatic changelog generation for PR #6834 [ci skip] CitadelStationBot 2018-05-21 21:26:41 -05:00
  • 3d9af22c4c Merge pull request #6834 from Citadel-Station-13/upstream-merge-37906 deathride58 2018-05-22 02:26:39 +00:00
  • 20109138c0 Merge pull request #6836 from Citadel-Station-13/upstream-merge-37934 deathride58 2018-05-22 02:26:18 +00:00
  • 2f5ea131a3 Merge pull request #6837 from Citadel-Station-13/upstream-merge-37972 deathride58 2018-05-22 02:25:56 +00:00
  • 56dbd7c980 Merge pull request #6838 from Citadel-Station-13/upstream-merge-37974 deathride58 2018-05-22 02:25:34 +00:00
  • a8d5c7d800 Automatic changelog generation for PR #6839 [ci skip] CitadelStationBot 2018-05-21 21:25:15 -05:00
  • f0a9344c8e Merge pull request #6839 from Citadel-Station-13/upstream-merge-37900 deathride58 2018-05-22 02:25:13 +00:00
  • c654859eb0 Automatic changelog generation for PR #6840 [ci skip] CitadelStationBot 2018-05-21 21:24:59 -05:00
  • 5b15984c0e Merge pull request #6840 from Citadel-Station-13/upstream-merge-37945 deathride58 2018-05-22 02:24:57 +00:00
  • a6f7a31b10 Automatic changelog generation for PR #6841 [ci skip] CitadelStationBot 2018-05-21 21:24:33 -05:00
  • d676e1ecf9 Merge pull request #6841 from Citadel-Station-13/upstream-merge-37973 deathride58 2018-05-22 02:24:31 +00:00
  • 7fbe369b55 Fix wormhole jaunter grammar letterjay 2018-05-21 17:03:47 -05:00
  • 46f90d8fae Merge pull request #37973 from AutomaticFrenzy/patch/your-the-jaunter Jordan Brown 2018-05-21 18:03:09 -04:00
  • 9d537c24f2 Fix construction behavior of hydroponics trays letterjay 2018-05-21 16:58:31 -05:00
  • 3fd74027c1 Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays oranges 2018-05-22 09:57:25 +12:00
  • 7e087663c2 Adds OOC verb to show the last round end report you've viewed letterjay 2018-05-21 16:48:08 -05:00
  • 96106ff2e8 Adds OOC verb to show the last round end report you've viewed (#37900) Jordan Brown 2018-05-21 17:47:49 -04:00
  • 2facdf7937 Fix glowshrooms missing their icon in the editor letterjay 2018-05-21 16:44:53 -05:00
  • 638c2eb81d Merge pull request #37974 from AutomaticFrenzy/patch/glowshroom-icon Jordan Brown 2018-05-21 17:44:09 -04:00
  • 88e63afdb5 Fixes an oops in circuit printer description check letterjay 2018-05-21 16:43:42 -05:00
  • b7fd3a37e2 Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1 Jordan Brown 2018-05-21 17:43:27 -04:00
  • 1810619474 Migrate goonchat pings to a subsystem letterjay 2018-05-21 16:40:29 -05:00
  • c27d97a6e5 Merge pull request #37934 from AutomaticFrenzy/patch/ssping oranges 2018-05-22 09:39:12 +12:00
  • ca177519da Removes firing-pins box in RD's locker letterjay 2018-05-21 16:36:04 -05:00
  • 85ef262082 Removes firing-pins box in RD's locker (#37906) Wilchenx 2018-05-21 23:35:07 +02:00
  • efe4a45f81 Cleans up duplicate get_area's in c.grenade priming letterjay 2018-05-21 16:35:54 -05:00
  • 0d08eca330 Merge pull request #37956 from ShizCalev/chem-grenade-cleanup Jordan Brown 2018-05-21 17:35:46 -04:00
  • da8dd0adf5 Remove second copy of jQuery used only by IRV polls letterjay 2018-05-21 16:33:42 -05:00
  • ec14a7c7ef Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery Jordan Brown 2018-05-21 17:33:32 -04:00
  • 71a94ae781 Enable admin AI interaction for firelocks letterjay 2018-05-21 16:32:32 -05:00
  • a3c3052f25 Merge pull request #37961 from AutomaticFrenzy/patch/ai-firelock Jordan Brown 2018-05-21 17:31:49 -04:00
  • 7d8a3135a6 Fix mindswap forcibly enabling ambient occlusion letterjay 2018-05-21 16:31:21 -05:00
  • 1766134062 Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter Jordan Brown 2018-05-21 17:31:02 -04:00
  • 3957f14fa4 Keep only the most recent airlock autoclose timer letterjay 2018-05-21 16:29:09 -05:00
  • 9095d48215 Merge pull request #37955 from AutomaticFrenzy/patch/airlock-autoclose Jordan Brown 2018-05-21 17:28:15 -04:00
  • 0a4f2f501e Fixes fire_act working on deleted things. letterjay 2018-05-21 16:27:55 -05:00
  • 60b3384695 Merge pull request #37965 from AnturK/whatthecommentsays Jordan Brown 2018-05-21 17:27:15 -04:00
  • 32d0c44dc0 Fixes defibillator runtime letterjay 2018-05-21 14:54:47 -05:00
  • 5964fa0712 Fixes defibillator runtime ShizCalev 2018-05-20 18:28:11 -04:00
  • be6fd4f0ca Update vg_hats.dm LetterJay 2018-05-21 12:33:14 -05:00
  • f0c99c5f9c Update life.dm LetterJay 2018-05-21 12:32:44 -05:00
  • 359d31238d Merge branch 'master' into upstream-merge-37486 LetterJay 2018-05-21 11:59:57 -05:00
  • 54f82cc745 Fix formatting when emagging an R&D console letterjay 2018-05-21 11:25:48 -05:00
  • 6167423c85 Fix formatting when emagging an R&D console Tad Hardesty 2018-05-19 14:06:28 -07:00
  • 6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 LetterJay 2018-05-21 11:23:02 -05:00
  • 931a950adb Merge branch 'master' into upstream-merge-37486 LetterJay 2018-05-21 08:59:32 -05:00
  • 39365437f5 Merge branch 'master' into upstream-merge-37293 LetterJay 2018-05-21 08:53:17 -05:00
  • 6060df5b92 Merge pull request #6554 from Citadel-Station-13/upstream-merge-37267 LetterJay 2018-05-21 08:42:21 -05:00
  • d9cc361b81 Merge branch 'upstream-merge-37476' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-37476 LetterJay 2018-05-21 08:38:33 -05:00
  • e415aac87a missed one LetterJay 2018-05-21 08:38:09 -05:00
  • e57cf81636 Merge branch 'master' into upstream-merge-37582 LetterJay 2018-05-21 08:35:21 -05:00
  • 02887eb721 Automatic changelog generation for PR #6812 [ci skip] CitadelStationBot 2018-05-21 08:30:21 -05:00
  • 32cf8e6eb2 Merge pull request #6812 from Citadel-Station-13/upstream-merge-37928 LetterJay 2018-05-21 08:30:19 -05:00
  • 50a8bc3de8 Automatic changelog generation for PR #6815 [ci skip] CitadelStationBot 2018-05-21 08:30:07 -05:00
  • 35ccd1aafe Merge pull request #6815 from Citadel-Station-13/upstream-merge-37905 LetterJay 2018-05-21 08:30:05 -05:00
  • 0529a3e525 Automatic changelog generation for PR #6825 [ci skip] CitadelStationBot 2018-05-21 08:29:49 -05:00
  • 207c022f87 Merge pull request #6825 from Citadel-Station-13/upstream-merge-37954 LetterJay 2018-05-21 08:29:46 -05:00
  • add7e32628 Automatic changelog generation for PR #6823 [ci skip] CitadelStationBot 2018-05-21 08:29:33 -05:00
  • 0b26ea7b5e Merge pull request #6823 from Citadel-Station-13/upstream-merge-37925 LetterJay 2018-05-21 08:29:31 -05:00
  • cb5ea0aab7 Merge pull request #6822 from Citadel-Station-13/upstream-merge-37600 LetterJay 2018-05-21 08:29:16 -05:00
  • 601fcf1384 Automatic changelog generation for PR #6821 [ci skip] CitadelStationBot 2018-05-21 08:29:03 -05:00
  • 52bd7904be Merge pull request #6821 from Citadel-Station-13/upstream-merge-37927 LetterJay 2018-05-21 08:29:00 -05:00
  • 0e09e1d683 Automatic changelog generation for PR #6820 [ci skip] CitadelStationBot 2018-05-21 08:28:49 -05:00
  • 388c17664f Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938 LetterJay 2018-05-21 08:28:47 -05:00
  • 1afdd03d78 Merge pull request #6819 from Citadel-Station-13/upstream-merge-37937 LetterJay 2018-05-21 08:28:30 -05:00
  • b3eab0058a Automatic changelog generation for PR #6817 [ci skip] CitadelStationBot 2018-05-21 08:28:15 -05:00
  • 1896bc86e8 Merge pull request #6817 from Citadel-Station-13/upstream-merge-37633 LetterJay 2018-05-21 08:28:13 -05:00
  • 9121d4968e Merge pull request #6789 from Citadel-Station-13/upstream-merge-37891 LetterJay 2018-05-21 08:27:57 -05:00
  • 54656fd082 Update tgstation.dme kevinz000 2018-05-21 03:41:07 -07:00
  • 8c7fbe2523 Refresh mob views when atoms enter/exit storage letterjay 2018-05-21 04:46:21 -05:00
  • 9b4b9b4f34 Refresh mob views when atoms enter/exit storage (#37954) Tad Hardesty 2018-05-21 02:45:52 -07:00
  • 4582ed8c11 Update admin_verbs.dm kevinz000 2018-05-21 02:34:03 -07:00
  • db415cb507 Update dice.dm kevinz000 2018-05-21 02:32:14 -07:00
  • 2fd45f4eeb Create dice.dm kevinz000 2018-05-21 02:31:14 -07:00
  • 3241c9575d Removes skewium from saferChems letterjay 2018-05-21 03:57:06 -05:00