Commit Graph

  • 1b164e1e1e Update pool_controller.dm kevinz000 2020-01-27 22:25:16 -07:00
  • bc05819cee Update pool_drain.dm kevinz000 2020-01-27 22:23:21 -07:00
  • 171d50caff Update sharks.dm kevinz000 2020-01-27 22:22:34 -07:00
  • 0157371a15 Update pool_drain.dm kevinz000 2020-01-27 22:21:12 -07:00
  • b742229539 Update pool.dm kevinz000 2020-01-27 22:20:10 -07:00
  • 74d0fe2770 fixes spacemen going at lightspeed on local/testing servers deathride58 2020-01-28 00:18:54 -05:00
  • 7171b661d1 Adds cosmic bedsheet to loadout for donator Jay 2020-01-27 22:15:00 -06:00
  • 9d047f07f8 separate this a bit kevinz000 2020-01-27 21:08:47 -07:00
  • 57b977c2e5 why kevinz000 2020-01-27 20:41:45 -07:00
  • 7d53d6e162 s kevinz000 2020-01-27 20:24:02 -07:00
  • cfd65d812a Makes gender change potion not work on people with pref Putnam 2020-01-27 19:13:50 -08:00
  • 8df9a051ec it compiles now, ready for testmerge probs Putnam 2020-01-27 19:09:04 -08:00
  • bef55b54b0 Automatic changelog generation for PR #10709 [ci skip] CitadelStationBot 2020-01-27 21:06:04 -06:00
  • 2bf27e84e6 Merge pull request #10709 from Seris02/mammaltoxin Ghom 2020-01-28 04:06:01 +01:00
  • bc0297f504 Automatic changelog generation for PR #10706 [ci skip] CitadelStationBot 2020-01-27 21:02:15 -06:00
  • 209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530 Putnam3145 2020-01-27 19:02:13 -08:00
  • e860110771 Ruskie battle hats in box maint, get some (their armor is fairly weak) Ghommie 2020-01-28 03:55:30 +01:00
  • 362f0e57a4 Giving a hand. Ghom 2020-01-28 03:24:39 +01:00
  • 13d9509610 removes backup KathrinBailey 2020-01-28 02:24:32 +00:00
  • bc7c28a62f removes improvements KathrinBailey 2020-01-28 02:22:56 +00:00
  • 5883124e0d Removals. Winter Flare 2020-01-27 20:47:28 -05:00
  • 5875f2578c demodularize and removes lot of unused clothing with missing sprites. Ghommie 2020-01-28 02:32:46 +01:00
  • 24388f4fc1 Reverts Path changes. Winter Flare 2020-01-27 20:30:06 -05:00
  • 6877a965f6 Automatic changelog generation for PR #10743 [ci skip] CitadelStationBot 2020-01-27 19:18:35 -06:00
  • f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT Ghom 2020-01-28 02:18:32 +01:00
  • 7ae43a2249 fix kevinz000 2020-01-27 17:51:59 -07:00
  • c665d971c0 Update misc.dm kevinz000 2020-01-27 17:45:35 -07:00
  • 91e8bec81a woops kevinz000 2020-01-27 17:45:13 -07:00
  • a52bfb13ad Automatic changelog generation for PR #10737 [ci skip] CitadelStationBot 2020-01-27 18:44:23 -06:00
  • 5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531 kevinz000 2020-01-27 17:44:20 -07:00
  • ed1f9be2a8 Automatic changelog generation for PR #10742 [ci skip] CitadelStationBot 2020-01-27 18:43:49 -06:00
  • 3055c2b4c1 Merge pull request #10742 from Ghommie/Ghommie-cit532 kevinz000 2020-01-27 17:43:46 -07:00
  • 28697a375f Update item_attack.dm kevinz000 2020-01-27 17:43:21 -07:00
  • 0eb13d8f23 refactors guns a bit kevinz000 2020-01-27 17:39:49 -07:00
  • 6e7d079928 Changed Dirty Mags and Candle Winter Flare 2020-01-27 19:34:33 -05:00
  • e50eb495df pre attack refactor kevinz000 2020-01-27 16:30:23 -07:00
  • 402abd9287 Merge branch 'god_wish_your_plushies_holy_shit' of github.com-kevinz000:kevinz000/Citadel-Station-13 into god_wish_your_plushies_holy_shit kevinz000 2020-01-27 15:48:14 -07:00
  • 54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS kevinz000 2020-01-27 13:19:53 -07:00
  • 0ed72c7722 Merge pull request #10692 from Citadel-Station-13/TESTING Ghom 2020-01-27 21:06:52 +01:00
  • 675e6cb9a6 Reunites Shaggy (hair from virgo) with Scooby Terrowin CygnusB 2020-01-27 15:51:38 -03:00
  • 6258e07213 Automatic changelog generation for PR #10733 [ci skip] CitadelStationBot 2020-01-27 10:35:02 -06:00
  • 5dc92f3968 Merge pull request #10733 from Hatterhat/fine-i'll-do-it-myself Ghom 2020-01-27 17:34:58 +01:00
  • 443239fb7c updates changlog TrilbySpaceClone 2020-01-27 11:16:29 -05:00
  • 5bc590ad52 Merge branch 'master' into cargocratetglass Winter Flare 2020-01-27 08:03:30 -05:00
  • 21fe8be5dc Mmmmm, more crates. Winter Flare 2020-01-27 07:00:40 -05:00
  • 68227dcdb1 Update misc.dm kevinz000 2020-01-27 03:53:50 -07:00
  • fa2cc0cfdf adds kevinz000 2020-01-27 03:39:27 -07:00
  • 74fb726b8d Update traitor_bro.dm kevinz000 2020-01-27 03:27:09 -07:00
  • 1c528062b5 updates readme Letter N 2020-01-27 18:05:48 +08:00
  • 1e19ec2c50 bad var kevinz000 2020-01-27 02:59:27 -07:00
  • 4883b36576 compile kevinz000 2020-01-27 02:55:32 -07:00
  • d4d315b447 :^) kevinz000 2020-01-27 02:51:01 -07:00
  • f145dd1730 correct door to vault being all access TrilbySpaceClone 2020-01-27 02:31:19 -05:00
  • d5d0a7d7ba Update capture_the_flag.dm kevinz000 2020-01-26 22:16:18 -07:00
  • 2c1b63cdb9 Update capture_the_flag.dm kevinz000 2020-01-26 22:07:49 -07:00
  • d17472b8f2 Update species.dm kevinz000 2020-01-26 22:00:19 -07:00
  • f9ee9bdadf Update capture_the_flag.dm kevinz000 2020-01-26 21:54:23 -07:00
  • 5e10d297e1 Automatic changelog generation for PR #10703 [ci skip] CitadelStationBot 2020-01-26 22:45:06 -06:00
  • 1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark Ghom 2020-01-27 05:45:03 +01:00
  • 5b04936d96 Automatic changelog generation for PR #10711 [ci skip] CitadelStationBot 2020-01-26 22:39:02 -06:00
  • 6567f9dd0d Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8 Ghom 2020-01-27 05:38:59 +01:00
  • 74cd89bad6 Automatic changelog generation for PR #10722 [ci skip] CitadelStationBot 2020-01-26 22:37:56 -06:00
  • 9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief Ghom 2020-01-27 05:37:53 +01:00
  • e5a8c7801e tweak kevinz000 2020-01-26 21:26:54 -07:00
  • 8f26325822 more stuff kevinz000 2020-01-26 21:05:51 -07:00
  • 7b49d4842a Fire alarms. Ghom 2020-01-27 05:05:08 +01:00
  • 233aeaa456 removed some suggested bad possible contraband Putnam 2020-01-26 19:03:09 -08:00
  • 4bcf2a60c3 missing pipe r4d6 2020-01-26 21:57:54 -05:00
  • 968e4a91b7 Two manifolds were invisible r4d6 2020-01-26 21:57:10 -05:00
  • ad55c7235d I knew I forgot something r4d6 2020-01-26 21:21:26 -05:00
  • 09448b86e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines r4d6 2020-01-26 20:58:37 -05:00
  • 4884165d4f Add TEG, Code & config r4d6 2020-01-26 20:58:16 -05:00
  • 52b1f63941 Literally just kills spinfusors necromanceranne 2020-01-27 12:32:40 +11:00
  • 5e7b7143de Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons necromanceranne 2020-01-27 11:48:56 +11:00
  • 92398ae354 Why am I having such trouble with a fucking SPAN CLASS ShadeAware 2020-01-26 19:46:30 -05:00
  • f7373ae40d WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE ShadeAware 2020-01-26 19:42:21 -05:00
  • e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup Seris02 2020-01-27 08:33:38 +08:00
  • 0d1e458e9c yuh Seris02 2020-01-27 08:32:45 +08:00
  • fffea32a59 Lets the user know they improved their switchblade. ShadeAware 2020-01-26 19:26:58 -05:00
  • b6998a0b56 Fixes det revolver being riiiisky. Ghommie 2020-01-27 00:44:25 +01:00
  • 8e489a7726 Hopefully I put in the override correctly necromanceranne 2020-01-27 10:41:27 +11:00
  • 27cd7745ed Merge pull request #10714 from Citadel-Station-13/kevinz000-patch-9 Ghom 2020-01-27 00:14:32 +01:00
  • 2cd6ed5f26 REEEE STRAY SLASHES ShadeAware 2020-01-26 16:31:00 -05:00
  • 732dd8a3bb Hmm, today I will forget quotes on my strings. ShadeAware 2020-01-26 16:11:22 -05:00
  • f59a9d0009 aight bet kevinz000 2020-01-26 14:05:15 -07:00
  • 2adb981832 Welp. Ghommie 2020-01-26 22:04:46 +01:00
  • b4ee518945 Merge pull request #10725 from Putnam3145/fix-rotation kevinz000 2020-01-26 14:04:31 -07:00
  • 9b149244b0 Ok here we go. Ghommie 2020-01-26 21:56:31 +01:00
  • 7471f59bc3 ignore eligibility checks kevinz000 2020-01-26 13:56:04 -07:00
  • e75807430b Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting ShadeAware 2020-01-26 15:53:37 -05:00
  • f5b60b52bf fuck woops kevinz000 2020-01-26 13:51:10 -07:00
  • 2c8d12aa37 Make people actually able to speak dwarf r4d6 2020-01-26 15:50:13 -05:00
  • a89cd796d4 emergency shuttle console spam limiter. Ghommie 2020-01-26 21:33:36 +01:00
  • 41f9669a83 Update other_reagents.dm kevinz000 2020-01-26 13:29:55 -07:00
  • 9292ff1972 Update damage_procs.dm kevinz000 2020-01-26 13:27:54 -07:00
  • c49da64f07 <3 google kevinz000 2020-01-26 13:24:51 -07:00
  • 31dd1bc69f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarven_Language r4d6 2020-01-26 14:23:16 -05:00
  • ac84ad803a Add dwarf language r4d6 2020-01-26 14:22:21 -05:00
  • 41ee00b7df Refactoring APTFT altclick/verb options into flags Ghommie 2020-01-26 18:53:16 +01:00
  • 17ea82afd6 Update vr_sleeper.dm Ghom 2020-01-26 17:25:24 +01:00