Commit Graph
670 Commits
Author SHA1 Message Date
KasparoVy be3bb885f2 Melting Snowflakes & (Adds/Changes Frills & Adds Body Markings) 2015-12-26 00:48:01 -05:00
KasparoVy 0f8f514671 Adds Unathi Horn and Tail Customization
Does not include tail colour correction.
In this iteration, the horns do not have their own colour-- they use the
skin colour.
2015-12-21 22:55:39 -05:00
Tigercat2000 0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
ZomgPonies 4922d60054 Adds ice tiles to cold pressurized turfs 2015-12-08 01:24:38 -05:00
Tigercat2000 356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm
2015-12-03 11:03:01 -08:00
Tigercat2000 e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Aurorablade 6821031ea7 PATCH 2015-12-02 23:47:55 -05:00
Fox-McCloud 6e52aa2750 blocks statues 2015-11-27 01:43:11 -05:00
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
Tigercat2000 d74be5f391 Scoreboard refactor, move job objectives to scoreboard
This commit does the following:
 - Refactors scoreboard code to get rid of, at least, some of the
   snowflakiness.
 - Removes world << job objectives, puts them in the scoreboard.

Addendum: Nukeops and Rev are untested, due to the near-impossibility of
testing them alone. They _probably_ work.
2015-10-05 15:12:25 -07: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 9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql
Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
2015-09-23 07:07:17 +02:00
Markolie bec9fca533 SQL update 2015-09-23 06:13:42 +02: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 89d29e9527 Merge remote-tracking branch 'ParadiseSS13/master' into GoOnYourFeet 2015-08-22 23:19:58 -04:00
Markolie e2246d40c5 Missing comma 2015-08-22 21:55:54 +02:00
Markolie 8ffea8f731 Readmin fix, antag age update 2015-08-22 21:53:51 +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
TheDZD 639478ace5 Merge pull request #1777 from Markolie/malf
Malf AI update
2015-08-20 11:50:19 -04:00
Fox-McCloud 1f7bfe92be Merge pull request #1781 from Markolie/adminbus
Admin teleport update, further admin message fixes
2015-08-18 20:19:55 -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
Markolie 4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +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
Mark van Alphen 33631beaf8 Merge pull request #1740 from tigercat2000/underwear_refactor
-tg- underware overhaul
2015-08-17 17:37:50 +02: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
Markolie e39b60b407 NTSL update 2015-08-13 22:01:00 +02:00
Fox-McCloud 541c662296 Merge pull request #1540 from Krausus/ProcessSchedulerTweaks
Process and Process Scheduler Tweaks
2015-08-08 20:46:23 -04:00
Krausus 61edb3eb95 Further process tweaks
- Integrates Volundr's btime library and associated process scheduler
changes.
- btime is implemented separately from the process scheduler, as precise
time measurement is also useful elsewhere.
- `TimeOfHour` is no longer internally throttled; throttling is instead
done by `SCHECK`.
- If btime's `gettime` cannot be called at world startup, an error will
be output and the world will stop.
- Retains the change to schedule processes according to game time,
rather than real time.
- Removes the (now unused) update queue files.
- Removes the process scheduler testing files.
- These are standalone tests for the process scheduler, completely
unrelated to its use in the full codebase. We never used them.
- Moves the process scheduler defines into __DEFINES.
- Makes the lighting process run once before the round starts.
- Renames `scheck` to `sleepCheck`, to ensure any code that tries to use
`scheck` will fail to compile.
- Adds `SCHECK` and `SCHECK_EVERY` macros that skip calling `sleepCheck`
entirely until a specified number of `SCHECK`s (50 by default) have been
called.
- Makes most processes iterate using their `last_object` variable,
allowing hang recovery to show the type that caused the hang.
- Makes processes output an error when they filter out a type they
refuse to process.
- Rolls the recently-added alarm subsystem into the alarm process.
- Removes the now unused subsystems code.
2015-08-08 09:07:26 -04:00