Commit Graph

925 Commits

Author SHA1 Message Date
Arokha Sieyes
d998f36c38 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2017-12-26 23:07:58 -05:00
BothNevarBackwards
4540f770d4 Lots of species stuff ported from Baystation (#4442)
* Ports species based footprints from bay
- https://github.com/Baystation12/Baystation12/pull/17935
- https://i.imgur.com/ojAU373.png
- Unathi use claw on right
- Taj and tesh use paw in center

* Flash stuff glasses protection things

* Flash stuff actual thing

* Organ mult thingy

* Floaty eyes and cloak setup

* Species falling
2017-12-26 14:28:21 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Spades
54b5d74ada Revert "Chirret species" 2017-12-19 19:47:50 -05:00
Cameron653
b7d0c61cee Merge branch 'master' into CHIRRET_SPECIES 2017-12-18 19:48:38 -05:00
Arokha Sieyes
7c26e03d52 Reenable organ rejection but make it work correctly
Based on the name of the species, rather than datum, so printed/former bodies of the same species used as donors (or anyone with the same species name, really, if you want to do certain things, like "Chakat" organs would be compatible with each other).
2017-12-16 11:23:37 -05:00
killer653
55230a5b1f More edits! 2017-12-15 22:12:28 -05:00
killer653
7f70702f58 WIP. 2017-12-14 22:54:01 -05:00
SubberTheFabulous
9dbb99b515 Adds yet another FBP, also fixes a little sprite error (#4419)
* Adds new set of cyberlimbs, fixes annoying sprite

* Adds a new set of robolimbs

FOR SOME REASON

* Fixes stuff

i miss things ok

* Update robolimbs.dm

* Update robolimbs.dm
2017-12-11 00:46:51 -06:00
Anewbe
c95206c9f3 Makes species bleed out faster or slower 2017-12-02 18:14:35 -06:00
Cameron Lennox
755f8828a6 Allows xenochimeras to choose icon base 2017-12-02 16:04:20 -05:00
Neerti
2f7db506eb Adds Variable Click Delay
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
Anewbe
1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
Neerti
595f874f9b Merge pull request #4264 from Anewbe/decap_defib
Decapitation now stops defibrillation
2017-11-19 17:50:03 -05:00
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
Anewbe
f5e831050b Decapitation now stops defibrillation 2017-11-14 01:15:29 -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