Commit Graph

  • 91b38cd0a7 Fixes Tequila Sunrise naming CitadelStationBot 2018-05-04 06:50:43 -05:00
  • 66f05776e6 Fixes Tequila Sunrise naming (#37657) PoeticIron 2018-05-04 21:49:59 +10:00
  • f4940bb316 fixes a sentence ot spelled correctly. CitadelStationBot 2018-05-04 06:50:35 -05:00
  • a00364268e ot dealing with bad grammar today (#37637) Armhulen 2018-05-04 04:50:20 -07:00
  • 49e46eea5b Some dbadmin fixes Jordie 2018-05-04 20:14:35 +10:00
  • 5f339b73e7 Fixes mousetraps not going off from being dumped out CitadelStationBot 2018-05-04 04:43:13 -05:00
  • 4a7fae664e Fixes mousetraps not going off from being dumped out (#37447) kevinz000 2018-05-04 02:42:55 -07:00
  • 48433fa6df Fixes Several Machines Materials Insertion CitadelStationBot 2018-05-04 04:40:56 -05:00
  • f5031bc4f7 Fixes Several Machines Materials Insertion (#37432) Fox McCloud 2018-05-04 05:40:46 -04:00
  • f27088a346 Merge pull request #6639 from deathride58/fuckinmetagamers LetterJay 2018-05-03 20:36:15 -05:00
  • 288c61b1c1 obfuscates the gamemode in topic() calls deathride58 2018-05-03 21:14:15 -04:00
  • 4300ae4931 slighty upgrades the medbeam CitadelStationBot 2018-05-03 19:14:32 -05:00
  • 9533779be7 slighty upgrades the medbeam (#37451) Tlaltecuhtli 2018-05-04 02:13:27 +02:00
  • 4f6abff0c3 constant chip fix CitadelStationBot 2018-05-03 19:13:21 -05:00
  • 66f79a61c4 constant chip fix (#37636) Trevor Serpas 2018-05-03 19:12:26 -05:00
  • b5a95e9da8 Makes more messages pronoun sensitive ShizCalev 2018-05-03 18:45:55 -04:00
  • d574fc5590 Merge pull request #6622 from Citadel-Station-13/upstream-merge-37289 CitadelStationBot 2018-05-03 09:07:59 -05:00
  • 4dc647d8ff Merge pull request #6626 from Citadel-Station-13/upstream-merge-37595 CitadelStationBot 2018-05-03 09:02:15 -05:00
  • a351edea90 Merge pull request #6625 from Citadel-Station-13/upstream-merge-37414 CitadelStationBot 2018-05-03 09:01:12 -05:00
  • 25b3828100 Merge pull request #6624 from Citadel-Station-13/upstream-merge-37609 LetterJay 2018-05-03 08:54:01 -05:00
  • 71e7b461d5 Merge pull request #6623 from Citadel-Station-13/upstream-merge-37615 LetterJay 2018-05-03 08:52:46 -05:00
  • 04bdddf8d9 You can no longer print infinite ammunition. CitadelStationBot 2018-05-03 08:45:18 -05:00
  • a8a31c9e4b You can no longer print infinite ammunition. (#37626) Dax Dupont 2018-05-03 15:44:32 +02:00
  • 5edf4c86ab Updates infrared emitters to use the rotate component CitadelStationBot 2018-05-03 08:44:01 -05:00
  • 61263daa0b Merge pull request #37625 from ShizCalev/infrared Jordan Brown 2018-05-03 09:42:54 -04:00
  • 0c2f7f3c27 Changes cockroach guts to insect guts CitadelStationBot 2018-05-03 08:42:47 -05:00
  • deddd8debe Merge pull request #37622 from ShizCalev/cockarock Jordan Brown 2018-05-03 09:41:41 -04:00
  • 06c3a58c77 Remove a leftover reference to the gang dominator CitadelStationBot 2018-05-03 08:41:32 -05:00
  • 19140f2cb2 Merge pull request #37620 from AutomaticFrenzy/patch/dominator Jordan Brown 2018-05-03 09:40:31 -04:00
  • 1e901e56c2 Corrects brainwashing surgery program category CitadelStationBot 2018-05-03 08:41:23 -05:00
  • 5c758e2f3a Merge pull request #37621 from ShizCalev/brainwash-uplink-loc Jordan Brown 2018-05-03 09:40:57 -04:00
  • 2d3abdade1 Fixes the tequila sunrise sprite. Jordan Brown 2018-05-03 00:51:11 -04:00
  • c0ab1a3966 deadly brain tumor now gives -3 points CitadelStationBot 2018-05-02 21:24:27 -05:00
  • fa6292dbd5 deadly brain tumor now gives -3 points (#37455) Armhulen 2018-05-02 19:23:44 -07:00
  • efc9680358 Plasmamen organs GET sprites! CitadelStationBot 2018-05-02 21:21:11 -05:00
  • 04057dc7d6 Plasmamen organs GET sprites! (#37595) Armhulen 2018-05-02 19:20:15 -07:00
  • 2702788dac Removes stock market pigeons 2018-05-02 18:47:57 -04:00
  • c23bdf84bb Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) CitadelStationBot 2018-05-02 17:31:22 -05:00
  • d09ae95d42 Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) (#37609) Grandmother of 50 2018-05-02 18:30:23 -04:00
  • 1eadb0a838 Fixes Midori cigs having no nicotine CitadelStationBot 2018-05-02 17:31:14 -05:00
  • 5596472fc1 fixes midori cigs being empty (#37615) Mickyan 2018-05-03 00:30:32 +02:00
  • dee8fec8aa Science can now print off processors as well CitadelStationBot 2018-05-02 16:12:28 -05:00
  • 26fa3e1d12 Update machine_designs.dm (#37289) Grandmother of 50 2018-05-02 17:11:33 -04:00
  • 0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 vuonojenmustaturska 2018-05-02 21:13:41 +03:00
  • 4a7f656823 Adds grenadine. Hyacinth-OR 2018-05-02 11:12:37 -07:00
  • e42cce26da Merge pull request #6619 from Citadel-Station-13/upstream-merge-37538 deathride58 2018-05-02 17:33:41 +00:00
  • 184441eb38 Merge pull request #6078 from Commandersand/LOADOUT deathride58 2018-05-02 17:29:44 +00:00
  • 9f8f630653 Animated Spellbooks CitadelStationBot 2018-05-02 10:35:57 -05:00
  • b71e8718eb Animated Spellbooks (#37538) Nabski89 2018-05-02 10:35:06 -05:00
  • 892cb0a1be Update reverse_bear_trap.dm deathride58 2018-05-02 10:35:31 -04:00
  • 3f50934c92 Update headset.dm deathride58 2018-05-02 10:34:45 -04:00
  • c7ea689679 Update nuclear.dm deathride58 2018-05-02 10:33:50 -04:00
  • e966c95de6 Update monkey.dm deathride58 2018-05-02 10:32:34 -04:00
  • 9a5fd92fb4 Merge pull request #6491 from Citadel-Station-13/upstream-merge-37343 deathride58 2018-05-02 14:29:06 +00:00
  • c3a58dbc2a Merge branch 'master' into upstream-merge-37343 deathride58 2018-05-02 14:28:53 +00:00
  • 5098e0db21 Merge pull request #6490 from Citadel-Station-13/upstream-merge-37381 deathride58 2018-05-02 14:27:25 +00:00
  • f5cbfd1c52 Merge pull request #6577 from Citadel-Station-13/upstream-merge-36839 deathride58 2018-05-02 14:25:32 +00:00
  • d2804694e0 Merge pull request #6618 from Citadel-Station-13/upstream-merge-37606 deathride58 2018-05-02 14:25:14 +00:00
  • 711f309c46 Update suicide.dm deathride58 2018-05-02 10:01:47 -04:00
  • 55566461c6 Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565 deathride58 2018-05-02 13:59:14 +00:00
  • d7c709f5a6 Merge pull request #6616 from Citadel-Station-13/upstream-merge-37035 deathride58 2018-05-02 13:58:29 +00:00
  • 421379ea76 Corrects mistake in storage implant uplink description CitadelStationBot 2018-05-02 08:38:10 -05:00
  • 0a0875e447 Merge pull request #37606 from ShizCalev/storage-implant-uplink-description Jordan Brown 2018-05-02 09:37:32 -04:00
  • b23230293e Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too CitadelStationBot 2018-05-02 01:32:34 -05:00
  • 49150c542f Splits APC attackbys into tool acts, removes some old parts that do nothing and allows crowbars to remove the cell too (#37035) vuonojenmustaturska 2018-05-02 09:32:00 +03:00
  • f35bfa22e4 Merge pull request #6614 from Citadel-Station-13/upstream-merge-37475 deathride58 2018-05-02 01:33:19 +00:00
  • 9151a80461 Merge pull request #6613 from Citadel-Station-13/upstream-merge-37590 deathride58 2018-05-02 01:32:40 +00:00
  • 4d44701ee5 Merge pull request #6612 from Citadel-Station-13/upstream-merge-37580 deathride58 2018-05-02 01:32:01 +00:00
  • 5c40a38457 Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584 deathride58 2018-05-02 01:30:19 +00:00
  • a84f5c5328 Merge pull request #6608 from Citadel-Station-13/upstream-merge-37516 deathride58 2018-05-02 01:30:00 +00:00
  • f248685db2 Merge pull request #6607 from Citadel-Station-13/upstream-merge-37579 deathride58 2018-05-02 01:29:41 +00:00
  • 084f2ac1da Merge pull request #6606 from Citadel-Station-13/upstream-merge-37593 deathride58 2018-05-02 01:29:15 +00:00
  • 5f6673ca4d Merge pull request #6605 from Citadel-Station-13/upstream-merge-37570 deathride58 2018-05-02 01:28:34 +00:00
  • a4b48cdc53 Merge pull request #6604 from Citadel-Station-13/upstream-merge-37562 deathride58 2018-05-02 01:28:05 +00:00
  • 2b8e734488 Merge pull request #6603 from Citadel-Station-13/upstream-merge-37560 deathride58 2018-05-02 01:27:51 +00:00
  • f49c9d7e3d Merge pull request #6602 from Citadel-Station-13/upstream-merge-37561 deathride58 2018-05-02 01:27:26 +00:00
  • 613fadf057 Update _concrete.dm deathride58 2018-05-01 21:27:01 -04:00
  • fa5db57b56 Merge pull request #6600 from Citadel-Station-13/upstream-merge-37568 deathride58 2018-05-02 01:26:27 +00:00
  • 2760c61720 Merge pull request #6599 from Citadel-Station-13/upstream-merge-37572 deathride58 2018-05-02 01:26:05 +00:00
  • 8f00bca017 Merge pull request #6598 from Citadel-Station-13/upstream-merge-37477 deathride58 2018-05-02 01:25:46 +00:00
  • 9c1a4303f9 Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510 deathride58 2018-05-02 01:25:23 +00:00
  • d26ba53e91 Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513 deathride58 2018-05-02 01:25:04 +00:00
  • ea5725cc4e Merge pull request #6595 from Citadel-Station-13/upstream-merge-37549 deathride58 2018-05-02 01:24:36 +00:00
  • 7d01eeeb35 Merge pull request #6593 from Citadel-Station-13/upstream-merge-37556 deathride58 2018-05-02 01:23:19 +00:00
  • dd5669d752 Update suicide.dm deathride58 2018-05-01 21:22:42 -04:00
  • dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349 deathride58 2018-05-02 01:21:37 +00:00
  • 4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501 deathride58 2018-05-02 01:19:58 +00:00
  • 9c41fd5516 Merge pull request #6566 from Citadel-Station-13/upstream-merge-37528 deathride58 2018-05-02 01:19:11 +00:00
  • 97ad0f39a7 Merge pull request #6552 from Citadel-Station-13/upstream-merge-37081 deathride58 2018-05-02 01:17:58 +00:00
  • e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165 deathride58 2018-05-02 01:17:10 +00:00
  • e8f4602716 Update implant.dm deathride58 2018-05-01 21:16:05 -04:00
  • 14a0901bd7 H.O.G.A.N. lawset CitadelStationBot 2018-05-01 15:40:09 -05:00
  • d47b71cf23 Merge pull request #37475 from 81Denton/OH-YEAH-BROTHER Jordan Brown 2018-05-01 16:40:26 -04:00
  • e2a4524b5b Reorganizes cargo's big "miscellaneous supplies" category CitadelStationBot 2018-05-01 15:37:54 -05:00
  • dc9ce0cc6f Merge pull request #37590 from 81Denton/cargo-categories Jordan Brown 2018-05-01 16:38:04 -04:00
  • 7bb7852b77 Craftable HUDsunglasses CitadelStationBot 2018-05-01 15:35:22 -05:00
  • 56bc188abb Merge pull request #37580 from 81Denton/craftable-hudsunglasses Jordan Brown 2018-05-01 16:35:47 -04:00
  • 2fe4591a12 Adds 5 new drinks europax 2018-05-01 21:42:05 +03:00
  • 1398225044 Readds missing nuked narsie cinematic. CitadelStationBot 2018-05-01 11:05:16 -05:00
  • 76302a217e Readds missing nuked narsie cinematic. (#37584) AnturK 2018-05-01 18:04:55 +02:00