1515 Commits

Author	SHA1	Message	Date
Fox-McCloud	9fd8718bc7	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-01-27 19:31:07 -05:00
FlattestGuitar	79e1953f41	Fixes a weird runtime. I think.	2017-01-28 00:48:05 +01:00
Fox-McCloud	51bbe8c466	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-01-26 06:53:18 -05:00
Crazy Lemon	0e42e416b6	Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor ... Makes Reagents Holder Process and Refactors NOREACT	2017-01-26 03:47:30 -08:00
Fox-McCloud	084ed30446	more fixes and features	2017-01-25 01:04:01 -05:00
Fox-McCloud	36bfee25dc	last of the missing stuff, hopefully	2017-01-24 18:33:22 -05:00
Fox-McCloud	b1f789e104	fixes a ton of thing	2017-01-24 03:23:16 -05:00
Fox-McCloud	4f72f89ad8	podmen fix	2017-01-23 08:05:55 -05:00
Fox-McCloud	3e87bd3370	more adjustments and fixes	2017-01-23 05:56:17 -05:00
Fox-McCloud	7007f6bbdf	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-01-23 01:01:09 -05:00
Fox-McCloud	dc0710135e	more fixes	2017-01-23 00:53:44 -05:00
Fox-McCloud	10c0e734c3	more work	2017-01-22 01:46:48 -05:00
Fox-McCloud	ea76990b7a	Botany Rework	2017-01-21 18:28:03 -05:00
Crazy Lemon	37a7484976	Merge pull request #6149 from FlattestGuitar/log-upgrade ... Adds log stacking to admin logs	2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak	1b506aaf9f	Switches over to the new system	2017-01-17 13:57:07 +01:00
Fox-McCloud	ea8080e6c9	Makes Reagents Holder Process and Refactors NOREACT	2017-01-14 20:09:49 -05:00
Fox-McCloud	56f0d79f15	Adds Species Levers	2017-01-14 03:51:43 -05:00
Fox-McCloud	8e355a867c	Fixing Food Runtime	2017-01-10 21:40:54 -05:00
Crazy Lemon	f1c3a7cd13	Merge pull request #6085 from Fox-McCloud/food-rework ... Food rework	2017-01-10 12:11:17 -08:00
Crazylemon64	ec0f13d41e	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub	2017-01-06 05:01:43 -08:00
Crazylemon64	f954382619	Adds a ui_key arg to ui_data	2016-12-31 12:51:07 -08:00
Aurorablade	98b7a89a17	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub ... # Conflicts: # code/game/machinery/doors/airlock.dm	2016-12-29 11:01:43 -05:00
Crazy Lemon	cf2f02e2c6	Merge pull request #5985 from Fox-McCloud/wall-rot ... Wall Rot Effect Refactor	2016-12-21 17:43:45 -08:00
Tigercat2000	b9abce843d	NanoUI Update: Seperate UI Data into ui_data() proc ... This commit changes how NanoUI's live data updating system works. Previously, data for the template was directly gathered in the ui_interact proc. Now, it is seperated into the proc `ui_data`. To players, this does absolutely nothing. To coders, this opens up the potential for a much more complicated and fancy graphical updating system in the future, because the data is available on-demand without ever having to call nanomanager.try_update_ui.	2016-12-14 13:37:34 -08:00
Fox-McCloud	4b1bfe33ff	Wall Rot Effect Refactor	2016-12-14 13:12:10 -05:00
Fox-McCloud	7a55ec18fc	Merge remote-tracking branch 'upstream/master' into food-rework	2016-12-05 12:40:32 -05:00
Aurorablade	fa1aa894ea	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub	2016-12-01 18:04:07 -05:00
Fox-McCloud	f53b38da3d	nutrition adjustments	2016-11-29 12:01:59 -05:00
Fox-McCloud	e134100164	Hunger Rework	2016-11-28 13:17:46 -05:00
Fox-McCloud	ed3a5252c8	Fixes Faint and Mickey Finn	2016-11-26 16:09:00 -05:00
Aurorablade	21781d7be8	Crazy lemon comments.	2016-11-22 02:22:39 -05:00
Fox-McCloud	feecce9d2e	OOP blacklist	2016-11-10 21:59:19 -05:00
Fox-McCloud	954e7b3c5d	more cleanup	2016-11-10 06:28:28 -05:00
Fox-McCloud	d809645f18	proc fix	2016-11-09 22:44:15 -05:00
Fox-McCloud	14e2eb8eb0	consumables	2016-11-08 10:26:29 -05:00
Fox-McCloud	b1b78ec3ee	nutrition fix	2016-11-08 06:48:24 -05:00
Fox-McCloud	46887e88d8	fixes	2016-11-08 06:41:48 -05:00
Fox-McCloud	36e84ccdf7	further structure	2016-11-06 15:02:25 -05:00
Fox-McCloud	61da53cca1	create reagents proc	2016-11-06 14:37:47 -05:00
Fox-McCloud	77c6460bfe	drinking glass refactor	2016-11-06 02:02:08 -05:00
Fox-McCloud	710e0e1005	oops	2016-11-04 14:38:18 -04:00
Fox-McCloud	0cfcfb4c32	repathing	2016-11-04 14:26:50 -04:00
Fox-McCloud	ebb59ca511	Reagent Reorganization	2016-11-03 21:27:10 -04:00
Fox McCloud	911fa70e1a	Merge pull request #5601 from Crazylemon64/status_effect_overhaul ... Ports over the status effect unification from the extreme refactor	2016-10-30 22:40:24 -04:00
Fox-McCloud	4b81269adc	reagents	2016-10-25 04:14:39 -04:00
Crazylemon64	6a7f7394a8	Ports over the status effect unification	2016-10-23 15:45:35 -07:00
TheDZD	20078cbb48	Merge pull request #5755 from Fox-McCloud/loading-fixes ... Fixes Dual Location Objects with Grinder and Biogenerator	2016-10-10 20:18:24 -04:00
Fox-McCloud	f7f1e493ed	Fixes Dual Location Objects with Grinder and Biogenerator	2016-10-09 14:04:52 -04:00
KasparoVy	ffc0083098	bottlefix	2016-09-18 01:06:47 -04:00
Krausus	b0ac462166	Integrates UIDs into View Variables	2016-09-08 19:04:50 -04:00