23740 Commits

Author	SHA1	Message	Date
botka4aet	2c4cf6db3d	Syntax fix	2021-09-23 18:12:13 +03:00
botka4aet	d84290b28c	All_In_One Grinder ... Now can grind rods Don't use all grinding stack items	2021-09-10 17:43:14 +03:00
variableundefined	dcad192255	Merge pull request #16627 from Deelite34/simplify-reflect-msg ... Tweaks carp martial arts projectile reflection message	2021-09-09 22:29:23 -05:00
variableundefined	dab26d9f8c	Merge pull request #16645 from Qwertytoforty/bump-on-a-logging-view ... Puts MSAY in OOC logging view	2021-09-09 22:29:06 -05:00
variableundefined	f921d6ae7f	Merge pull request #16662 from Aurorablade/KoiKoiKoiKoi ... changes size of koi migration	2021-09-09 22:28:45 -05:00
variableundefined	dd3cff98ae	Change "abiotic items" message to be more clear (#16545) ... * Change "abiotic items" message to be more clear * Add missing period.	2021-09-09 23:20:13 +01:00
variableundefined	f9f9c8bb08	Merge pull request #16646 from Sirryan2002/Sandwich ... Adds a seperate sprite for Toasted Sandwich	2021-09-09 17:16:04 -05:00
variableundefined	b02e7f168a	Merge pull request #16658 from Vi3trice/more-ai-sounds ... More AI sounds - Anomalies and APC Short events	2021-09-09 17:15:24 -05:00
variableundefined	baa59c4042	Merge pull request #16654 from farie82/add_attack_log-ssd-tweak ... Attack logs on SSD targets now only get the FEW loglevel if there is a user doing it	2021-09-09 17:14:59 -05:00
Aurorablade	c81e89698e	I did not make a newline issue.. ... haha newline issues much?	2021-09-08 20:04:47 -04:00
Aurorablade	e760cc3b73	changes size of koi migration	2021-09-08 19:44:57 -04:00
AffectedArc07	3d8c6d1bd3	Removes some macro abuse	2021-09-08 20:52:24 +01:00
Vi3trice	a77fefe54b	Adds a few AI sounds for anomalies, and the APC short event that ended up losing it previously	2021-09-08 10:57:16 -04:00
variableundefined	dedbe9166e	Merge pull request #16625 from Fox-McCloud/spin-changes ... Spin Emote Changes	2021-09-08 08:52:15 -05:00
variableundefined	81688b2de7	Merge pull request #16643 from LightFire53/Console-Fixes ... Console Minor Fixes	2021-09-08 08:36:15 -05:00
variableundefined	4fa2aafbc8	Merge pull request #16644 from SteelSlayer/wand-of-slipping ... Gives the wand of slipping a unique sprite and fixes a bug with it	2021-09-08 08:33:24 -05:00
Fox McCloud	be49c778cf	Merge pull request #16647 from AffectedArc07/514-patch ... The 514 patch	2021-09-08 09:14:26 -04:00
Fox McCloud	1d47d4a93c	Merge pull request #16648 from AffectedArc07/mutes-glob ... Moves mutes to a GLOB	2021-09-08 09:01:13 -04:00
Fox McCloud	24f97f62eb	tweaks	2021-09-08 08:56:57 -04:00
AffectedArc07	99e58c6c0f	Apply suggestions from code review	2021-09-07 20:49:33 +01:00
joep van der velden	4b22aa12da	add_attack_logs ssd tweak ... only overrides the log_level if the target is SSD AND there is a user	2021-09-07 21:04:29 +02:00
AffectedArc07	8b23fc8726	And this	2021-09-07 17:52:18 +01:00
AffectedArc07	b0e9db64bd	Revert "Merge pull request #16520 from SabreML/fix-bundle-4" ... This reverts commit 9a62622fbc, reversing changes made to 841ad0f1fd.	2021-09-07 16:16:40 +01:00
AffectedArc07	abcbee215b	Fixes all players being marked as blobs	2021-09-07 15:35:05 +01:00
AffectedArc07	fce2828724	Moves mutes to a GLOB	2021-09-07 15:09:37 +01:00
AffectedArc07	04e3481bf3	The 514 patch	2021-09-07 11:43:42 +01:00
variableundefined	3dae44217a	Merge pull request #16383 from theo-3/seeds_naming ... Allows players to name seed packs to keep track of modified plants	2021-09-06 23:17:53 -05:00
variableundefined	c2664eec0d	Merge pull request #16311 from S34NW/does-anyone-else-hate-genetics ... Replaces genetics xray vision with other vision genes	2021-09-06 23:16:04 -05:00
variableundefined	b0ca2e366a	Merge pull request #15971 from S34NW/AI_announcer_new ... Revamps "Station AI" announcer	2021-09-06 23:14:27 -05:00
variableundefined	d014aaafb0	Merge pull request #16635 from Sirryan2002/DrinkRecipeFix ... Adds Sugar to Gimlet Drink Recipe	2021-09-06 22:53:58 -05:00
variableundefined	5ffc8e2625	Merge pull request #16632 from SteelSlayer/robot-move-refactor ... Minor cyborg Move refactor	2021-09-06 22:53:19 -05:00
variableundefined	9a62622fbc	Merge pull request #16520 from SabreML/fix-bundle-4 ... Fix bundle #4	2021-09-06 22:29:10 -05:00
variableundefined	841ad0f1fd	Merge pull request #16609 from SabreML/GC-fixes-1 ... GC fix bundle #1	2021-09-06 22:15:44 -05:00
variableundefined	82b34ad8ed	Merge pull request #15783 from E-MonaRhg/just-defibrillator-things ... More compact defibs: Electric boogaloo	2021-09-06 21:56:46 -05:00
variableundefined	5a9b70b7fb	Merge pull request #16447 from S34NW/outline_port ... Ports item hover outline	2021-09-06 21:42:50 -05:00
variableundefined	df778ab8fb	Merge pull request #16621 from Qwertytoforty/anomalys-of-highest-quality ... Makes anomalies able to spawn in more areas	2021-09-06 21:40:16 -05:00
variableundefined	cf5544846b	Merge pull request #16613 from Qwertytoforty/transforming-views ... Removes transformation sting	2021-09-06 21:40:06 -05:00
variableundefined	842f8267b2	Merge pull request #16510 from theo-3/bee_hitbox ... Make bee hitbox much smaller, except if the bee attacks someone	2021-09-06 19:12:20 -05:00
variableundefined	2354619f17	Merge pull request #16525 from S34NW/glass_floors_2 ... Glass floors attempt 2	2021-09-06 19:10:44 -05:00
LightFire53	2531a8ce89	Black magicks ... Told by S34N that this will fix an issue with solar control consoles being bugged visually	2021-09-06 16:46:07 -07:00
Sirryan2002	b98cc81a3a	Updates Sandwiches	2021-09-06 17:32:49 -04:00
variableundefined	85c8e96db9	Merge pull request #16626 from AffectedArc07/removes-warning-system ... Removes bay-era warning system	2021-09-06 14:30:40 -05:00
Qwertytoforty	c4a0cb9776	Puts MSAY in OOC logging view	2021-09-06 14:45:34 -04:00
E-MonaRhg	23e9083d07	Merge remote-tracking branch 'upstream/master' into just-defibrillator-things	2021-09-06 19:47:03 +02:00
SteelSlayer	3cc83e6011	wand of slipping fixes	2021-09-06 12:23:27 -05:00
variableundefined	dd17035c1f	Merge pull request #16567 from SabreML/fluorescent-lights ... Adds a short warm-up time when turning on a light	2021-09-05 16:05:21 -05:00
variableundefined	58af5b79a5	Merge pull request #16564 from S34NW/tg_machinery_port ... TG sprite project: Vendors and Consoles.	2021-09-05 16:04:10 -05:00
Sirryan2002	2d3f02e795	Changes Gimlet Recipe + Result Amount	2021-09-04 16:06:34 -04:00
SteelSlayer	dec01b62e3	robot move refactor	2021-09-03 08:47:30 -05:00
SabreML	b2ab2cfbd8	Fix	2021-09-03 14:24:56 +01:00