16425 Commits

Author	SHA1	Message	Date
Fox-McCloud	6a24d8bc02	Fixes Bloodless Internal Bleeding	2017-08-22 17:25:27 -04:00
Fox McCloud	e24d8d3c28	Merge pull request #7940 from Citinited/cleaning-disposals ... [s]Fixes an issue with the disposal system	2017-08-16 21:33:31 -04:00
Fox McCloud	13c112358a	Merge pull request #7534 from Kyep/ssd_button ... Admin 'List SSDs' verb & cryo option	2017-08-16 19:58:52 -04:00
Fox-McCloud	cf4735a069	Merge remote-tracking branch 'upstream/master' into HUNKE	2017-08-16 18:36:30 -04:00
tigercat2000	ebabda1223	Merge pull request #7366 from KasparoVy/mob_rgb_to_hex ... Converts Mob Colours to Hexadecimal	2017-08-16 12:52:13 -07:00
tigercat2000	608a0b0644	Merge pull request #7759 from Citinited/flagged-for-review ... Adds in-hand sprites for missing flags; adds a plasmaman flag; miscellaneous flag tweaks	2017-08-16 12:11:05 -07:00
Fox McCloud	5fa583aaea	Merge pull request #7984 from Birdtalon/swarming ... AI Damage Sanity check (Prevents swarmers killing it)	2017-08-15 22:27:49 -04:00
Birdtalon	808c35a7ab	sanity checking for AI damage	2017-08-15 18:27:17 +01:00
Fox McCloud	4da7fba866	Merge pull request #7986 from Birdtalon/medbutts ... Hacky "Fix" for medbot internal beakers	2017-08-14 23:02:27 -04:00
Aurorablade	46b99794b0	Surgery Fix	2017-08-14 18:50:58 -04:00
Birdtalon	d19d319eb1	horrible hacky fix	2017-08-14 19:32:18 +01:00
tigercat2000	f74e0cb0e5	Merge pull request #7966 from AndrewMontagne/feature/improve-modular-computers ... Fixes for Modular Computers	2017-08-14 11:26:07 -07:00
Birdtalon	e3c98f79c4	remove trailing newline	2017-08-14 11:40:46 +01:00
Birdtalon	44aca352cf	prevents swarmers from attacking the AI	2017-08-14 11:37:27 +01:00
Birdtalon	ba7c5467c8	allows spiderbots to pass tables	2017-08-12 17:42:03 +01:00
Andrew O'Rourke	24774a2201	Fixed issue where attempting to clone a file did nothing.	2017-08-10 21:36:59 +01:00
Andrew O'Rourke	c9a052616e	Modular computers printer now makes printing noises when it prints.	2017-08-10 20:44:12 +01:00
Andrew O'Rourke	b12e5cb296	Fixed issue where modular computers files were getting erroneously garbage collected after being edited.	2017-08-10 20:24:16 +01:00
Andrew O'Rourke	14a60a23e7	Fixed modular computers printer not printing fields onto paper.	2017-08-09 23:01:40 +01:00
FlattestGuitar	c6a40b7291	Merge branch 'master' into fluffles	2017-08-07 11:43:58 +02:00
Crazy Lemon	21bd7e7f24	Merge pull request #7919 from Fox-McCloud/hydro-updates ... Updates Hydroponics, Nerfs it, Adds Onions	2017-08-06 06:45:36 -07:00
Fox McCloud	83c6c168b7	Merge pull request #7941 from Kyep/smite_bless_fix ... Fixes #7925 for smite/bless and SIT	2017-08-06 09:35:47 -04:00
Fox-McCloud	b1495e7cf5	comment tweak	2017-08-06 09:06:57 -04:00
Fox McCloud	2dcae64f3a	Merge pull request #7876 from Aurorablade/Clothes ... Obligatory Vox in a Corset	2017-08-06 08:53:13 -04:00
Fox McCloud	1c64b71a5c	Merge pull request #7885 from shazbot194/Drone_gibber ... Changes the icon for the matter decompiler	2017-08-06 08:39:39 -04:00
Crazy Lemon	d18c20cb9f	Merge pull request #7939 from Fox-McCloud/wormsss ... Makes has_brain_worms cheaper	2017-08-05 07:16:58 -07:00
Crazy Lemon	8575e3a6d5	Merge pull request #7931 from Fox-McCloud/tesla-performance ... Reduces Tesla Cost	2017-08-05 07:04:39 -07:00
Kyep	568874ed6a	Fixes #7925 for smite/bless and SIT	2017-08-05 01:58:53 -07:00
Citinited	988ed89710	Fixes some instances of disposals sending things to nullspace	2017-08-05 05:51:54 +01:00
Fox-McCloud	b366f5e598	Makes has_brain_worms cheaper	2017-08-04 23:37:17 -04:00
Fox-McCloud	c3ed8de770	faster	2017-08-04 17:15:47 -04:00
Sam	9eb092555d	karma karma karma karma chameleon....	2017-08-04 15:29:18 +01:00
Fox-McCloud	2f87d0f55a	Reduces Tesla Cost	2017-08-03 19:37:10 -04:00
Fox-McCloud	5443a3f6d3	Fixes Fox Being A Moron	2017-08-03 00:30:56 -04:00
Crazy Lemon	59a9df3762	Merge pull request #7906 from Fox-McCloud/remove-cael ... Removes Unused Xenoarch Code	2017-08-01 22:15:22 -07:00
Crazy Lemon	c85acf0a81	Merge pull request #7875 from Fox-McCloud/sound-update ... Sound Update/Refactor	2017-08-01 22:09:46 -07:00
Crazy Lemon	5d85b6697c	Merge pull request #7870 from Fox-McCloud/tweaks/fixes/organ/stuff ... Various little fixes/refactors	2017-08-01 21:41:13 -07:00
Fox-McCloud	223d608aa8	styling	2017-08-01 18:31:52 -04:00
Fox-McCloud	ca49a28f02	Updates Hydroponics, Nerfs it, Adds Onions	2017-08-01 17:58:23 -04:00
Fox McCloud	4264f24e52	Merge pull request #7913 from Birdtalon/stockrebalance ... R&D Stock Parts Print Time Fix	2017-07-31 18:07:10 -04:00
Birdtalon	bdd7cc4c27	Fixes lathe_time_factor to correct values	2017-07-31 22:46:37 +01:00
Birdtalon	5dcb44c3d5	fixed silly mistake	2017-07-31 22:10:26 +01:00
Birdtalon	e5e3293289	rebalances stock part printing times for RND	2017-07-31 21:57:11 +01:00
Fox-McCloud	6bd0d17527	performance	2017-07-31 14:01:15 -04:00
Kyep	acc26bdcf2	TRUE and FALSE	2017-07-29 21:59:52 -07:00
Kyep	8aca3fad06	Also prevents mother wandering through, dying, and summoning horde	2017-07-29 21:44:15 -07:00
Kyep	bb089e2056	Prevents TS spiderlings traversing gateawy	2017-07-29 21:39:07 -07:00
Fox-McCloud	968050c5ce	Removes Unused Xenoarch Files	2017-07-29 20:13:45 -04:00
Fox-McCloud	99ad3db8ba	Fixes Dead Hearts Allowing you to live.	2017-07-29 19:28:38 -04:00
Birdtalon	5d1545f996	Fox McCloud changes request	2017-07-27 22:15:07 +01:00