Commit Graph

  • 8af261f46c Merge pull request #233 from LetterJay/master LetterJay 2017-02-17 09:24:20 -05:00
  • 1ce5fe2bd8 fixes jetpack not having a sprite after being upgraded LetterJay 2017-02-17 00:07:11 -06:00
  • a5e688b25d Adds Kinkmate back into the server (#231) TaxMaster 2017-02-16 18:59:45 -06:00
  • 51a8dfe5db Merge pull request #232 from LetterJay/master LetterJay 2017-02-16 09:41:38 -05:00
  • 7c7b81e3b8 removes flightsuit from fab LetterJay 2017-02-16 08:34:24 -06:00
  • fc2dbcd9fe Tg port 2 15 (#230) Poojawa 2017-02-15 03:35:32 -06:00
  • fd3923d684 Antag fix (#228) LetterJay 2017-02-15 02:44:23 -05:00
  • 412701b864 shuttle tweak, splashscreen fix (#227) LetterJay 2017-02-15 02:44:00 -05:00
  • abc3edb45c Add vg clothing to the vending machines (#221) TaxMaster 2017-02-15 01:43:45 -06:00
  • 709490308e adds a martyr check for escaping LetterJay 2017-02-14 05:31:25 -06:00
  • 06eb1517c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-02-14 04:52:59 -06:00
  • 3f3f5c3242 shuttle tweak, splashscreen fix LetterJay 2017-02-14 04:49:47 -06:00
  • 84350d3417 fixes travis' shit (#226) Poojawa 2017-02-14 04:28:51 -06:00
  • 06e7edcb4a Merge pull request #224 from LetterJay/master LetterJay 2017-02-14 02:33:55 -05:00
  • 3750d0260f Merge pull request #225 from LetterJay/aliens LetterJay 2017-02-14 02:33:46 -05:00
  • e649b81cc1 adds tongues to alien butcher loot tale LetterJay 2017-02-13 09:00:43 -06:00
  • c71f9dac06 cleanup LetterJay 2017-02-13 06:42:30 -06:00
  • 1cc9e33c08 Delete Empty.txt LetterJay 2017-02-13 06:20:28 -06:00
  • 8bf89d880f slime/jelly are immune to stepping on glass shards LetterJay 2017-02-13 06:19:26 -06:00
  • e7c792e2c6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-02-12 22:43:33 -06:00
  • e7e9f69ac6 how am formatting?? (#223) Poojawa 2017-02-12 22:40:18 -06:00
  • 1d1b69bd4e AAAAAAAAAAAAAAAAAAAAA (#222) Poojawa 2017-02-12 21:19:17 -06:00
  • e1ca343edd Update .travis.yml LetterJay 2017-02-12 09:19:03 -06:00
  • d2aa5dd6cf Update .travis.yml LetterJay 2017-02-12 09:12:14 -06:00
  • 62e45a860e testing LetterJay 2017-02-12 08:56:29 -06:00
  • eee427f4b4 magboot hotfix (#218) Poojawa 2017-02-12 08:48:24 -06:00
  • 00436e7495 Gibber and fixes (#217) Poojawa 2017-02-12 07:55:49 -06:00
  • 6674f9fc15 Tg 2 11 sync (#215) Poojawa 2017-02-12 03:56:14 -06:00
  • 30b3dff395 Adds Maintenance Bar+ (#212) TalkingCactus 2017-02-12 04:52:15 -05:00
  • 6a4c8eb493 Port VGs clothing to the server. (#213) TaxMaster 2017-02-12 03:49:26 -06:00
  • 449614df96 Actually cleans up un-needed files. (#210) Poojawa 2017-02-08 22:35:56 -06:00
  • 513d98f724 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-02-08 19:24:54 -06:00
  • b2a4de328b sql_message_system.dm update LetterJay 2017-02-08 19:24:09 -06:00
  • b340a87ebc Merge pull request #209 from LetterJay/master LetterJay 2017-02-08 08:45:23 -05:00
  • af068d8ff4 shuttle autocall @ 3 hours LetterJay 2017-02-08 07:37:57 -06:00
  • a5ba49d11b titlescreen fix LetterJay 2017-02-08 07:14:10 -06:00
  • 4cc31d776c Merge pull request #208 from Poojawa/runtime-fixers LetterJay 2017-02-08 02:02:46 -05:00
  • dfb3df1583 reverts save file version bullshit Poojawa 2017-02-08 00:54:48 -06:00
  • 3f8df133d8 other things I missed Poojawa 2017-02-08 00:49:31 -06:00
  • d0f50d5488 other things I missed. oops Poojawa 2017-02-08 00:38:26 -06:00
  • 883ebad540 mob fixes Poojawa 2017-02-08 00:27:04 -06:00
  • 68bad60a1c admin modules Poojawa 2017-02-08 00:17:48 -06:00
  • f49c0c0268 some modules things Poojawa 2017-02-08 00:06:03 -06:00
  • 01ed369034 game folder Poojawa 2017-02-08 00:02:05 -06:00
  • f6dfa820fd onclick and datums Poojawa 2017-02-07 23:55:43 -06:00
  • 06e49c2df3 define things and soapstone strings Poojawa 2017-02-07 23:52:33 -06:00
  • 657684c1b7 Merge pull request #207 from LetterJay/master LetterJay 2017-02-08 00:33:10 -05:00
  • 463bcc2f31 runtime cleanup! LetterJay 2017-02-07 23:30:59 -06:00
  • ceebde6620 Revert "sync" LetterJay 2017-02-07 23:21:03 -06:00
  • 84f36e3496 adds missing shark overlay LetterJay 2017-02-07 18:05:38 -06:00
  • b24808f39a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-02-07 17:50:29 -06:00
  • 356abcd2e5 Species whitelist (#206) Poojawa 2017-02-07 10:36:32 -06:00
  • a432886ba3 sync LetterJay 2017-02-07 00:58:30 -06:00
  • cdea2c6766 Adds Arousal as a Damage Type (#204) TalkingCactus 2017-02-07 00:57:29 -05:00
  • fc18933fc8 return of the station alarms (#205) Poojawa 2017-02-06 21:42:22 -06:00
  • 17dac7f0b5 Species markings (#203) Poojawa 2017-02-06 04:57:48 -06:00
  • feb600fdc1 taur peets (#202) Poojawa 2017-02-06 02:40:28 -06:00
  • 73b6b33f79 TG sync Sunday (#201) Poojawa 2017-02-06 00:36:56 -06:00
  • aeeca195c7 Vore fixes (#200) Poojawa 2017-02-05 05:11:42 -06:00
  • 3dd2e8b07b Adds mentor tables to schema (#199) Poojawa 2017-02-05 00:16:35 -06:00
  • 94fea66343 Fixes Taurs with one weird tip (#198) Poojawa 2017-02-04 23:08:37 -06:00
  • 0a1927ce1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-02-04 10:35:30 -06:00
  • 18e597bcb0 runtime cleanup LetterJay 2017-02-04 10:35:14 -06:00
  • 728e3a50f3 Merge pull request #197 from LetterJay/master LetterJay 2017-02-04 11:29:14 -05:00
  • 7725248097 maint access during radstorms LetterJay 2017-02-04 10:23:27 -06:00
  • a0af65593d Merge pull request #196 from Poojawa/tails-and-taurs LetterJay 2017-02-04 11:22:26 -05:00
  • 1b6f0e4d34 Merge branch 'master' into tails-and-taurs LetterJay 2017-02-04 11:22:16 -05:00
  • 1584bd105d Merge pull request #195 from LetterJay/master LetterJay 2017-02-04 11:11:17 -05:00
  • 63a848b1b5 shuttle auto call LetterJay 2017-02-04 10:10:31 -06:00
  • 69bc9f5758 AAAAAAAAA Poojawa 2017-02-04 04:53:31 -06:00
  • 9b0f9af80a Shifting snowflake to other file Poojawa 2017-02-04 02:05:34 -06:00
  • 2ebea80af0 So I don't have to keep throwing out tweaks Poojawa 2017-02-04 00:03:07 -06:00
  • 7b7047f9b0 Tail wagging is fixed boys and girls Poojawa 2017-02-03 22:57:52 -06:00
  • c8f01869e3 hawks, capras, and donation item LetterJay 2017-02-03 13:55:38 -06:00
  • 0fcb126658 Wagging tails emote (#194) Poojawa 2017-02-03 11:02:12 -06:00
  • 1016dba90a Simple mob nom (#193) Poojawa 2017-02-03 09:43:32 -06:00
  • f7c09077d2 Tg patch branch to master (#192) TalkingCactus 2017-02-03 06:56:14 -05:00
  • 7735dec0ec Update .travis.yml LetterJay 2017-01-26 08:13:25 -06:00
  • 87ad05ffe1 Merge pull request #154 from Verkister/master LetterJay 2017-01-16 21:06:17 -05:00
  • b993fdea3a Small fixes for dogborgs and sprite accessories: -Ported the hidden snippets of the dogborg code. -Reset module now resets pixel offset and icon directory again. (broke shit when reseting from dogborg) -Medihound belly fixed. -Husky body marking tweaked to not overlap arms in side view. -Added husky ears that are basically wolf ears that use secondary color instead. Verkister 2017-01-16 21:30:45 +02:00
  • 74acdb06c6 Merge pull request #145 from Citadel-Station-13/revert-89-G-A-S-G-A-S-G-A-S LetterJay 2017-01-13 00:05:13 -05:00
  • cb32f2d075 Revert "Wizard Pontiac Firebird AKA Wizmobile port" LetterJay 2017-01-12 23:04:54 -06:00
  • f30395610c Merge pull request #143 from Roland410/cultfix LetterJay 2017-01-12 23:33:46 -05:00
  • 1492d5eb61 Removed "s" from invokers Roland Forgo 2017-01-13 00:24:20 +01:00
  • 455fdaf581 Totally professional fix to one word. Roland Forgo 2017-01-13 00:21:00 +01:00
  • 034854d83f Merge pull request #138 from Roland410/cultchange LetterJay 2017-01-12 16:35:34 -05:00
  • c16fdcf696 Merge pull request #89 from unusualcrow/G-A-S-G-A-S-G-A-S LetterJay 2017-01-12 16:32:41 -05:00
  • ad98d9027f Merge pull request #123 from unusualcrow/boomtweak LetterJay 2017-01-12 16:32:28 -05:00
  • 19d8d0ab9e Merge pull request #136 from Verkister/master LetterJay 2017-01-12 16:32:09 -05:00
  • f921b8fa08 Merge pull request #121 from unusualcrow/solarflare LetterJay 2017-01-12 16:31:50 -05:00
  • 5076d1989b Changes Nar'Sie cult conversion to only need one cultist. Roland Forgo 2017-01-10 12:11:52 +01:00
  • ccb9d9d01b Minor sprite accessory update: -Fixed snout layering. -Added snouts for wolf and husky. -Added body markings: hands/feet, belly/hands/feet, slim belly, and husky. -Swapped base and extra color layers on husky tail to match the added parts. -Removed unnecessary clutter. Verkister 2017-01-08 19:27:04 +02:00
  • 179b877b6e Merge pull request #116 from unusualcrow/ok-whats-going-on-here LetterJay 2017-01-07 13:42:14 -05:00
  • 655b4311cb Merge pull request #134 from LetterJay/master LetterJay 2017-01-06 13:39:41 -05:00
  • 51ee90893f changed a few things so the antag counts aren't unbalanced. LetterJay 2017-01-06 12:36:06 -06:00
  • 83ec62e40b gamemode tweaks minimap fix LetterJay 2017-01-06 11:46:55 -06:00
  • b3a7f808d7 Merge pull request #119 from LetterJay/master LetterJay 2017-01-01 20:44:25 -05:00
  • 19549fcbbd ya unusualcrow 2016-12-29 14:49:52 -05:00
  • e3d39e7ccb nice unusualcrow 2016-12-29 14:48:55 -05:00
  • 925f918e9b aaaaa unusualcrow 2016-12-29 14:43:51 -05:00