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

Commit Graph

  • 306e7c1cba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-04-25 03:27:32 -05:00
  • 3fc34d1ded fix it LetterJay 2017-04-25 03:27:03 -05:00
  • 8c56b5645b Merge pull request #552 from Citadel-Station-13/upstream-merge-26509 LetterJay 2017-04-25 02:26:53 -05:00
  • 76ed57f90c rej cleanup LetterJay 2017-04-25 02:11:11 -05:00
  • 172380af2b Merge branch 'upstream-merge-26509' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26509 LetterJay 2017-04-25 02:09:52 -05:00
  • 496107120f the fun never ends LetterJay 2017-04-25 02:09:21 -05:00
  • 9df952873b Update type2type.dm LetterJay 2017-04-25 01:55:12 -05:00
  • 31e8bee39e Update type2type.dm LetterJay 2017-04-25 01:54:53 -05:00
  • 3d51a07243 world fix LetterJay 2017-04-25 01:52:49 -05:00
  • 607868a5de [s]Exploit whack-a-mole CitadelStationBot 2017-04-25 01:31:50 -05:00
  • d0c28c0d51 wrong map loaded LetterJay 2017-04-25 01:31:34 -05:00
  • 1a8b8ad66c fix dme LetterJay 2017-04-25 01:25:09 -05:00
  • 8088ce38cc rej file cleanup LetterJay 2017-04-25 01:15:04 -05:00
  • 81fadec9e4 Automatic changelog generation for PR #528 [ci skip] CitadelStationBot 2017-04-25 01:14:18 -05:00
  • 88d4703ebf Merge pull request #528 from Citadel-Station-13/upstream-merge-26292 LetterJay 2017-04-25 01:14:17 -05:00
  • fc0246d388 Merge pull request #538 from Citadel-Station-13/upstream-merge-26444 LetterJay 2017-04-25 01:13:55 -05:00
  • a7a08f6cae Merge pull request #548 from Citadel-Station-13/upstream-merge-26496 LetterJay 2017-04-25 01:13:41 -05:00
  • b9ab919c22 Merge pull request #521 from Citadel-Station-13/upstream-merge-26376 LetterJay 2017-04-25 01:10:58 -05:00
  • a06c6a2994 Merge pull request #508 from Citadel-Station-13/upstream-merge-26337 LetterJay 2017-04-25 01:10:40 -05:00
  • 5dd5363828 Automatic changelog generation for PR #545 [ci skip] CitadelStationBot 2017-04-25 01:02:39 -05:00
  • e27c5c8db3 Merge pull request #545 from Citadel-Station-13/upstream-merge-26397 LetterJay 2017-04-25 01:02:38 -05:00
  • 6dd45dee7f Automatic changelog generation for PR #547 [ci skip] CitadelStationBot 2017-04-25 01:02:24 -05:00
  • 8fcb5d761e Merge pull request #547 from Citadel-Station-13/upstream-merge-26491 LetterJay 2017-04-25 01:02:23 -05:00
  • d78e5c196d Rename tgstation.2.1.3.dmm.rej to broken.rej LetterJay 2017-04-25 01:01:11 -05:00
  • 4ea582ddef Update tgstation.2.1.3.dmm.rej LetterJay 2017-04-25 01:00:20 -05:00
  • c84484f0f8 Automatic changelog generation for PR #550 [ci skip] CitadelStationBot 2017-04-25 00:57:22 -05:00
  • 7d03fff752 Merge pull request #550 from Citadel-Station-13/upstream-merge-26443 LetterJay 2017-04-25 00:57:21 -05:00
  • cf0906597b Merge pull request #551 from Citadel-Station-13/upstream-merge-26506 LetterJay 2017-04-25 00:57:08 -05:00
  • de1d8188ae removes rej files LetterJay 2017-04-24 21:34:58 -05:00
  • 198fb4e343 Automatic changelog generation for PR #542 [ci skip] CitadelStationBot 2017-04-24 21:31:33 -05:00
  • 88da83f504 Merge pull request #542 from Citadel-Station-13/upstream-merge-26416 LetterJay 2017-04-24 21:31:32 -05:00
  • f38f1e383b Merge pull request #488 from Citadel-Station-13/upstream-merge-26344 LetterJay 2017-04-24 21:27:40 -05:00
  • 6070000c9a Merge pull request #537 from Citadel-Station-13/upstream-merge-26485 LetterJay 2017-04-24 21:23:31 -05:00
  • 832233000e Merge pull request #546 from Citadel-Station-13/upstream-merge-26479 LetterJay 2017-04-24 21:22:46 -05:00
  • ef68586e4f Automatic changelog generation for PR #544 [ci skip] CitadelStationBot 2017-04-24 21:22:13 -05:00
  • 176c11b8ea Merge pull request #544 from Citadel-Station-13/upstream-merge-26457 LetterJay 2017-04-24 21:22:12 -05:00
  • defa9d863c >We still let old code in the codebase CitadelStationBot 2017-04-24 21:22:11 -05:00
  • 4ee8933e3f Improves Skeleton Hitboxes CitadelStationBot 2017-04-24 20:55:44 -05:00
  • 7172979792 Removes active turfs from Pubby, Box and Crashed Ship ruin CitadelStationBot 2017-04-24 20:54:39 -05:00
  • 437634c957 Fixes turfs on Omegastation CitadelStationBot 2017-04-24 20:54:36 -05:00
  • 29f441e255 removes rej LetterJay 2017-04-24 20:10:31 -05:00
  • 8c56134f56 Merge pull request #478 from Citadel-Station-13/upstream-merge-26341 LetterJay 2017-04-24 19:57:08 -05:00
  • 08a8f8d757 Getting uncuffed resets your clickdelay CitadelStationBot 2017-04-24 18:09:17 -05:00
  • 4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker CitadelStationBot 2017-04-24 18:07:12 -05:00
  • aea9714228 Automatic changelog generation for PR #541 [ci skip] CitadelStationBot 2017-04-24 18:03:35 -05:00
  • 7f44459847 Merge pull request #541 from Citadel-Station-13/upstream-merge-26400 LetterJay 2017-04-24 18:03:34 -05:00
  • c2263c1ff1 Merge pull request #540 from Citadel-Station-13/upstream-merge-26452 LetterJay 2017-04-24 18:03:17 -05:00
  • d6325d8ce6 Automatic changelog generation for PR #539 [ci skip] CitadelStationBot 2017-04-24 18:03:01 -05:00
  • 41fad688a8 Merge pull request #539 from Citadel-Station-13/upstream-merge-26445 LetterJay 2017-04-24 18:02:59 -05:00
  • 5ed06c2e63 Doors crushing people makes a visible message CitadelStationBot 2017-04-24 18:02:03 -05:00
  • a39a405b60 fixes people with no skin/golems dropping skin when gibbed CitadelStationBot 2017-04-24 17:59:57 -05:00
  • ffc35f33ba Ghosts no longer drift in space CitadelStationBot 2017-04-24 17:53:49 -05:00
  • 3afe339198 Fixes bugs with shuttles breaking pipes, wires and disposals CitadelStationBot 2017-04-24 17:43:37 -05:00
  • cc50235a0f Fixes some facehugger bugs CitadelStationBot 2017-04-24 17:40:31 -05:00
  • 3ebf5ab3bc Fixes objects being used on backpacks if they don't fit CitadelStationBot 2017-04-24 17:39:27 -05:00
  • babb6c53c8 Cerestation Tweaks MKIV CitadelStationBot 2017-04-24 17:38:22 -05:00
  • a6f6317b51 Merge pull request #535 from Citadel-Station-13/upstream-merge-26478 LetterJay 2017-04-24 16:49:35 -05:00
  • a3d21f045a Merge pull request #534 from Citadel-Station-13/upstream-merge-26490 LetterJay 2017-04-24 16:49:18 -05:00
  • 0c136c26b3 Merge pull request #533 from Citadel-Station-13/upstream-merge-26465 LetterJay 2017-04-24 16:49:02 -05:00
  • 849b82d8be Automatic changelog generation for PR #532 [ci skip] CitadelStationBot 2017-04-24 16:48:19 -05:00
  • 2c01d8b5d9 Merge pull request #532 from Citadel-Station-13/upstream-merge-26381 LetterJay 2017-04-24 16:48:18 -05:00
  • cf067a2ce3 Automatic changelog generation for PR #529 [ci skip] CitadelStationBot 2017-04-24 16:46:51 -05:00
  • 4833a8e044 Merge pull request #529 from Citadel-Station-13/upstream-merge-26346 LetterJay 2017-04-24 16:46:50 -05:00
  • 1c884803b1 Automatic changelog generation for PR #527 [ci skip] CitadelStationBot 2017-04-24 16:45:00 -05:00
  • bc7cb1ee49 Merge pull request #527 from Citadel-Station-13/upstream-merge-26436 LetterJay 2017-04-24 16:44:59 -05:00
  • 5e7180d7f0 Merge pull request #524 from Citadel-Station-13/upstream-merge-26489 LetterJay 2017-04-24 16:43:37 -05:00
  • 7c14af7f7b Merge pull request #511 from Citadel-Station-13/upstream-merge-26365 LetterJay 2017-04-24 16:41:55 -05:00
  • 9868ae6036 Renames "Hard Reset" to "Reboot World" CitadelStationBot 2017-04-24 14:24:27 -05:00
  • 2af5d315a0 Fixes linking of multiple comm equipment with same id. CitadelStationBot 2017-04-24 13:14:16 -05:00
  • 2c06134e42 Fixes template tank dispensers CitadelStationBot 2017-04-24 13:12:11 -05:00
  • 4025652c11 Fixes Advanced Proc Call CitadelStationBot 2017-04-24 10:05:15 -05:00
  • c545d4801e Adds examine tips to firedoor construction/deconstruction CitadelStationBot 2017-04-24 07:45:06 -05:00
  • f3b196e55d Plasmamen tongues, plasmaman lung sprites CitadelStationBot 2017-04-24 04:06:35 -05:00
  • 7dccc9768f Merge conflict tags aren't touched if github doesn't calculate them in time CitadelStationBot 2017-04-23 19:00:19 -05:00
  • de50b582ae Braining/debraining fixes CitadelStationBot 2017-04-23 14:48:31 -05:00
  • 5be9cf5225 [Deltastation] Access Fixes [Ready for Review]* CitadelStationBot 2017-04-23 14:24:07 -05:00
  • f58335d5d8 Fixes swarmers speaking common CitadelStationBot 2017-04-23 13:53:36 -05:00
  • 387caa518f Changed alternate appearances to /datum/atom_hud s CitadelStationBot 2017-04-23 13:26:08 -05:00
  • fd976abca6 Merge pull request #525 from Citadel-Station-13/upstream-merge-26495 LetterJay 2017-04-23 11:32:19 -05:00
  • 02f750d25a Fixes some areas having no lighting CitadelStationBot 2017-04-23 11:22:17 -05:00
  • add1419809 fixes the server CitadelStationBot 2017-04-23 10:22:18 -05:00
  • e563a60a8c Popped in a copy of the old gulp sound to fix a conflict. Verkister 2017-04-23 12:25:03 +03:00
  • ff414cf7fa Pounce is somewhat functional again. -Drawback is that distance pouncing is borked. Borked out of box with tg hunters too? -Removed stun time nerf to make up for the lack of distance functionality. Verkister 2017-04-23 11:50:39 +03:00
  • e5c87b0a0f Kinda figured out the slapping icon thingy. -Yeah, the jaw hud icon still shows up at the bottom, but the bite effect now shows up and covers most of it. -Also made the borg sleeper insertion use a gulp sound :v Verkister 2017-04-23 11:01:37 +03:00
  • a6341f4cab Couldn't find the reset module in the code, but added something that should fix offset and icon directory for standard borg in case it gets borked from un-dogborging. Verkister 2017-04-23 10:11:42 +03:00
  • 528279a13e post-edited sounds (#522) Poojawa 2017-04-23 02:02:11 -05:00
  • 4e7f06f775 Copies the loaded titlescreen into the rsc (#518) CitadelStationBot 2017-04-23 01:50:04 -05:00
  • 7dc86aa2db Fix current_ticket.initiator not being set when a client relogs (#520) CitadelStationBot 2017-04-23 01:36:14 -05:00
  • da2bde0e5a Quite possibly the smallest microoptimization here (#519) CitadelStationBot 2017-04-23 01:35:55 -05:00
  • 682a00b768 Greyscale lighters no longer color the flame (#517) CitadelStationBot 2017-04-23 01:35:43 -05:00
  • 341951623e Updates space ruins TGM format and noop usage (#504) CitadelStationBot 2017-04-23 01:31:40 -05:00
  • 2a18042160 Grammar edit for flashbangs tip CitadelStationBot 2017-04-22 21:41:28 -05:00
  • d66e609d48 Bringing back the dogborgos. Verkister 2017-04-23 02:36:31 +03:00
  • 47f078ee2b Merge pull request #514 from Citadel-Station-13/upstream-merge-26332 LetterJay 2017-04-22 14:40:10 -05:00
  • f3839fc13b Merge pull request #512 from Citadel-Station-13/upstream-merge-26418 LetterJay 2017-04-22 14:39:17 -05:00
  • 6bcd3220ac Merge pull request #509 from Citadel-Station-13/upstream-merge-26422 LetterJay 2017-04-22 14:38:06 -05:00
  • 691d973871 Merge pull request #506 from Citadel-Station-13/upstream-merge-26402 LetterJay 2017-04-22 14:37:01 -05:00
  • 5033d39028 Automatic changelog generation for PR #507 [ci skip] CitadelStationBot 2017-04-22 14:36:23 -05:00
  • 0db0c55ade Merge pull request #507 from Citadel-Station-13/upstream-merge-26408 LetterJay 2017-04-22 14:36:22 -05:00
  • 8405f2d005 Automatic changelog generation for PR #505 [ci skip] CitadelStationBot 2017-04-22 14:36:02 -05:00