Commit Graph

696 Commits

Author SHA1 Message Date
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
Spades
e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Yoshax
b3c2cea59c Fixes Promethean Humans looking really, really bad 2017-08-13 21:48:41 +01:00
killer653
63c496e79c FIXES 2017-08-12 23:49:24 -04:00
killer653
dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Verkister
97c5cb924b A big accessory blend mode overhaul.
-Converted a buttload of markings, ears, and tails to use multiply blend mode instead of add.
-Enabled marking type dependent blend mode for markings code (was hard limited to add mode)

ears
-squirrel
-bear
-wolf
-sergal
-otie
-cow
-jagged
-elven
-sleek

tails
-squirrel
-kitty up and down(w)
-tiger(w)
-stripey
-bear
-wolf
-ringtail
-dragon
-curltail(w)
-straight(w)
-tigertail(w)
-vulptail(w)
-otie
-jagged
-snaketail
-sergal

markings
-vulp set(belly,fullbelly,crest,nose,face,earsface,allhead)
-sergal full(f/m)
-monoeye
-nevrean beaks
-shaggy mane
-otie set(nose,face,belly,back,fingers,socks)
-cow full
-corvid set(belly,beak)
-jagged set(body,snout,mask)
-zorren set(belly,face,muzzle,socks,longsocks)
-tesh feathers
2017-08-12 19:08:23 +03:00
Belsima
31f9127cf9 Adds Grayson Manufactories FBPs. 2017-08-10 14:38:33 -04:00
killer653
a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Anewbe
fdfec79e6c Tweaks prometheans 2017-07-29 20:14:20 -05:00
MagmaRam
77b4382c10 Merge pull request #3414 from Anewbe/robolimb_things
Starts support for species robolimbs
2017-07-26 18:34:48 -05:00
Verkister
3d7759ae7c Remade the file that got lost during the explosive github shenanigans.
-Also tweaked the sergal face marking ever so slightly idk.
2017-07-25 22:30:58 +03:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Verkister
024cc65175 irrelevant fluffstuff
-I just happened to feel so extra again and wanted to use my github dog logo somewhere, which happened to become a custom icon for eggnerd robolimb design disk.
2017-07-08 21:05:39 +03:00
killer653
c4a2caba2e Duplicate of #1799 2017-07-05 12:07:21 -04:00