Commit Graph

28647 Commits

Author SHA1 Message Date
Putnam3145 639630b4fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into reenable-tests 2021-07-27 19:05:00 -07:00
Lin 560dc048cf Merge pull request #14954 from Putnam3145/poor-fastmos
Poor man's fastmos: just do diffusion faster 4head (+ auxmos update)
2021-07-26 15:09:43 -05:00
Lin b1bdc8bf99 Merge pull request #14967 from Putnam3145/fix-space-loop-lord
Makes HE pipe min temp diff 0.01 instead of 20
2021-07-26 15:09:06 -05:00
Putnam3145 f8335f34f9 just removes the multi-surgery test for now. 2021-07-25 20:26:32 -07:00
Putnam3145 52d6828881 please. 2021-07-25 20:15:06 -07:00
Putnam3145 cbdcf4dfa5 we don't have tinker_nanites 2021-07-25 20:04:57 -07:00
Putnam3145 9a62fed735 /proc/ 2021-07-25 19:55:48 -07:00
Putnam3145 95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00
Putnam3145 cd2a710a23 there's too many errors caused by these two 2021-07-25 19:36:23 -07:00
Putnam3145 23bf72c29f stop doing this. 2021-07-25 19:18:33 -07:00
Putnam3145 bba0ba2c7c some more unit test fixes 2021-07-25 19:09:19 -07:00
Putnam3145 975582380b always search when you change paths 2021-07-25 18:52:01 -07:00
Putnam3145 ebb8d278a1 Runtime fix; need to update auxmos or it's lies 2021-07-25 18:45:17 -07:00
Putnam3145 f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
Putnam3145 765dea059c added bee's paranoid auxmos function
cause it's necessary
2021-07-25 18:08:40 -07:00
Putnam3145 664c2a0a83 better erroring when auxtools not found 2021-07-25 17:10:07 -07:00
Lin 0066fc6755 Merge pull request #14959 from Citadel-Station-13/table-floodfills
rewrites subtler_around_table to be slightly cleaner and (probably) work?
2021-07-25 13:56:35 -07:00
SandPoot ab039ecbfb Update vorepanel.dm 2021-07-23 18:16:07 -03:00
Lin 8105a3c692 Merge pull request #14960 from Putnam3145/hallucination-tweaks
Some hallucination tweaks
2021-07-23 11:41:03 -07:00
Putnam3145 4b310cc354 Makes HE pipe min temp diff not so low 2021-07-22 20:12:00 -07:00
Lin 01ed21bb92 Merge pull request #14874 from Citadel-Station-13/silicons-patch-41
slight baton powercreep tweak (5 --> 3.5 seconds rmb cooldown, 35 --> 40 damage)
2021-07-22 00:53:53 -07:00
silicons 224fb7f22c Update tables_racks.dm 2021-07-21 21:34:10 -07:00
silicons d38a775a16 Update tables_racks.dm 2021-07-21 21:33:46 -07:00
Putnam3145 90bc48f579 Some hallucination tweaks 2021-07-20 22:49:08 -07:00
silicons 16622ac95a Update tables_racks.dm 2021-07-20 18:06:49 -07:00
silicons 1044ea6ae9 Update say_vr.dm 2021-07-20 18:00:36 -07:00
Putnam3145 f6de147ece Auxmos update + speed tweaks 2021-07-18 18:11:13 -07:00
silicons 3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons bb337b92dd Merge pull request #14946 from timothyteakettle/cow-tail
anthros can now select the cow tail
2021-07-18 15:07:36 -07:00
silicons 24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
silicons b0c53fcc57 Merge pull request #14947 from Arturlang/crafting_fixes
Crafting menu cleaning up
2021-07-18 15:07:12 -07:00
silicons 91cdc7c13f Merge pull request #14949 from MrJWhit/oom-fix-port
Port of "[s] Fixes a major memory leak in shuttle code (KILO IS FREE)"
2021-07-18 15:07:01 -07:00
silicons 7847f6b69c Merge pull request #14916 from WanderingFox95/WanderingFox95-clearcatsurgeonannouncement
[Ready] Another Cat Surgeon Announcement PR? It's more likely than you think!
2021-07-18 15:06:48 -07:00
silicons 89d0c590e6 Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
Custom Kegs
2021-07-18 15:06:30 -07:00
silicons 5895eb0d31 Merge pull request #14926 from YakumoChen/human-leather-hats
Human leather hats
2021-07-18 15:06:22 -07:00
silicons 093df245b3 Merge pull request #14930 from keronshb/mirroromenport
Ports Breaking a mirror now gives you a bad omen
2021-07-18 15:06:03 -07:00
silicons 7cd89978f2 Merge pull request #14933 from keronshb/stripdcport
[PORT]  Stripping a disconnected player will tell them when they come back (+Lazynull)
2021-07-18 15:05:48 -07:00
silicons 9d741fc81c Merge pull request #14941 from SandPoot/vore
Vore additions/update
2021-07-18 15:05:33 -07:00
silicons d9b70b1f1c woo 2021-07-18 15:04:30 -07:00
silicons 0df58c878e more 2021-07-18 14:01:43 -07:00
Lin 4a7e6e5b00 Merge pull request #14945 from timothyteakettle/plant
fixes photosynthesis stopping nutrition going past well fed from non-photosynthesis means
2021-07-17 09:50:20 -07:00
MrJWhit 1c1fac3f06 Update change_turf.dm 2021-07-16 15:10:39 -04:00
SandPoot b5b033e43e Update bellymodes.dm
oops
2021-07-16 15:07:11 -03:00
Artur 5abace9e8c wrong letter and unneceseary variable 2021-07-16 15:22:49 +03:00
Artur b71a6497e8 Crafting menu fixes and such
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
2021-07-16 03:23:02 +03:00
SandPoot 6445cfdd9d Removes spontaneous vore and reorganizes buttons 2021-07-15 17:32:03 -03:00
Timothy Teakettle e9c7d61dc3 Update tails.dm 2021-07-15 19:13:56 +01:00
Timothy Teakettle 07fec51d92 fix 2021-07-15 16:44:48 +01:00
WanderingFox95 2e88a10ca6 Recipe 2021-07-15 01:50:44 +02:00
WanderingFox95 6ed0d699e9 keg code, far away from kegs
cause it's just a big barrel that doesn't ferment anything.
2021-07-15 01:50:01 +02:00