Commit Graph

28981 Commits

Author SHA1 Message Date
Putnam cfd65d812a Makes gender change potion not work on people with pref 2020-01-27 19:13:50 -08:00
CitadelStationBot 45ad9bc77d Automatic changelog generation for PR #10718 [ci skip] 2020-01-25 16:31:14 -06:00
Putnam3145 a08cd7c046 Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
2020-01-25 14:31:11 -08:00
r4d6 d5c09f11bc Fix 2020-01-25 17:23:00 -05:00
CitadelStationBot f7cee23a25 Automatic changelog generation for PR #10691 [ci skip] 2020-01-25 09:08:34 -06:00
kevinz000 c0b7541e62 Merge pull request #10691 from Seris02/mentorfix
very very tentative fix for the make mentor button
2020-01-25 08:08:32 -07:00
CitadelStationBot 510ea88ae6 Automatic changelog generation for PR #10688 [ci skip] 2020-01-25 08:32:24 -06:00
Ghom db8abcd7fb Merge pull request #10688 from Citadel-Station-13/kevinz000-patch-1
Fixes SOME of the problems with hilbert hotel
2020-01-25 15:32:21 +01:00
Ghom 4b6a601af7 Merge pull request #10646 from Poojawa/blindvorefixnumber244
Resolves Minor issues with vore code
2020-01-25 15:27:12 +01:00
CitadelStationBot a71aed638a Automatic changelog generation for PR #10698 [ci skip] 2020-01-25 08:25:29 -06:00
Ghom 00667eeecd Merge pull request #10698 from Putnam3145/ghost-dojo-ban
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
2020-01-25 15:25:26 +01:00
kevinz000 2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
kevinz000 f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
kevinz000 a5404f6063 Merge pull request #10687 from Ghommie/Ghommie-cit523
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
kevinz000 72cfd35438 Merge pull request #10684 from Ghommie/Ghommie-cit521
fix for hypospray jank.
2020-01-25 05:53:42 -07:00
CitadelStationBot 0d1dbedf56 Automatic changelog generation for PR #10683 [ci skip] 2020-01-25 06:53:29 -06:00
kevinz000 72a8096137 Merge pull request #10683 from Ghommie/Ghommie-cit520
A few consistencies for those "shoes" that don't actually cover feet.
2020-01-25 05:53:26 -07:00
CitadelStationBot d6c7e1122d Automatic changelog generation for PR #10682 [ci skip] 2020-01-25 06:53:10 -06:00
kevinz000 26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519
Ports "Makes falsewall hide pipes and wires"
2020-01-25 05:53:07 -07:00
Putnam3145 b8a0d0545f Merge pull request #10708 from Citadel-Station-13/kevinz000-patch-7
rogue infinite loop eating performance yeehaw
2020-01-25 01:13:15 -08:00
kevinz000 a4c5975b7d Update fail2topic.dm 2020-01-25 02:03:39 -07:00
CitadelStationBot 9181a4aee0 Automatic changelog generation for PR #10693 [ci skip] 2020-01-24 21:08:13 -06:00
Ghom 8983f89a75 Merge pull request #10693 from Seris02/conveyorbetterness
makes conveyor directions a bit easier to see
2020-01-25 04:08:11 +01:00
CitadelStationBot 7c11218553 Automatic changelog generation for PR #10670 [ci skip] 2020-01-24 17:16:06 -06:00
kevinz000 d502f6d6a8 Merge pull request #10670 from Seris02/sneezingnope
stops sneezing, sniffing, coughing, etc from doing anything if the affected person doesn't breathe
2020-01-24 16:16:03 -07:00
kevinz000 ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
CitadelStationBot 518345843d Automatic changelog generation for PR #10680 [ci skip] 2020-01-24 17:15:30 -06:00
kevinz000 147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
2020-01-24 16:15:27 -07:00
CitadelStationBot 8ee31d2686 Automatic changelog generation for PR #10677 [ci skip] 2020-01-24 17:14:52 -06:00
kevinz000 afe8e00bdf Merge pull request #10677 from Ghommie/Ghommie-cit515
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
2020-01-24 16:14:49 -07:00
CitadelStationBot e3e849fc68 Automatic changelog generation for PR #10674 [ci skip] 2020-01-24 17:14:35 -06:00
kevinz000 ea9513864d Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
Ghom 2884bbdc23 I'm exiting this code. 👀 2020-01-24 22:15:33 +01:00
Ghom ba50b4a851 Risky web edit, disgusting contents. 2020-01-24 22:13:55 +01:00
Ghommie 6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
CitadelStationBot 0817639139 Automatic changelog generation for PR #9905 [ci skip] 2020-01-24 11:46:29 -06:00
Ghom d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
Putnam 11b5881721 wait no this should be 2 2020-01-24 09:15:43 -08:00
Putnam 0493db0ac6 allowed dojo banning, made dojo mobs dust upon leaving 2020-01-24 09:11:33 -08:00
CitadelStationBot d7dd5e694a Automatic changelog generation for PR #10676 [ci skip] 2020-01-24 09:39:14 -06:00
Ghom f5d8e447eb Merge pull request #10676 from Kraseo/virgohairs
Reorganises/fixes virgo hairs
2020-01-24 16:39:10 +01:00
CitadelStationBot 9305919461 Automatic changelog generation for PR #10630 [ci skip] 2020-01-24 09:23:31 -06:00
Ghom 9013c7aa9c Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17
Nerfs cloning
2020-01-24 16:23:28 +01:00
Seris02 17c1d649a6 makes conveyor directions a bit easier to see 2020-01-24 18:27:05 +08:00
Seris02 10ef39d1e3 maybe it'll work 2020-01-24 16:33:20 +08:00
CitadelStationBot 763f2ad521 Automatic changelog generation for PR #10650 [ci skip] 2020-01-24 01:33:00 -06:00
kevinz000 f626322fbd Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
2020-01-24 00:32:57 -07:00
CitadelStationBot 9cbe0b5bc1 Automatic changelog generation for PR #10628 [ci skip] 2020-01-24 01:26:25 -06:00
kevinz000 928a8ceea3 Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1
Quick rubber toolbox materials fix.
2020-01-24 00:26:22 -07:00
CitadelStationBot 8030a9f861 Automatic changelog generation for PR #10073 [ci skip] 2020-01-24 01:25:56 -06:00