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

Commit Graph

  • 65c24a5fde Merge branch 'master' into upstream-merge-27440 LetterJay 2017-05-22 11:33:55 -05:00
  • f550e8032c rej/dme cleanup LetterJay 2017-05-22 11:32:12 -05:00
  • d200bff9f4 spaces. spaces caused the file to conflict. LetterJay 2017-05-22 11:26:47 -05:00
  • 73dea85b15 commit/rej cleanup LetterJay 2017-05-22 11:24:17 -05:00
  • 4533d31e34 Cult Fixes for Construct Icons and Spells CitadelStationBot 2017-05-22 10:49:33 -05:00
  • 1d8f9b31ee Merge pull request #1095 from Citadel-Station-13/upstream-merge-27466 LetterJay 2017-05-22 08:25:42 -05:00
  • fad23e47f6 Automatic changelog generation for PR #1094 [ci skip] CitadelStationBot 2017-05-22 08:25:32 -05:00
  • b2a0fe64af Merge pull request #1094 from Citadel-Station-13/upstream-merge-27488 LetterJay 2017-05-22 08:25:30 -05:00
  • 8572dc2da8 Merge pull request #1093 from Citadel-Station-13/upstream-merge-27396 LetterJay 2017-05-22 08:25:13 -05:00
  • ef69582c52 Merge pull request #1090 from Citadel-Station-13/upstream-merge-27472 LetterJay 2017-05-22 08:24:41 -05:00
  • a345c41bcd Merge pull request #1089 from Citadel-Station-13/upstream-merge-27473 LetterJay 2017-05-22 08:24:26 -05:00
  • 85e03b3e11 Merge pull request #1088 from Citadel-Station-13/upstream-merge-27430 LetterJay 2017-05-22 08:24:08 -05:00
  • 78b85984f8 Automatic changelog generation for PR #1086 [ci skip] CitadelStationBot 2017-05-22 08:23:25 -05:00
  • a0e5170e40 Merge pull request #1086 from Citadel-Station-13/upstream-merge-27476 LetterJay 2017-05-22 08:23:23 -05:00
  • d016d5b669 Merge pull request #1085 from Citadel-Station-13/upstream-merge-27519 LetterJay 2017-05-22 08:23:05 -05:00
  • d0cd9fc408 Merge pull request #1082 from Citadel-Station-13/upstream-merge-27481 LetterJay 2017-05-22 08:22:46 -05:00
  • 9e2d43fd80 KA Pressure Mods are now a traitor miner item CitadelStationBot 2017-05-22 08:20:07 -05:00
  • ceed94e67f Fixed femcum creating decal with semen reagent Artemiuz28 2017-05-22 16:12:20 +03:00
  • c6e60fcc76 Vagina is now valid for masturbation Artemiuz28 2017-05-22 16:11:07 +03:00
  • f0ed647ef4 Update womb.dm Artemiuz28 2017-05-22 16:03:45 +03:00
  • 070ee9b86a Fixes shooting out of view windows CitadelStationBot 2017-05-22 07:44:10 -05:00
  • 2dc68a5ebf Prevents wizard from gaining infinite skeletons with a 3-use Necrostone CitadelStationBot 2017-05-22 07:28:48 -05:00
  • dc31873c3a fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result. CitadelStationBot 2017-05-22 07:27:43 -05:00
  • ebca1eb051 A silicon will always be able to speak Galactic Common CitadelStationBot 2017-05-22 07:26:31 -05:00
  • 25df88509a Reorganizes martial arts and stores them in the MIND. CitadelStationBot 2017-05-22 07:13:10 -05:00
  • 2617011eb5 Having less legs won't slow you down if you're in zero gravity with a jetpack CitadelStationBot 2017-05-22 07:08:59 -05:00
  • ff4ef6a1f5 reset kevinz000 2017-05-21 21:58:11 -07:00
  • 0bf9f163f3 missed a spot kevinz000 2017-05-21 21:54:31 -07:00
  • db4b764aea [All stations] Cleaned up var-editted areas CitadelStationBot 2017-05-21 22:29:41 -05:00
  • 20dd169998 Fixes ordering of text2file params CitadelStationBot 2017-05-21 22:29:19 -05:00
  • 73aa9346e3 Fixes built air meters not working CitadelStationBot 2017-05-21 22:29:15 -05:00
  • 8bc4cf3f41 Warden Compact Combat Shotgun CitadelStationBot 2017-05-21 22:29:01 -05:00
  • 39635b2d0d Fixes talisman grammar CitadelStationBot 2017-05-21 22:28:57 -05:00
  • 9f75c7b317 Fixes jetpacks working indoors/in areas with gravity CitadelStationBot 2017-05-21 22:28:51 -05:00
  • f132720d7e Since you can properly scrub Freon now, it doesn't destroy itself. CitadelStationBot 2017-05-21 22:28:47 -05:00
  • 8abbf12132 Resonator fields now visually show how long they have until they burst CitadelStationBot 2017-05-21 22:28:36 -05:00
  • 7df5632d6e Minor Grammar Fixes CitadelStationBot 2017-05-21 22:28:29 -05:00
  • 31ecd3cdd8 Nerfs monkeys CitadelStationBot 2017-05-21 22:28:25 -05:00
  • 1dcad5fa0e Fixes pkborg fields not updating location or draining power CitadelStationBot 2017-05-21 22:28:20 -05:00
  • d7f0b9494b Ports pandemic to tgui CitadelStationBot 2017-05-21 22:28:16 -05:00
  • 4e5617ad54 Megafauna and lavaland mobs will no longer spawn directly on top of the mining base CitadelStationBot 2017-05-21 22:28:10 -05:00
  • 4acbd4af2c Fixes Master/Recover not restoring previous runlevel CitadelStationBot 2017-05-21 22:27:58 -05:00
  • 1989e3d5ea properly fixes quickgrab exploit CitadelStationBot 2017-05-21 22:27:54 -05:00
  • f43a861d6e Plasma cutters will mine further but will go less distance in open air CitadelStationBot 2017-05-21 22:27:50 -05:00
  • a33966b231 Fixes paper runtimes CitadelStationBot 2017-05-21 22:27:46 -05:00
  • 5fd5e32628 [MIRROR] Fixes syndicate borg spawner (#1072) CitadelStationBot 2017-05-21 20:30:28 -05:00
  • 312ae2218e [MIRROR] fixes chameleon laser guns blowing up welding tanks for real this time (#1069) CitadelStationBot 2017-05-21 20:30:12 -05:00
  • de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items kevinz000 2017-05-21 18:17:42 -07:00
  • 7e2cebe1db Merge branch 'master' into upstream-merge-27344 kevinz000 2017-05-21 17:50:29 -07:00
  • c7de3024b1 Automatic changelog generation for PR #1075 [ci skip] CitadelStationBot 2017-05-21 19:45:08 -05:00
  • 0924db6d41 Re-removes "the station" from drone law 3 (#1075) CitadelStationBot 2017-05-21 19:45:06 -05:00
  • cd82124ef5 Survival pod doors will properly turn if on shuttles (#1070) CitadelStationBot 2017-05-21 19:43:53 -05:00
  • a3807448db Adds framework for kinetic accelerator projectiles having module-based effects on-hit (#1076) CitadelStationBot 2017-05-21 19:42:06 -05:00
  • 3ad9c0ffed fixes cults being able to delete people (#1077) CitadelStationBot 2017-05-21 14:47:10 -05:00
  • 26448d7016 Removes the mess added with recalling with a message CitadelStationBot 2017-05-21 07:57:17 -05:00
  • e224a47f53 Two more types of Legion and makes environment_smash levels into defines CitadelStationBot 2017-05-21 02:52:23 -05:00
  • c0da458c92 Ports folders to Initialize (#1058) CitadelStationBot 2017-05-21 01:22:53 -05:00
  • 2be5022536 Merge branch 'master' into upstream-merge-27268 Poojawa 2017-05-21 01:22:16 -05:00
  • 909be8c8c7 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 Poojawa 2017-05-21 01:10:53 -05:00
  • c8e9e34d2b [MIRROR] Fixes stat gathering (#1025) CitadelStationBot 2017-05-21 01:07:14 -05:00
  • 7a3fb9e62e update ticker.dm Poojawa 2017-05-21 01:05:10 -05:00
  • 110de7902e Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 Poojawa 2017-05-21 01:01:11 -05:00
  • a8fa82b7c6 update world.dm Poojawa 2017-05-21 01:01:10 -05:00
  • 883c5e034d Fixes bootstrapping the feedback database (#1012) CitadelStationBot 2017-05-21 00:46:44 -05:00
  • 63c64a00f1 [MIRROR] >mysql (#987) CitadelStationBot 2017-05-21 00:46:24 -05:00
  • d8299bdcfd delete .rej Poojawa 2017-05-21 00:45:55 -05:00
  • 186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 Poojawa 2017-05-21 00:44:08 -05:00
  • 9785b94cc5 Automatic changelog generation for PR #1037 [ci skip] CitadelStationBot 2017-05-21 00:39:27 -05:00
  • f624071766 [MIRROR] Ninja Refactor (#1037) CitadelStationBot 2017-05-21 00:39:26 -05:00
  • f4e7e152df Merge branch 'upstream-merge-27344' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344 Poojawa 2017-05-21 00:37:53 -05:00
  • 587bc1795c missing files Poojawa 2017-05-21 00:37:47 -05:00
  • 0b1f4a27da Merge pull request #452 from Citadel-Station-13/upstream-merge-26271 LetterJay 2017-05-21 00:25:43 -05:00
  • e28130f70c Update rune_spawn_action.dm Poojawa 2017-05-21 00:23:00 -05:00
  • c8e9248ebb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27344 Poojawa 2017-05-21 00:13:39 -05:00
  • e0af0df435 [MIRROR] Adds Mass Insert proc to sql (#986) CitadelStationBot 2017-05-20 23:43:16 -05:00
  • 45ba084c6a Merge branch 'master' into upstream-merge-27344 Poojawa 2017-05-20 23:26:28 -05:00
  • 64192be7a5 Automatic changelog generation for PR #1067 [ci skip] CitadelStationBot 2017-05-20 23:20:46 -05:00
  • 5455e28d76 Aux Base Fixes (#1067) CitadelStationBot 2017-05-20 23:20:45 -05:00
  • 12bbacec25 [MIRROR] Adds framework for cult constructs having the ability to make runes (#1010) CitadelStationBot 2017-05-20 23:12:51 -05:00
  • 02492bfe2f Automatic changelog generation for PR #994 [ci skip] CitadelStationBot 2017-05-20 23:00:03 -05:00
  • 88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994) CitadelStationBot 2017-05-20 23:00:02 -05:00
  • 813ea3bee6 Merge loadallmaps.dm into basemap.dm CitadelStationBot 2017-05-20 21:27:10 -05:00
  • 644a31ed98 Misc. guardian stuff (#1066) cebutris 2017-05-20 20:54:39 -04:00
  • c39b60b3cf Decentralized and Vastly Improved Gang Influence System CitadelStationBot 2017-05-20 18:37:48 -05:00
  • 2600dfaa19 Merge pull request #1064 from Citadel-Station-13/upstream-merge-27436 CitadelStationBot 2017-05-20 15:05:17 -05:00
  • 448dc20c2b Proto-kinetic crushers are significantly better CitadelStationBot 2017-05-20 12:42:11 -05:00
  • 06c0856799 Fixes buttons under doors. CitadelStationBot 2017-05-20 11:34:52 -05:00
  • 186a63ad34 Merge pull request #1057 from Citadel-Station-13/upstream-merge-27395 LetterJay 2017-05-19 22:54:52 -05:00
  • a6ee50b11b Merge pull request #1059 from Citadel-Station-13/upstream-merge-27389 LetterJay 2017-05-19 22:47:03 -05:00
  • 2cb54a5d45 Merge pull request #1061 from Citadel-Station-13/upstream-merge-27398 LetterJay 2017-05-19 22:46:52 -05:00
  • e714641a73 Automatic changelog generation for PR #1060 [ci skip] CitadelStationBot 2017-05-19 22:46:44 -05:00
  • 59f367cd23 Merge pull request #1060 from Citadel-Station-13/upstream-merge-27386 LetterJay 2017-05-19 22:46:43 -05:00
  • 4d48592008 Merge pull request #1051 from cebutris/holofixes LetterJay 2017-05-19 22:46:30 -05:00
  • da484b79a4 Automatic changelog generation for PR #1062 [ci skip] CitadelStationBot 2017-05-19 22:46:16 -05:00
  • 3f24fa15bf Merge pull request #1062 from Citadel-Station-13/Cryofix LetterJay 2017-05-19 22:46:14 -05:00
  • 6733349b3f this didn't mirror for some reason LetterJay 2017-05-19 22:43:52 -05:00
  • 6d3e9f9c50 mob_occupant to occupant LetterJay 2017-05-19 22:33:26 -05:00
  • 915fa6cac1 IsAdminAdvancedProcCall returns FALSE in TESTING CitadelStationBot 2017-05-19 16:00:23 -05:00
  • 461804e635 Pulse Weapons Sprite Update CitadelStationBot 2017-05-19 13:51:47 -05:00
  • 778d809ff3 Fixes gravity generator admin spam CitadelStationBot 2017-05-19 13:48:39 -05:00