721 Commits

Author	SHA1	Message	Date
Kyep	787aee9655	replace trade objectives with 15 plasma bars & 10,000c	2019-01-10 15:16:59 -08:00
Kyep	8a4461c89e	tweaks comment	2019-01-09 00:04:47 -08:00
Kyep	ee5c6421a6	spacing	2019-01-07 22:52:52 -08:00
Kyep	bf9d0b088f	merge conflict fix, reset map	2019-01-07 16:37:07 -08:00
variableundefined	25f4665da7	Merge pull request #10580 from datlo/capufakedeath ... Capulettium/Capu+ fakes death convincingly	2019-01-06 16:12:56 +08:00
variableundefined	7e5930a2a0	Merge pull request #10527 from Mithrandalf/toycuffs ... A new toy for the clown	2019-01-04 20:03:39 +08:00
variableundefined	ebe239c09b	Merge pull request #10501 from datlo/wizforcewall ... Refactor and buff wizard force wall, add greater force wall	2019-01-04 20:02:54 +08:00
Kyep	29e62bf0bc	blue snowmobile	2019-01-03 20:49:33 -08:00
Kyep	0567eab562	Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update	2019-01-03 14:40:07 -08:00
Kyep	d488195799	fix merge conflict, wipe map changes	2019-01-03 14:39:41 -08:00
datlo	244fcfc739	capu/capu+ fake death for realsies, add fake death pills to syndis/maint	2019-01-02 09:46:03 +00:00
Mithrandalf	1fa290ece4	all the new stuff	2018-12-28 15:42:07 +00:00
variableundefined	d7b2648020	Merge pull request #10185 from Mitchs98/moveresist ... Ports Move Force from TG	2018-12-28 20:53:07 +08:00
Mithrandalf	0e9191cdd4	Adds the cuffs to the code and the map	2018-12-27 17:01:40 +00:00
datlo	38e6e20941	Refactor and buff wizard force wall, add greater force wall to spell book	2018-12-25 04:49:24 +00:00
Kyep	46acb9338b	sunglasses, seeds, KA, IMS, fleshy	2018-12-22 14:16:25 +00:00
datlo	b0f60602a8	MERGE SHIT REEEEE IMMAH PUNCH A WALL	2018-12-18 11:47:29 +00:00
variableundefined	4bba6eb649	Merge pull request #10452 from Citinited/jingle-my-bells-ho-ho-ho ... Adds the snow machine	2018-12-18 16:33:01 +08:00
Citinited	273d8bf02b	More changes ... Shovels clear away snow, it can snow on unsimulated turfs	2018-12-16 11:47:19 +00:00
Citinited	0083fba070	More changes ... Snow machine is cargo-orderable during christmas, code changes, icon tweaks, snowballs now do stamina damage instead of actual damage	2018-12-14 00:43:34 +00:00
Citinited	5529102530	Adds the snow machine	2018-12-13 08:30:39 +00:00
Kyep	702f4db165	outfit, vehicles, paperfix, viruses	2018-12-12 00:31:56 -08:00
Kyep	c49892c17d	Desolate's suggestions	2018-12-10 17:06:45 -08:00
Kyep	4427d02acd	researchnotes, pills, injector runtime	2018-12-09 00:41:11 -08:00
Kyep	7c1f40ea14	WIP omnizine/SR/virus bottles, minerals	2018-12-08 19:33:21 -08:00
Kyep	23eb2bb956	v1, WIP	2018-12-08 04:03:09 -08:00
datlo	34db3b373e	add teleporter, various misc changes	2018-12-07 16:29:48 +00:00
datlo	19e5271249	Added syndicate officer as a job proper	2018-12-07 11:07:49 +00:00
Kyep	038fb2ef67	replaces explosive mines with (new) sentry mines	2018-12-07 01:11:15 -08:00
Kyep	2593daac80	reduces pizza bomb chance from 50% to 33%	2018-12-06 19:17:58 -08:00
Kyep	0d91b3b619	deletes trapped syndi toolbox	2018-12-06 19:13:56 -08:00
datlo	a80efa4924	Add the advanced mimery kit to mime uplinks ... Also adds : Mime specific spellbooks TG wizard forcewall (mime is a subtype, will implement for wiz later probably) Fake finger gun spellbook in arcade	2018-11-23 07:23:34 +00:00
AzuleUtama	9f0c127d9a	Add syndi cigs to maint loot ... Since an item classed as legal can only be gotten on the uplink right now.	2018-11-21 11:21:24 +00:00
Mitchell	29226ea04f	Requested Fixes/Further Review	2018-11-11 19:44:35 -06:00
Mitchell	7cd25c4d87	for ansari to view	2018-11-11 15:59:48 -06:00
Spartan6	80e8b4ff19	Adds plastic bags and wet floor signs to loot maint	2018-11-07 00:52:36 +00:00
AzuleUtama	7ffa8d848c	Replace military belt with traitor toolbelt in Maintenance Loot	2018-11-04 17:26:14 +00:00
joep van der velden	123611f20d	fixu bugu	2018-10-27 16:59:28 +02:00
variableundefined	e2f7b7e388	Deconflict once again	2018-10-21 10:18:15 +08:00
variableundefined	45fdcb4c46	Merge pull request #9719 from SamHPurp/smoothing-improvements ... Icon Smoothing to StonedMC	2018-10-21 07:41:47 +08:00
variableundefined	152a350538	Deconflict	2018-10-19 16:07:04 +08:00
Fox McCloud	3825b4e1d5	Refactors Spark Spread Activation	2018-10-17 14:31:07 -04:00
Purpose	a77421f340	Oh dirt merged before the subsystem. Thats why.	2018-10-13 21:37:01 +01:00
variableundefined	569f68b128	Merge branch 'master' into RelPath	2018-10-12 14:08:19 +08:00
Desolate	f7627d2fcb	Resolves conflicts.	2018-10-11 05:36:22 -05:00
Purpose	9ee4347965	conflicts? apparently?	2018-10-10 18:53:22 +01:00
variableundefined	309e3b04f6	Clears up some relative pathing part 1	2018-10-10 23:39:34 +08:00
Purpose	4d7dd5a6c9	dayum dats defined	2018-10-08 22:48:00 +01:00
variableundefined	042d24520e	Merge pull request #9724 from SamHPurp/plasma-window-spawners ... Adds plasma window spawners	2018-10-08 12:20:20 +08:00
Purpose	b28527f992	Merge branch 'master' into dirt-smoothing	2018-10-07 17:16:54 +01:00