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

Commit Graph

  • 18a99fae2e Merge pull request #5965 from Citadel-Station-13/upstream-merge-36460 deathride58 2018-03-17 23:46:08 +00:00
  • 8e5d87b780 Update machines.dm deathride58 2018-03-17 19:45:24 -04:00
  • aceed22b76 Chem dispenser upgrade vuonojenmustaturska 2018-03-17 17:09:23 +02:00
  • a8bbe89d93 Tesla coils and grounding rods actually shock buckled mobs. CitadelStationBot 2018-03-17 08:49:39 -05:00
  • c1e897b298 Tesla coils and grounding rods actually shock buckled mobs. (#36437) RandomMarine 2018-03-17 06:48:56 -07:00
  • e6ae312d9e Changes stormtrooper ammo to 10g slugs CitadelStationBot 2018-03-17 08:47:24 -05:00
  • f82456fd7f Changes stormtrooper ammo to 10g slugs (#36364) 81Denton 2018-03-17 14:46:32 +01:00
  • a4e10653c7 Fixes the tesla coil research screwdrivering vuonojenmustaturska 2018-03-17 15:29:53 +02:00
  • 4237b762a0 Fixes admins not working in certain cases CitadelStationBot 2018-03-17 08:26:37 -05:00
  • 67d7cf3477 Fixes admins not working in certain cases (#36470) Kyle Spier-Swenson 2018-03-17 06:25:26 -07:00
  • 7419403d34 Gibs admin observers follow links CitadelStationBot 2018-03-17 08:25:25 -05:00
  • aea919e4ec Merge pull request #36478 from MrStonedOne/patch-495 vuonojenmustaturska 2018-03-17 15:23:56 +02:00
  • 96eb472d01 Fixed diseases getting negative points CitadelStationBot 2018-03-17 08:25:17 -05:00
  • f0cb5fd3d8 Merge pull request #36475 from Cruix/disease_fix vuonojenmustaturska 2018-03-17 15:24:38 +02:00
  • 64f60938cd Fixes ghost portal teleportation CitadelStationBot 2018-03-17 08:22:46 -05:00
  • 2dcaf50d07 Fixes ghost portal teleportation (#36438) kevinz000 2018-03-17 06:21:14 -07:00
  • 72ca6a1fa4 Fixes dupe and runtime issues with Rod of Asclepius CitadelStationBot 2018-03-17 08:22:38 -05:00
  • 49a772b6b7 Fixes dupe and runtime issues with Rod of Asclepius (#36410) TheDreamweaver 2018-03-17 06:21:48 -07:00
  • 18c9ba66ce Mech drills behave more realistically CitadelStationBot 2018-03-17 08:22:30 -05:00
  • ac8c67e7b9 Merge pull request #36401 from XDTM/PierceTheHeavens vuonojenmustaturska 2018-03-17 15:22:14 +02:00
  • c9dc114298 Makes vanilla ice cream... require vanilla! CitadelStationBot 2018-03-17 08:21:17 -05:00
  • 2d8258057b Merge pull request #36443 from ShizCalev/vanilla-icecream vuonojenmustaturska 2018-03-17 15:20:29 +02:00
  • 28d3583cea Updates a bunch of tips and adds new ones CitadelStationBot 2018-03-17 08:19:00 -05:00
  • 4bb191a327 Updates a bunch of tips and adds new ones (#36422) 81Denton 2018-03-17 14:17:50 +01:00
  • dfdada1991 Lavaland / Lavaplanet is now visible from space CitadelStationBot 2018-03-17 07:54:21 -05:00
  • f7a8a96536 Lavaland / Lavaplanet is now visible from space (#36419) Qustinnus 2018-03-16 19:30:13 +01:00
  • ce34cd8d09 Sec officers always like donuts CitadelStationBot 2018-03-17 07:54:13 -05:00
  • 75088e9b36 Merge pull request #36425 from Shadowlight213/donutsec vuonojenmustaturska 2018-03-16 22:19:44 +02:00
  • dfcd3e419b Fixes brain damage json runtime CitadelStationBot 2018-03-17 07:54:04 -05:00
  • 9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime oranges 2018-03-17 11:18:41 +13:00
  • 94d92b18e2 Fix stray pixels in Death Ripley sprite CitadelStationBot 2018-03-17 07:53:54 -05:00
  • 352cb2632d Merge pull request #36446 from AutomaticFrenzy/patch/death-ripley oranges 2018-03-17 11:19:29 +13:00
  • fde2867e08 Fixed cameras holding up the arrival shuttle CitadelStationBot 2018-03-17 07:53:45 -05:00
  • 11d1119d6f Merge pull request #36409 from Cruix/disease_shuttle oranges 2018-03-17 11:20:51 +13:00
  • 8744168363 Fixes bluespace radio potions CitadelStationBot 2018-03-17 07:53:37 -05:00
  • e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio oranges 2018-03-17 11:21:58 +13:00
  • 89131ddc03 Fixes false wall layering CitadelStationBot 2018-03-17 07:53:28 -05:00
  • 9f561a6a65 Merge pull request #36371 from ShizCalev/false-wall-layer-fix oranges 2018-03-17 11:23:47 +13:00
  • a66e03658c [S] Fixes tables being bluespace magnets CitadelStationBot 2018-03-17 07:53:20 -05:00
  • dd55ad6f88 Merge pull request #36079 from deathride58/nerfstheskylarlinemanexperience oranges 2018-03-17 11:25:29 +13:00
  • e6ebda9fd2 [READY] Refactors wet floors to a component CitadelStationBot 2018-03-17 07:53:11 -05:00
  • f78fea7333 [READY] Refactors wet floors to a component (#36130) kevinz000 2018-03-16 15:26:09 -07:00
  • 53e5939d8d Allows traitor AI's to take direct control of turrets. CitadelStationBot 2018-03-17 07:53:01 -05:00
  • 80e046572f Allows traitor AI's to take direct control of turrets. (#36154) AnturK 2018-03-16 23:30:41 +01:00
  • c102a97e7c Fix mislabelled and stacked OmegaStation cameras CitadelStationBot 2018-03-17 07:52:52 -05:00
  • 5edfbf5224 Fix mislabelled and stacked OmegaStation cameras (#36460) Tad Hardesty 2018-03-16 23:10:52 -07:00
  • b4457dfefd Clown Ops Cruix 2018-03-16 23:40:53 -07:00
  • 13709a7d34 [MIRROR] Simple xeno antagonist (#5961) CitadelStationBot 2018-03-17 05:23:21 -05:00
  • 063abf2a5d Makes xenobio consoles upgradeable via disks obtainable from bluespace research, makes most xenobio console abilities exclusive to disk upgrades (#5953) deathride58 2018-03-16 17:13:06 +00:00
  • 95d9ff2328 Merge branch 'master' into cit_mood Anonymous 2018-03-16 17:09:57 +03:00
  • b479e5fc7a [Ready for Review] Revamps Wish Granters (#5773) Michiyamenotehifunana 2018-03-16 18:34:06 +08:00
  • 8923bb9488 Small combat balancing: Small crawling nerf, Esword buff (#5937) deathride58 2018-03-16 10:27:30 +00:00
  • c2e95fc233 Oh that blob (#5934) Zna12 2018-03-16 05:21:34 -05:00
  • e4778dc751 Makes shock collars actually obtainable from KinkMates. (#5938) Useroth 2018-03-16 11:20:08 +01:00
  • 135163734b Merge pull request #5957 from Poojawa/pubbyfix deathride58 2018-03-16 03:15:49 +00:00
  • 0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955) CitadelStationBot 2018-03-15 20:50:10 -05:00
  • 31d988344a maybe actually have mentors that aren't broke as shit (#5954) Poojawa 2018-03-15 20:49:32 -05:00
  • 74eddfd888 Fixes broken engineering in Pubby Poojawa 2018-03-15 20:45:50 -05:00
  • be49ca2209 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into pubbyfix Poojawa 2018-03-15 20:35:49 -05:00
  • 89f37cc8b7 [MIRROR] Fixes broken bot icons (#5952) CitadelStationBot 2018-03-15 07:20:25 -05:00
  • ae2541f0fb Fixes missing href on borg sleepers (#5930) Poojawa 2018-03-15 04:44:03 -05:00
  • 6784c4e6a7 Update carbon_defense.dm Poojawa 2018-03-14 18:53:57 -05:00
  • 452b58d1a1 makes traits more paranoid, also removes the double application (#5929) Poojawa 2018-03-14 17:28:42 -05:00
  • 035b3458de MDB fix attempt number two. (#5928) deathride58 2018-03-14 22:08:19 +00:00
  • 17e8b5748e Automatic changelog generation for PR #5950 [ci skip] CitadelStationBot 2018-03-14 16:58:38 -05:00
  • f00246ae79 [MIRROR] The names of Surgery Disks now match their type of surgery (#5950) CitadelStationBot 2018-03-14 16:58:36 -05:00
  • 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) Poojawa 2018-03-14 16:49:40 -05:00
  • be23070f67 Automatic changelog generation for PR #5941 [ci skip] CitadelStationBot 2018-03-14 10:42:17 -05:00
  • 3e95574d1e Merge pull request #5941 from Citadel-Station-13/upstream-merge-36346 LetterJay 2018-03-14 10:42:13 -05:00
  • cc814bf5cc Merge pull request #5940 from Citadel-Station-13/upstream-merge-36355 LetterJay 2018-03-14 10:41:46 -05:00
  • c3da95567f Makes touching (8)balls take less time CitadelStationBot 2018-03-13 23:04:39 -05:00
  • f132f6d703 Makes touching (8)balls take less time (#36346) Dax Dupont 2018-03-14 02:44:00 +01:00
  • c24d13d05d Fixes chemical implant manual activation oversight CitadelStationBot 2018-03-13 23:04:16 -05:00
  • 0e4f0c0211 Exploit kevinz000 2018-03-12 00:35:33 -07:00
  • 621804679e forces xenos to have heads. stop ahelping invisible ones Poojawa 2018-03-13 19:15:32 -05:00
  • ea4061c014 Automatic changelog generation for PR #5847 [ci skip] CitadelStationBot 2018-03-13 18:39:21 -05:00
  • cc6bab0c06 Foam Lasertag Darts (#5847) Zna12 2018-03-13 18:39:19 -05:00
  • f4aaa942e1 Automatic changelog generation for PR #5874 [ci skip] CitadelStationBot 2018-03-13 18:38:52 -05:00
  • 7b9dac0a47 Makes the titlescreen properly positioned for widescreen again (#5874) deathride58 2018-03-13 23:38:49 +00:00
  • 7e5117da4b Merge pull request #1 from Citadel-Station-13/master Cameron! 2018-03-13 16:52:26 -04:00
  • 542f9c63c7 Adds check if item is sharp Anonymous 2018-03-13 15:48:26 +03:00
  • b20984af89 B for Bad Grammar Anonymous 2018-03-13 15:38:33 +03:00
  • dff9dabf06 [MIRROR] Fixes stopsounds properly (#5931) CitadelStationBot 2018-03-13 05:46:27 -05:00
  • 8dc9fcf816 [MIRROR] Fixes blindfolds blinding when not over your eyes (#5936) CitadelStationBot 2018-03-13 05:45:53 -05:00
  • a58a8cdefb [MIRROR] Fixes client version config not working (#5935) CitadelStationBot 2018-03-13 05:45:34 -05:00
  • 90673bc54b Automatic changelog generation for PR #5920 [ci skip] CitadelStationBot 2018-03-12 13:13:02 -05:00
  • 31ffc89cbc [MIRROR] Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#5920) CitadelStationBot 2018-03-12 13:13:00 -05:00
  • d6478f19c9 Automatic changelog generation for PR #5925 [ci skip] CitadelStationBot 2018-03-12 13:12:20 -05:00
  • b24f4a7f1f [MIRROR] Allows medical sprays to be stored in medical belts and smartfridges (#5925) CitadelStationBot 2018-03-12 13:12:18 -05:00
  • 2c10a07538 Automatic changelog generation for PR #5912 [ci skip] CitadelStationBot 2018-03-12 07:58:51 -05:00
  • fd42d55993 [MIRROR] Fixes stopsounds (#5912) CitadelStationBot 2018-03-12 07:58:49 -05:00
  • 3e5f79332a Automatic changelog generation for PR #5917 [ci skip] CitadelStationBot 2018-03-12 07:39:40 -05:00
  • 544d7bcaf4 [MIRROR] Adds descriptions to all cargo orders! (#5917) CitadelStationBot 2018-03-12 07:39:38 -05:00
  • 68eb27820e Automatic changelog generation for PR #5922 [ci skip] CitadelStationBot 2018-03-12 07:30:31 -05:00
  • 71b3349c2d [MIRROR] Custom dockers must be greater than 10 tiles from map edge (#5922) CitadelStationBot 2018-03-12 07:30:29 -05:00
  • c3edb62df9 [MIRROR] Hopefully fixes unnecessary nightshift announcements (#5923) CitadelStationBot 2018-03-12 07:30:16 -05:00
  • dcc9e9d8d7 Automatic changelog generation for PR #5924 [ci skip] CitadelStationBot 2018-03-12 07:30:07 -05:00
  • c91006c27f [MIRROR] Create ERT refactor (#5924) CitadelStationBot 2018-03-12 07:30:03 -05:00
  • 6a65ed49d0 Automatic changelog generation for PR #5921 [ci skip] CitadelStationBot 2018-03-12 07:08:37 -05:00
  • f9c1114ec1 [MIRROR] Pacifists can no longer cause harm using mech equipment (#5921) CitadelStationBot 2018-03-12 07:08:34 -05:00