Commit Graph

26370 Commits

Author SHA1 Message Date
The0bserver 6673779ca2 Hi. Someone needs to fix up circuits. Not me tho. 2020-09-01 06:46:31 -04:00
The0bserver 457cb5e238 THIS IS IT LUIGI! ALL REAGENTS SET! 2020-09-01 06:44:46 -04:00
lolman360 5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
The0bserver 82ffb64268 maybe? 2020-09-01 02:53:29 -04:00
The0bserver a89d6cd125 I hate circuits. They hate change. 2020-09-01 02:47:05 -04:00
The0bserver e36f93baeb Sorry, Circuits. (Only slightly.) 2020-09-01 02:42:43 -04:00
The0bserver 89b837461e This should squash the error. 2020-09-01 02:32:28 -04:00
The0bserver 75854915ee You open the door. There's a green bean. 2020-09-01 02:27:15 -04:00
The0bserver 2c6cfd2115 YOU CAN'T STOP ME FROM DREAMING! 2020-09-01 02:19:37 -04:00
silicons aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
The0bserver d504d45839 Cat Roomba... (Further solidification of instab) 2020-09-01 01:27:22 -04:00
silicons 10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
2020-08-31 21:21:46 -07:00
silicons 9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam
pyro anomaly spam salt pr (offer_control now supports ignore_category)
2020-08-31 21:21:09 -07:00
silicons 0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test
Adds a character saving unit test
2020-08-31 21:20:48 -07:00
silicons db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display
Makes fusion analyze not assume we're still on fusion v5
2020-08-31 21:20:15 -07:00
silicons 77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
silicons 1670b6f2a6 Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix
Makes plastitanium rapier not silently poison for pacifists.
2020-08-31 21:19:09 -07:00
Putnam 735809a69b Commented out threaded FFI. 2020-08-31 20:11:52 -07:00
Putnam 2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
lolman360 1b52ceb63a Various changes. 2020-09-01 11:43:01 +10:00
lolman360 05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
lolman360 4d6fb10dff Nyoops. 2020-09-01 10:55:55 +10:00
lolman360 400391e8d8 Bronze anvil tweaks, clarity. 2020-09-01 10:37:56 +10:00
silicons 4936829bac Merge pull request #13319 from BlueWildrose/hungryhungryslimes
Fixed newly created slimes being hungry
2020-08-31 16:59:58 -07:00
Timothy Teakettle d859d12b9f yes 2020-09-01 00:14:17 +01:00
silicons ee0d86f201 fix 2020-08-31 14:14:53 -07:00
Hatterhat b1b92c3225 runtiment 2020-08-31 14:12:10 -05:00
Putnam c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
The0bserver df3c2d3d8d Reduced some bloat, using TRAY_NAME_UPDATE 2020-08-31 05:01:51 -04:00
The0bserver b13db43985 Let's not forget this. 2020-08-31 03:27:56 -04:00
The0bserver dbb6ef7d4e I think we got rid of nutrilevel, finally. 2020-08-31 03:26:43 -04:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
The0bserver 4edf61dde7 New Define File: Botany.dm Earthmother save me. 2020-08-31 00:34:45 -04:00
Letter N ceea4f07ea tested? no 2020-08-31 10:43:03 +08:00
Hatterhat 0db189333a >one fucking callback 2020-08-30 21:21:27 -05:00
timothyteakettle af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
silicons 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix
Added health exemption to a couple events that need it.
2020-08-30 13:15:10 -07:00
The0bserver c2002aca78 This is it, Luigi. We gotta move the function! 2020-08-30 12:44:12 -04:00
The0bserver af97bddf87 It begins. Earthmother preserve me. 2020-08-30 11:38:46 -04:00
Timothy Teakettle 34393a187b fix ipcs 2020-08-30 16:27:09 +01:00
Putnam 6028c66ceb Fixed the combat log issue 2020-08-30 08:26:29 -07:00
Putnam 10586f3c3b trend, trend! 2020-08-30 07:33:17 -07:00
Putnam 4cf040a11a Makes plastitanium rapier not silently poison for pacifists. 2020-08-30 06:25:00 -07:00
Putnam cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -07:00
Putnam 9da959795c Made the text make sense, again. 2020-08-30 05:42:21 -07:00
Putnam 15b5b77494 Replaced all the references of fusionpower to instability in results. 2020-08-30 03:06:36 -07:00
Putnam 5ba883bfe5 Fixes fusion power text to make sense. 2020-08-30 02:53:46 -07:00
silicons 69f6927275 Update broom.dm (#13058) 2020-08-30 09:52:54 +02:00
Hatterhat 3b571e2edf oh jesus fuck its all gone wrong 2020-08-30 01:33:56 -05:00