Commit Graph

710 Commits

Author SHA1 Message Date
killer653
463b9c4dfb Edited files 2017-11-17 19:28:26 -05:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
Verkister
23906d8749 Un-duplicates head marking cache generation. (#4257)
* Un-duplicates head marking cache generation.
-Organ icon generation for heads no longer adds the markings list into the cache key twice.
-Related to similar dismemberment crashes as the earlier organ cache issue fixes.

* Update organ_icon.dm
2017-11-14 12:24:00 -06:00
killer653
2d51b8421d Emergency bugfixes 2017-11-05 00:52:06 -04:00
killer653
22b7867052 [WITTY_COMMENT_HERE] 2017-11-04 21:56:02 -04:00
killer653
95f2ca3a0c POLARIS SYNC PART 2:
I'm not a masochist, verk. Stop giving me extra work!
2017-11-04 21:14:30 -04:00
Anewbe
2dfb3de415 Revert "Converts colorable species into the combo blend mode." 2017-11-04 15:47:32 -05:00
killer653
7a3bf3cd89 More edits 2017-11-04 13:45:26 -04:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Anewbe
08bcfded73 Changes how organ infections work 2017-11-01 00:41:59 -05:00
Verkister
45f53405fe Converts colorable species into the combo blend mode.
-Unathi, Tajaran, Skrell, and Teshari now use mult+add combo blending.
-As do their tails, tail anims, and extra tesh feathers.
-No issues detected on latest test runs.
2017-10-31 12:50:15 +02:00
Spades
fa38bec798 Merge pull request #2382 from Verkister/hairrevolution
It's time for hair color revolution!
2017-10-30 13:56:11 -04:00
Verkister
404ac0f42c It's time for hair color revolution here too!
-Aye greetings from downstream hell where I managed to solve the locally intense ADD vs MULTIPLY blend mode discource once and for all with a fresh as hell new option that combines the best of both worlds without the downsides.
-You can now have hairstyles that retain both, shading and highlights in every color how cool is that?
-Got told to port this stuff up here too so you're welcome. Spread the word if ya want. Planning to hit up the other blend stuffs as well some time, but here's a little something for now.
2017-10-28 17:00:21 +03:00
Verkister
d879d481d7 It's time for hair color revolution!
-I SOMEHOW FIGURED OUT A COMBO BLEND THAT COMBINES THE BEST OF BOTH, ADD AND MULTIPLY AND LOOKING GOOD AT ALL COLORS IN LESS THAN AN HOUR AAAAAAAA!
-IMPOSSIBILITIES MY ARSE I AM GOD HSGHFJSD
-May need some adjustments in case some bases don't behave as well as they should but that's a task for future me after people have found and pointed out the hypothetical fucky hairstyles I'm too stoked to not rush this through right now lmao.
2017-10-28 00:58:13 +03:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Anewbe
03097fba80 Further decreases bloodloss from burn damage 2017-10-25 02:14:52 -05:00
Mechoid
4a61e59ea9 Merge pull request #4135 from Anewbe/infection_scaling
Level Two Infections actually hurt now
2017-10-24 09:55:30 -07:00
Anewbe
4a277ae5e2 Level Two Infections actually hurt now 2017-10-21 22:37:41 -05:00
Cameron653
af4d6d7368 Clears out the rest of them and leaves comments.
Of where to find them.
2017-10-21 15:38:19 -04:00
Cameron653
eb6238f613 Removes duplicate heart
https://github.com/PolarisSS13/Polaris/blob/master/code/modules/organs/internal/heart.dm
2017-10-21 15:24:08 -04:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe
d886e52ac3 Merge pull request #4080 from shazbot194/Synth_color
Synth Coloring
2017-10-16 17:55:24 -05:00
shazbot194
d199d4caf7 Adds in the option to color all synth parts and two sets of parts
As the titles says
2017-10-15 14:56:14 -08:00
Mechoid
a9e9236d7f Prosthetic Organ Expansion 2017-10-15 15:12:51 -07:00
Neerti
a8513844ec Adds a Trait system (#4048)
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
2017-10-13 01:17:39 -05:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
1f9a14ffd7 Adds Skeletons for background use 2017-10-06 20:40:12 -05:00
Verkister
2a0de4b06e More hyuuge icon blend mode overhauls!
-Converted unathi base sprites and blending to MULTIPLY mode.
-Converted tajaran base sprites and blending to MULTIPLY mode.
-Converted skrell base sprites and blending to MULTIPLY mode.
-Converted teshari base sprites and blending to MULTIPLY mode.
-Converted pretty much every colorable hairstyle to MULTIPLY mode.
-This includes species specific and facial hairs as well.
-Added more 'furry' races to the vulp hairstyle compatibility list.
-Removed the old ears from the sergal hairstyles.
-Applied the earlier hand/arm overlap fix to the synthsergal limbs as well.
-Proved myself some sort of a goddamn deity over actually doing this shit that was supposed to be impossible to pull off at this point lmao.
2017-10-03 18:24:07 +03:00
Neerti
dcd2580dc2 Merge pull request #3918 from Anewbe/liver_alcohol
Adjusts liver damage from alcohol
2017-09-26 07:01:15 -04:00
Anewbe
ee50dc7b01 Moves the Promethean core to the chest. They no longer need heads. 2017-09-24 21:38:30 -05:00
Anewbe
bc44ab42dc Adjusts liver damage from alcohol 2017-09-23 12:15:36 -05:00
killer653
2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Neerti
3bce4ed285 Merge pull request #3893 from Anewbe/bioprinter
Improves the bioprinter
2017-09-21 00:58:41 -04:00
Belsima
c67865ac63 Adds a load of new FBPs. (#3850)
* Adds a load of new FBPs.

* Replaces cyber solutions sprites.

* Fixes and price adjustments.

* Revert "Fixes and price adjustments."

This reverts commit d56c3f082e9301b80970f62aa9d0cb3e8cfc6d8f.

* Fixes + supply price adjustments.

This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.

* Makes the new knockoffs into alternatives for the currently existing brands.

* new names
2017-09-20 22:02:18 -05:00
Anewbe
3beca956a0 Improves the bioprinter 2017-09-19 20:18:13 -05:00
Anewbe
1ff1eb5e88 Merge pull request #3825 from Neerti/9/12/2017_fire_unbugged
Makes Fire Hot Again
2017-09-18 11:22:04 -05:00
Anewbe
c9f83a9d68 Merge pull request #3769 from PrismaticGynoid/forgottenlanguages
Brain transplants, synthetics, and languages
2017-09-16 15:35:29 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Neerti
47b463f4cb Makes Fire Burn Again
Being lit on fire barely did anything, for multiple reasons, all which should be fixed in this PR.
First, the code to do damage based on bodytemperature was literally bugged and only applied the lowest level of damage, no matter what.
Second, wounds made autohealed them fairly fast, sometimes even outhealing the incoming damage.
Third, being on fire raised your temperature rather slowly.
Fourth, the lowest level of 'overheating' damage was rather low.

Changes:
The bodytemperature part of Life() is now unbroken and I accidentally fixed freezing not hurting, so yay.
Added a ten minute delay to wounds being able to autoheal them away.  Applying bandage/salves will skip this.
Temperature climb is now based on fire stacks while on fire, so more stacks means more and longer pain.
Lowest level of overheating was tweaked.
Running into people while on fire will split your fire stacks with them and light them on fire.
Port's /tg/'s on fire sprite.
Different mobs can have different icons for being on fire.
Bonus: Rejuv now removes pain.
2017-09-13 06:26:08 -04:00
Cameron653
830e1bb8c5 Update robolimbs_vr.dm 2017-09-10 20:07:26 -04:00
killer653
6297180aa5 Adds rahboopred sprites 2017-09-10 19:51:41 -04:00
PrismaticGynoid
9c1bb56522 Brain transplants, synthetics, and languages
Brains now retain languages from the mob they were removed from, rather than forgetting them. Languages are also retained when a brain is transplanted into a new body.

AIs, as well as cyborgs/robots/drones, will load languages from your currently-active preferences when they spawn (just like humanoid mobs do). Brains removed from cyborgs/robots/drones will retain their original languages regardless of the current module.

Brains in MMIs can now speak EAL if they know it, and additionally fixes #2832 - sign language will no longer be usable when lacking both hands. Also fixes silicons being told the wrong language prefix by the known languages window, as it was still showing ':', leading to much confusion among new borg players.

Known issues:
AIs who can use sign language can use it even without a holopad - I'm not sure how to have it check for that. This could be seen as a non-issue, as signs could conceivably be displayed on the AI's screen.

AIs signing over holopad will also have the language verbs overridden by the synth speech verbs (states/queries/declares). I'm pretty sure this has something to do with the already-existing bug that all languages can be understood by everyone when an AI speaks them over holopad.
2017-09-06 20:14:17 -07:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Mechoid
5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
Spades
b8cfee22a9 Merge pull request #2085 from Verkister/synthpaintjurbs
Enables markings system on synth body parts.
2017-09-01 07:08:51 -04:00
Verkister
a3196a060c Enables markings system on synth body parts. 2017-08-31 15:40:34 +03:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Belsima
8295742f81 More monitors! 2017-08-15 15:02:35 -04:00