Commit Graph

88 Commits

Author SHA1 Message Date
FalseIncarnate
7780b75429 Random Chem Blacklists, Strange Plant Fixes
Revival and expansion of #1002 (thanks Iamgoofball!)

Creates a reagent blacklist for use with random chem stuff like pills!
- Currently blacklists admin-only, antag-only, and other bad-times chems
like mutationtoxin.

Creates a SECOND blacklist for further refinement, intended for use with
strange plants in botany.
- Currently just blocks alcohol / alcoholic bar drinks from the random
chems to avoid "watering down" the selections

Creates a new helper proc/get_random_chemical() to return a randomly
selected chemical/reagent that is not blacklisted.
- If passed with no arguments, will only look at the first blacklist.
- If passed with an argument, will also include the second "plant"
blacklist
- Will attempt to select a random chemical, then compare it to the
blacklisted chems to see if it is acceptable
- If the chem is on the blacklist, it will start over until it finds an
acceptable one

Rewrote the random chemical portion of Strange Plants to utilize the new
get_random_chemical proc rather than rely on a hardcoded "whitelist"

Updates Strange Plants to not only contain Nutriment
- They can now contain Nutriment, Plant-Matter, Protein... OR A COMBO OF
THEM!

Hydro trays and soil now recognize Nutriment, Plant-Matter, and Protein
as actual nutrients for plants, as well as (slightly) improving yield
modifiers.

Extension of #2596 (thanks Fox for the temp-fix)
Fixes #2416
Fixes #2439 (again)
2015-11-23 01:26:11 -05:00
ZomgPonies
cec5390c99 Nations 2.0 initial commit 2015-11-15 15:24:51 -05:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox McCloud
73b2fc122a Merge pull request #2291 from Markolie/movefix
Fixes and pinpointer update
2015-10-05 16:01:02 -04:00
Markolie
b24f5ff979 Fixes and pinpointer update 2015-10-05 00:26:43 +02:00
Fox McCloud
57e5230add Merge pull request #2233 from Markolie/ShitStar
AStar/Datastructures update
2015-10-03 19:20:46 -04:00
Markolie
7ae1022ee0 Add base simple animal to blacklist 2015-09-30 15:47:00 +02:00
Fox McCloud
15c9873cdf Merge pull request #2224 from Markolie/shitcode
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
2712c4dba8 Add spaceport security to blacklist 2015-09-29 23:18:05 +02:00
Fox-McCloud
d7f23f4271 Oh, that kind of list 2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131 lists 2015-09-27 19:24:35 -04:00
Markolie
b770e8f2a0 Implant fixes/updates 2015-09-23 02:51:33 +02:00
Fox-McCloud
937bb6be85 Merge pull request #2114 from Markolie/pet
Add Araneus to simple mob blacklist
2015-09-20 21:58:37 -04:00
Markolie
5ae64de80c Add Araneus to simple mob blacklist 2015-09-21 03:33:49 +02:00
Markolie
279c998ae8 OOC/LOOC update, stealthmin fixes 2015-09-17 21:27:24 +02:00
Markolie
a09b295890 Make savefile-->SQL note converter functional 2015-09-15 21:19:19 +02:00
Markolie
3ff3945bab Player notes update 2015-09-15 05:10:03 +02:00
Mark van Alphen
6c1208e18f Merge pull request #1819 from Aurorablade/GoOnYourFeet
[Sprite] [TG Port] Things that go on your feet
2015-09-07 22:31:21 +02:00
Markolie
b999ca32b8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-31 02:23:24 +02:00
Markolie
5dc034719d Port Bay's silicon law manager 2015-08-31 02:18:49 +02:00
Aurorablade
0f1a44eb2e Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet 2015-08-29 20:12:41 -04:00
Markolie
2787c2fd46 sortAtom improvements 2015-08-28 23:52:27 +02:00
Aurorablade
a8aaf30ba9 Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet 2015-08-21 17:45:01 -04:00
Aurorablade
ac6a2baa80 Sock port
Plus fix to secruity records text
2015-08-21 17:43:16 -04:00
Markolie
8086d61042 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into malf
Conflicts:
	code/game/objects/items/devices/aicard.dm
2015-08-18 20:24:10 +02:00
Markolie
80360fd8a9 Malf AI update 2015-08-18 20:22:38 +02:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Tigercat2000
748da30bb6 -tg- underware overhaul
This commit overhauls the underwear/undershirt system to -tg-'s text-based
version. No more magic numbers, just text states.

Note, this modifies the SQL Schema, and existing databases must be
modified by the following SQL:

ALTER TABLE server_db.characters
	CHANGE underwear underwear MEDIUMTEXT NOT NULL,
	CHANGE undershirt undershirt MEDIUMTEXT NOT NULL;
2015-08-13 17:45:52 -07:00
Fox-McCloud
541c662296 Merge pull request #1540 from Krausus/ProcessSchedulerTweaks
Process and Process Scheduler Tweaks
2015-08-08 20:46:23 -04:00
TheDZD
171c0d2d6c Merge pull request #1387 from Aurorablade/STILLALOTOFBLOOD
[Need Feedback] TG Slaughter Demon Port Remake, THE REGIBBINGING
2015-08-07 18:19:38 -04:00
Krausus
60fed2cf71 Resolves further merge conflicts 2015-08-03 23:40:28 -04:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Krausus
c520ebd8a5 Process and Process Scheduler Tweaks 2015-07-18 13:14:32 -04:00
Aurorablade
138f71a421 Final Commit
A janitor weeps.
2015-07-17 11:21:43 -04:00
Fox-McCloud
b9a492a3a5 no world 2015-07-06 23:25:29 -04:00
SamCroswell
b6cd6b4384 Rewrites HUD Handling for Glasses 2015-06-11 21:42:15 -04:00
Tigercat2000
993ad208a8 Overhaul global defines and vars
This commit overhauls the global.dm file, global_lists.dm file, and
defines.dm file into a tree system based on -tg-.

All defines have been split and distributed in code/__DEFINES/

Everything from global.dm and global_lists.dm has been split and
distributed in code/_globalvars

The _compile_options.dm file contains anything that absolutely, 100%, must
be initialized before world.dm.

Name definitions have been moved to code/_globalvars/lists/names.dm.

Other things to note
 - All instances of something.z == 2/1/3/5 have been replaced with easily
   configurable defines, labeled ZLEVEL_. The map include file can
   override these by defining custom ones in it's file, as it is at the
   top of the tree.
2015-05-12 20:48:38 -07:00