Commit Graph

530 Commits

Author SHA1 Message Date
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Aurorablade
92e15c1b2a BREAK ALL THE THINGS 2015-12-31 01:23:44 -05:00
KasparoVy
eb47c80d75 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 18:16:17 -05:00
KasparoVy
366d05f745 Generalization + Features for Other Species
Turns horns into head accessories, fixes some species checks, gets
Tajara and Vulpkanin into the mix, ensures the system cannot be
exploited, adds species-specific body markings for Tajara, Vulpkanin and
Unathi.
2015-12-28 01:02:23 -05:00
KasparoVy
6ba20458e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
# Conflicts:
#	icons/mob/human_face.dmi
2015-12-27 18:42:59 -05:00
Crazylemon64
dc29161339 Adds an SQL list sanitization proc, and stores our tags in the DB 2015-12-27 13:43:50 -08:00
Crazylemon
4133e98dfe Port of RemieRichard's infinite antag system
This is just the first chunk, of fixing around the be_special flag stuff
It will probably break everything as-is
2015-12-25 22:51:02 -08:00
KasparoVy
be3bb885f2 Melting Snowflakes & (Adds/Changes Frills & Adds Body Markings) 2015-12-26 00:48:01 -05:00
Fox-McCloud
bfb23936f9 Tesla Update and Orbit Update 2015-12-24 10:29:10 -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
Crazylemon
f908f12f5b Adds a dna adder to head code so that head removal doesn't runtime ever 2015-12-20 18:46:47 -08:00
Crazylemon64
fe606492a0 Organs are now easier to keep clean for surgery
* They initially rot slower, and won't rot if on the same tile as a freezer

* Having dirty hands when doing internal organ surgery will now contaminate
the internal organs. Wash those hands!
2015-12-18 04:51:04 -08:00
Aurorablade
ccd6d2641b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-17 22:43:09 -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
Aurorablade
950ae86a92 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-10 06:47:43 -05:00
Aurorablade
c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
TheDZD
4fe7f81e97 Revert "Reverts #2687" 2015-12-09 17:25:10 -05:00
Tigercat2000
42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
2015-12-09 10:08:28 -08:00
TheDZD
2c4549d7ac Revert "Make color dialogs appear with current color."
This reverts commit af94d1bf6f.
2015-12-07 21:25:42 -05:00
IAmBigCoat
3b783a9cb2 Fixed num2hex for large numbers.
ID numbers are larger than the bitwise operators allow, which gave everyone one of about sixteen ID #s.
Not sure what or if this actually fixes anything mechanically, but ID #s are pretty again.
2015-12-05 21:43:20 -05:00
Tigercat2000
c3f476f62c Supply shuttle, initial_move() fixes, dock fixes
Supply has been almost completely replaced by -tg-'s system.

No fancy UI, unfortunately, but modifying bay's directly was not possible.
2015-12-04 21:48:40 -08: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
Fox McCloud
ca5362f055 Merge pull request #2687 from SvartaSvansen/more-char-setup
More character setup changes
2015-12-01 19:21:58 -05:00
SvartaSvansen
528ad01873 The non-Vox are taking all the Vox socks! 2015-11-29 18:58:00 -05:00
ZomgPonies
bb470d2955 Kickoff Nation leader picking 2015-11-29 16:56:11 -05:00
Fox McCloud
c7ae3c0233 Merge pull request #2640 from FalseIncarnate/master
Random Chem Blacklists, Strange Plant Fixes
2015-11-24 21:38:22 -05:00
TheDZD
a7dc235391 Merge pull request #2630 from SvartaSvansen/buggy-swatches
Fixes faulty num2hex proc
2015-11-23 18:04:42 -05:00
FalseIncarnate
4d444d6888 Safety Dance
Does the Safety Dance.

(de-references the lists by using .Copy() instead of direct references)
2015-11-23 02:33:06 -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
SvartaSvansen
043f03544b Fixed global helper proc; this is where the problem lies. 2015-11-21 22:05:13 -05:00
ZomgPonies
ceac0f3b81 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into nations
Conflicts:
	code/__HELPERS/global_lists.dm
2015-11-18 18:33:40 -05:00
Tigercat2000
1b477db904 Global DatumRefLists cleanup x1
Changelog:
 - Switched surgeries to use init_subtypes()
 - Updated init_subtypes()
 - Made the species race_key handling a bit less line-taking (uses
   pre-increment now)
 - Added new proc, init_datum_subtypes, which takes 4 arguments-
   init_datum_subtypes(prototype, list/L, list/pexempt, assocvar)

   prototype is a path which will be run through subtypesof
   list/L is the list that new datums will be added to
   pexempt is subtracted from the 'subtypesof(prototype)' (exempting them)
   assocvar is the var to associate by in the list- uses vars[] lookup

   Jobs, superheroes, and languages now use this proc.
2015-11-16 14:21:05 -08:00
ZomgPonies
cec5390c99 Nations 2.0 initial commit 2015-11-15 15:24:51 -05:00
Tastyfish
bc8627254c Fixed Setting volume for media machines, as well as them updating for mobs in room 2015-11-09 21:57:24 -05:00
Fox-McCloud
597108dc40 Say Bubble Refactor+Fix 2015-10-18 18:58:21 -04:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox McCloud
57e5230add Merge pull request #2233 from Markolie/ShitStar
AStar/Datastructures update
2015-10-03 19:20:46 -04:00
Markolie
e9188f7f38 AStar update 2015-10-01 20:18:05 +02:00
Markolie
9ec1f3987c Make darkness clickable 2015-10-01 01:35:59 +02:00
Markolie
7b97739a49 Remove duplicate procs, fix examine text 2015-09-30 15:34:17 +02:00
Markolie
3c058ccf6e AStar/Datastructures update 2015-09-30 01:57:38 +02:00
Markolie
f5f27fa186 Atmos analyzer update 2015-09-27 04:48:42 +02:00
Markolie
24337913cd Add SDQL, +PROCCALL, admin updates 2015-09-25 16:54:27 +02: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
9d49985e1c Offer control to ghosts option 2015-09-23 04:44:12 +02:00
Markolie
0bd697805d Update event turf handling, fix infestation event 2015-09-18 17:38:15 +02:00
Fox-McCloud
ce91a30da3 Merge pull request #2071 from Markolie/lawstate2
Update additional law channel handling, debug fix
2015-09-16 20:53:04 -04:00
Fox-McCloud
b53a5a69e1 Merge pull request #2057 from Markolie/notes
Player notes update
2015-09-16 20:46:09 -04:00
Markolie
5d80c7a248 Add rights check to debug logging 2015-09-16 18:35:42 +02:00