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

Commit Graph

  • aec96bbbbe Merge pull request #2906 from deathride58/ashwalkerkinkmates LetterJay 2017-10-03 15:23:07 -04:00
  • 49a354d752 Automatic changelog generation for PR #2922 [ci skip] CitadelStationBot 2017-10-03 14:22:46 -05:00
  • 05f5ee73ce Merge pull request #2922 from Daniel0Mclovin/Kris's-Garbage LetterJay 2017-10-03 15:22:43 -04:00
  • fd5acc5573 Organ initialization cleanup AnturK 2017-10-01 13:32:02 +02:00
  • ba99e3845a Added normal collar functionality. Kevak 2017-10-03 12:12:52 -07:00
  • 06fe1e8da6 Automatic changelog generation for PR #3092 [ci skip] CitadelStationBot 2017-10-03 11:32:21 -05:00
  • 159924f42b Merge pull request #3092 from Citadel-Station-13/upstream-merge-31210 LetterJay 2017-10-03 12:32:19 -04:00
  • 0b7ef4d90f Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233 LetterJay 2017-10-03 12:31:59 -04:00
  • 4637fcb75c Merge pull request #3090 from Citadel-Station-13/upstream-merge-31231 LetterJay 2017-10-03 12:30:37 -04:00
  • ca61069ecb Automatic changelog generation for PR #3089 [ci skip] CitadelStationBot 2017-10-03 11:30:04 -05:00
  • c596539fbf Merge pull request #3089 from Citadel-Station-13/upstream-merge-31219 LetterJay 2017-10-03 12:30:02 -04:00
  • 5fdeb55876 Automatic changelog generation for PR #3088 [ci skip] CitadelStationBot 2017-10-03 11:29:49 -05:00
  • 660e9fea9c Merge pull request #3088 from Citadel-Station-13/upstream-merge-30846 LetterJay 2017-10-03 12:29:46 -04:00
  • 887e6799e0 Merge pull request #3087 from Citadel-Station-13/upstream-merge-31217 LetterJay 2017-10-03 12:29:30 -04:00
  • 01a56ddcb9 Automatic changelog generation for PR #3086 [ci skip] CitadelStationBot 2017-10-03 11:29:15 -05:00
  • 67f54c0b11 Merge pull request #3086 from Michiyamenotehifunana/soporificdescriptionfix LetterJay 2017-10-03 12:29:13 -04:00
  • f4ce4a3a27 Shock Collars Are Now A Thing. Kevak 2017-10-03 08:03:03 -07:00
  • 993896df51 Silicons can no longer take brain damage CitadelStationBot 2017-10-03 06:20:51 -05:00
  • 0888d3944e Merge pull request #31210 from MoreRobustThanYou/patch-7 Leo 2017-10-03 08:19:48 -03:00
  • fd6c202178 Fixes floating bullet holes CitadelStationBot 2017-10-03 06:18:41 -05:00
  • a64e2fd25e Merge pull request #31233 from kevinz000/patch-306 Leo 2017-10-03 08:18:02 -03:00
  • 025037351a Fixes alt-click runtime CitadelStationBot 2017-10-03 06:18:33 -05:00
  • cdfc5ffc0c Merge pull request #31231 from AnturK/longenoughiruntimelogtopissmeoff Leo 2017-10-03 08:18:16 -03:00
  • 37afe16a0d Makes antimatter code less shit CitadelStationBot 2017-10-03 04:40:47 -05:00
  • f870b66b31 Makes antimatter code less shit (#31219) MoreRobustThanYou 2017-10-03 05:39:41 -04:00
  • c13a7539c9 Fixes/tweaks wormholes event and portals CitadelStationBot 2017-10-03 04:37:36 -05:00
  • 3b3b45c03c Fixes/tweaks wormholes event and portals (#30846) kevinz000 2017-10-03 02:37:16 -07:00
  • 0743b4c5ca makes /turf/Enter() faster, and also makes CollidedWith async CitadelStationBot 2017-10-03 04:33:23 -05:00
  • ebca0173f3 makes /turf/Enter() faster, and also makes CollidedWith async (#31217) vuonojenmustaturska 2017-10-03 12:32:58 +03:00
  • 8ac574108e Brings 10mm Soporific Description in-line with its nerfed stats Michiyamenotehifunana 2017-10-03 17:24:36 +08:00
  • 22b6f538d6 Automatic changelog generation for PR #3085 [ci skip] CitadelStationBot 2017-10-03 04:18:43 -05:00
  • 4e31a45154 Nerf to 10mm Soporific Bullets (#3085) Michiyamenotehifunana 2017-10-03 17:18:42 +08:00
  • ef671d8764 OOOOOOOH SHIIIIIIIIIIT LetterJay 2017-10-03 03:55:05 -05:00
  • 3a90891019 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-10-03 03:42:26 -05:00
  • b95d35d56d FUCK. LetterJay 2017-10-03 03:42:13 -05:00
  • c8c5af25fe Update custom_items.dm LetterJay 2017-10-03 03:31:49 -05:00
  • 42cfb61f42 Edited regen John 2017-10-03 01:55:50 -05:00
  • 221404bffb cleaned up some things John 2017-10-03 01:42:18 -05:00
  • 37ac0492c3 Automatic changelog generation for PR #2938 [ci skip] CitadelStationBot 2017-10-03 01:20:56 -05:00
  • dffcebf4ff [MIRROR] Remove ash drake hide from lesser ash drakes butcher loot (#2938) CitadelStationBot 2017-10-03 01:20:55 -05:00
  • a0fd8f8b8a Automatic changelog generation for PR #2965 [ci skip] CitadelStationBot 2017-10-03 01:20:48 -05:00
  • 1e309deac0 [MIRROR] Wizard can't cast shout or whisper spells when he is unable to speak (#2965) CitadelStationBot 2017-10-03 01:20:46 -05:00
  • 99d57a7f19 [MIRROR] Swarmers work with multiz stations (#3083) CitadelStationBot 2017-10-03 01:20:37 -05:00
  • 3e6ceaa9a2 Revert "Organize hair and facial hair in character creation" (#3084) Augustfox 2017-10-03 01:16:51 -05:00
  • c8f52d272e donation item LetterJay 2017-10-03 00:18:21 -05:00
  • f03df4f7bb Merge pull request #3082 from ktccd/fixes_flavor_text_and_changeling_dicks LetterJay 2017-10-02 21:26:15 -04:00
  • 3c0a9c23e1 Merge pull request #3081 from Citadel-Station-13/upstream-merge-31196 LetterJay 2017-10-02 21:12:40 -04:00
  • 9026f029d5 Merge pull request #3079 from Citadel-Station-13/upstream-merge-31103 LetterJay 2017-10-02 21:12:31 -04:00
  • 4d68cd0803 Merge pull request #3078 from Citadel-Station-13/upstream-merge-31191 LetterJay 2017-10-02 21:12:17 -04:00
  • 2c219ba814 Merge pull request #3077 from Citadel-Station-13/upstream-merge-31192 LetterJay 2017-10-02 21:11:59 -04:00
  • 39ef613076 Update screen_objects.dm LetterJay 2017-10-02 19:37:03 -05:00
  • 3a72023532 Fixes flavor_text and changeling genitals ktccd 2017-10-03 02:25:53 +02:00
  • f7c6c8b440 config. > CONFIG_GET 2: "all checks have failed" boogaloo deathride58 2017-10-02 18:53:57 -04:00
  • 08b9a11536 Update retaliate.dm LetterJay 2017-10-02 17:32:54 -05:00
  • b19f88c2dc Update mineral_doors.dm LetterJay 2017-10-02 17:32:42 -05:00
  • a9116b3648 Update portals.dm LetterJay 2017-10-02 17:32:27 -05:00
  • 865f057d7b Update mecha_control_console.dm LetterJay 2017-10-02 17:32:11 -05:00
  • cd21843cee Fixes check antagonists for blood brothers CitadelStationBot 2017-10-02 15:52:11 -05:00
  • 139ebadc52 Merge pull request #31196 from kevinz000/patch-303 oranges 2017-10-03 09:51:34 +13:00
  • 891f89e49a Update custom_items.dm LetterJay 2017-10-02 15:34:36 -05:00
  • bd9c6f6ef8 Refactor quick create antag panel code, fixed AFK revs not properly ending the round. CitadelStationBot 2017-10-02 02:48:51 -05:00
  • e402c4350c Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) ShizCalev 2017-10-02 03:48:42 -04:00
  • 52369cdb7c Merge pull request #3075 from Citadel-Station-13/ManualMirror LetterJay 2017-10-02 02:31:47 -04:00
  • 87690e3bb7 Merge pull request #3072 from Citadel-Station-13/upstream-merge-31186 LetterJay 2017-10-02 02:31:39 -04:00
  • 313196b42f Merge pull request #3062 from Citadel-Station-13/upstream-merge-31201 LetterJay 2017-10-02 02:31:32 -04:00
  • d48aa28ed2 Makes the reply link for ahelps use the global token CitadelStationBot 2017-10-02 01:14:14 -05:00
  • bd76e658b0 Makes the reply link for ahelps use the global token (#31191) Jordan Brown 2017-10-02 02:14:08 -04:00
  • 3e26e09db8 ismecha define KorPhaeron 2017-10-02 01:03:40 -05:00
  • cc93f1e546 Merge pull request #3074 from Citadel-Station-13/upstream-merge-31127 LetterJay 2017-10-01 23:53:41 -04:00
  • 06b30d3e73 [MIRROR] Fixes krav maga working while stunned LetterJay 2017-10-01 22:52:58 -05:00
  • 684d888366 Update playsound.dm LetterJay 2017-10-01 22:51:34 -05:00
  • 183974214a Automatic changelog generation for PR #3071 [ci skip] CitadelStationBot 2017-10-01 22:40:51 -05:00
  • acf08df884 Merge pull request #3071 from Citadel-Station-13/upstream-merge-31190 LetterJay 2017-10-01 23:40:49 -04:00
  • 6268682ee3 Merge pull request #3069 from Citadel-Station-13/upstream-merge-31185 LetterJay 2017-10-01 23:40:35 -04:00
  • 872358ecca Merge pull request #3066 from Citadel-Station-13/upstream-merge-31172 LetterJay 2017-10-01 23:40:23 -04:00
  • ac6cbbfbe7 Merge pull request #3065 from Citadel-Station-13/upstream-merge-31173 LetterJay 2017-10-01 23:40:01 -04:00
  • a921dcd568 Merge pull request #3064 from Citadel-Station-13/upstream-merge-31177 LetterJay 2017-10-01 23:39:48 -04:00
  • 8101b1e67f Automatic changelog generation for PR #3063 [ci skip] CitadelStationBot 2017-10-01 22:39:42 -05:00
  • ea493d3f3d Merge pull request #3063 from Citadel-Station-13/upstream-merge-31175 LetterJay 2017-10-01 23:39:41 -04:00
  • 021b0a2bee Update growninedible.dm LetterJay 2017-10-01 22:38:55 -05:00
  • 2cafd6fefb Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086 LetterJay 2017-10-01 23:37:35 -04:00
  • 85639dda35 Automatic changelog generation for PR #3056 [ci skip] CitadelStationBot 2017-10-01 22:37:28 -05:00
  • fc89d769f0 Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130 LetterJay 2017-10-01 23:37:26 -04:00
  • cec44fa601 Merge pull request #3055 from Citadel-Station-13/upstream-merge-31151 LetterJay 2017-10-01 23:37:18 -04:00
  • a468f609d8 Merge pull request #3054 from Citadel-Station-13/upstream-merge-31163 LetterJay 2017-10-01 23:37:09 -04:00
  • cc8f494f1f Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129 LetterJay 2017-10-01 23:36:48 -04:00
  • 8cc6bdb6bf Chat command to notify admins when the round ends CitadelStationBot 2017-10-01 21:12:41 -05:00
  • b9f71e9e15 Merge pull request #31127 from Cyberboss/notify_command oranges 2017-10-02 15:12:13 +13:00
  • 05022208e3 Merge pull request #3067 from Citadel-Station-13/upstream-merge-31213 LetterJay 2017-10-01 20:48:09 -04:00
  • 7c88f10db0 played_url now includes ckey JJRcop 2017-09-30 23:18:54 -04:00
  • 5acf99dc6e Fixes Vanguard never stunning for more than 2 seconds CitadelStationBot 2017-10-01 19:29:34 -05:00
  • 02987715b0 Fixes Vanguard never stunning for more than 2 seconds Joan Lung 2017-09-30 22:38:36 -04:00
  • 70f06cfe35 config. > CONFIG_GET deathride58 2017-10-01 19:56:44 -04:00
  • 8e65f4fb23 Merge branch 'master' into crewobjectivesandmiscreants deathride58 2017-10-01 23:45:49 +00:00
  • e04e05d8b7 150 HOURS OF CODING deathride58 2017-10-01 19:37:15 -04:00
  • d4321ac0b5 Accidentally put a comma Daniel0Mclovin 2017-10-01 17:26:45 -05:00
  • 2d835e1d73 Nerfed overall healing Daniel0Mclovin 2017-10-01 17:25:20 -05:00
  • d3ae434b56 Changed a few stats Daniel0Mclovin 2017-10-01 17:20:44 -05:00
  • e5e9a85191 Fixes gen scanner timer CitadelStationBot 2017-10-01 17:03:52 -05:00
  • d9c77f628d Fixes gen scanner timer ShizCalev 2017-09-30 19:21:13 -04:00