Commit Graph
29029 Commits
Author SHA1 Message Date
kevinz000andGitHub 171d50caff Update sharks.dm 2020-01-27 22:22:34 -07:00
kevinz000andGitHub 0157371a15 Update pool_drain.dm 2020-01-27 22:21:12 -07:00
kevinz000andGitHub b742229539 Update pool.dm 2020-01-27 22:20:10 -07:00
kevinz000 0b119cbd52 ok 2020-01-25 23:11:36 -07:00
kevinz000 1b7a7737de reagent drain 2020-01-25 20:28:26 -07:00
kevinz000 f23799e3b4 uhh yeah 2020-01-25 20:25:18 -07:00
kevinz000 acfc7ca41a indestructible 2020-01-25 20:18:05 -07:00
kevinz000 02fe4b7630 this is a bad idea 2020-01-25 20:00:29 -07:00
kevinz000 259b992317 AAAAAAA 2020-01-25 19:56:50 -07:00
kevinz000 72e33d8832 bugfix 2020-01-25 19:46:32 -07:00
kevinz000 dbf69e80db area pool 2020-01-25 19:36:13 -07:00
kevinz000 dc3e5e24fd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 19:36:06 -07:00
kevinz000andGitHub 603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
kevinz000 c5f2eeef3b FUCK 2020-01-25 19:31:57 -07:00
kevinz000 df4ca4b503 do after 2020-01-25 19:29:03 -07:00
Detective Google d034467cb2 adds the pool to the map again 2020-01-25 18:59:46 -06:00
kevinz000 3af72acfb2 compile 2020-01-25 17:26:43 -07:00
kevinz000 ebff6c9f38 compile, jump board crash to ground 2020-01-25 17:25:15 -07:00
kevinz000 19f1eba015 renames 2020-01-25 17:13:11 -07:00
kevinz000 483e1b2757 oh we needed that 2020-01-25 17:10:50 -07:00
kevinz000 443f1716e1 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 17:04:37 -07:00
kevinz000 ec69b9de4d changes 2020-01-25 17:04:07 -07:00
CitadelStationBot 45ad9bc77d Automatic changelog generation for PR #10718 [ci skip] 2020-01-25 16:31:14 -06:00
Putnam3145andGitHub 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
kevinz000andGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
kevinz000andGitHub 2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
kevinz000andGitHub f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
kevinz000andGitHub a5404f6063 Merge pull request #10687 from Ghommie/Ghommie-cit523
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519
Ports "Makes falsewall hide pipes and wires"
2020-01-25 05:53:07 -07:00
Putnam3145andGitHub 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
kevinz000andGitHub 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
GhomandGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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