Commit Graph

566 Commits

Author SHA1 Message Date
MagmaRam
8b541292a5 Merge pull request #3183 from Anewbe/overdose_boogaloo
Overdose is more dangerous, Bicaridine works again
2017-03-30 21:00:44 -05:00
MagmaRam
4e43960fcf Merge pull request #3177 from Anewbe/doona_organs
Diona limbs should be easier to remove
2017-03-30 20:53:45 -05:00
Anewbe
cf9e3f8789 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into overdose_boogaloo 2017-03-30 20:51:13 -05:00
Anewbe
d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks
Adds Body Markings
2017-03-30 20:13:15 -05:00
Anewbe
f7d086fa59 Overdose is more dangerous, Bicaridine works again 2017-03-30 20:09:21 -05:00
Anewbe
caea997f7d Diona limbs should be easier to remove 2017-03-29 14:58:12 -05:00
Anewbe
7ae8d934f5 Should fix a Travis issue 2017-03-28 20:24:17 -05:00
MagmaRam
2f976a22f8 Merge pull request #3158 from Anewbe/fbp_screams
FBPs should no longer scream when they collapse
2017-03-28 20:03:01 -05:00
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
Anewbe
73ab115295 Fixes a thing. 2017-03-27 22:32:02 -05:00
Anewbe
ff21e5d786 FBPs should no longer scream when they collapse 2017-03-27 17:52:09 -05:00
Arokha Sieyes
52130160db Adds Body Markings
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.

The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.

They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-26 19:36:34 -04:00
Anewbe
22ae87c376 Fixes a bug with meatbrain FBPs. 2017-03-26 16:34:47 -05:00
Anewbe
d90699998b Adds skintone to FBPs 2017-03-25 13:55:49 -05:00
Anewbe
3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
Anewbe
980c982996 Fixes the conflicts in the original branch 2017-03-22 17:51:04 -05:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Neerti
7f14550a9a Merge pull request #3010 from Anewbe/cargo_heph
Readds HI prosthetics, corrects naming
2017-03-21 00:27:00 -04:00
Anewbe
4779baf872 Spelling 2017-03-20 20:14:48 -05:00
Neerti
d4b6fc9f32 Merge pull request #3052 from Anewbe/emp_things
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Anewbe
e526a4cdc7 Merge pull request #3062 from Anewbe/skull_head
Adds Morpheus skull head
2017-03-12 20:05:23 -05:00
Anewbe
6a26b48469 Merge pull request #3067 from VOREStation/batt
Give internal cell its own icon
2017-03-11 21:27:20 -06:00
Arokha Sieyes
9373c0d00d Give internal cell it's own icon
Was a little weird to reuse the supercell... there are already WAY TOO MANY "not an actual powercell" powercells. So this one is just repainted blue and joins all the other prosthetic organs in surgery.dmi. The icon line can just be removed because the parent points to this file.
2017-03-09 16:30:57 -05:00
Anewbe
50b508f2d6 Adds Morpheus skull head 2017-03-07 22:34:42 -06:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Anewbe
81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06:00
Anewbe
a0198fb947 Merge pull request #3022 from VOREStation/infections
Infection code improvement
2017-03-02 19:54:26 -06:00
Anewbe
a45ef074bd Merge pull request #3029 from VOREStation/blood
Make blood loss/heart removal make sense
2017-03-02 17:03:44 -06:00
Arokha Sieyes
e1da67d37f Make blood loss/heart removal make sense
Right now it gives you 300 toxin damage "to be sure" you die. That's a little odd. Especially on health scanners after someone has bled to death. And you can't do heart transplants. We can do heart transplants now in 2017. 3500 per year. Pretty sure they won't forget how by 2561 or whatever.

This makes having no heart or too little blood do 75 oxyloss per tick. Enough to kill you eight seconds if you have no special care. It becomes 15 per tick with dexP which is fast enough to kill you "pretty fastly" and slow enough you can swap out a heart in surgery.

With dexP+dex+tric it becomes a meager 10ish per tick, but an inevitable 10 per tick as they are literally now full of every oxyloss removing drug in the game. So you can survive a couple of minutes, max, with not enough blood. You're still paralyzed and eye_blurry for most of it. You should probably be in surgery.
2017-03-01 15:59:11 -05:00
Arokha Sieyes
2c493405bd More tweaks
Fix necrotic limb surgery
Make fever not so powerful that it resists cryotubes
All necrotic limbs produce toxins unless OD on spaceacillin, regardless of infection
Fix dropper use during surgery
Fix 'gap' in printable adv scanner infection reports
Fix nanoui template for adv scanner
Add examine text to gangrene and highly infected external limbs
Add flags to the MMI holder organs to make them robotic, and thus not infectable if they are > squishy MMI (posibrain, digital)
2017-02-28 01:13:29 -05:00
Arokha Sieyes
9ef7496545 Infection code improvement WIP 2017-02-27 16:35:56 -05:00
nachomeep
9d3aba5832 Fixes blockheadhair tag. 2017-02-25 09:49:24 -05:00
Anewbe
9d6a11e17d Readds HI prosthetics, corrects naming 2017-02-23 14:41:24 -06:00
Anewbe
6930f06030 Fixes some stuff 2017-01-25 15:59:40 -06:00
Anewbe
83db0cc38f Medical tweaks 2017-01-23 23:43:44 -06:00
Anewbe
3be442e766 Merge pull request #2947 from Anewbe/surgery_things
Surgical tools will no longer cause damage on help intent
2017-01-21 22:38:25 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
d3607df788 Prosthetic organs have sprites and take emp damage properly 2017-01-21 16:04:43 -06:00
Anewbe
86077f6c1a Broken bones work differently 2017-01-19 15:32:58 -06:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Anewbe
a9c1d34518 Limbs and heads now have a force and throwforce value 2016-12-17 17:33:21 -06:00
MagmaRam
e93095bbda Merge pull request #2722 from Anewbe/liver_damage
Makes tox damage more dangerous
2016-11-21 12:35:51 -06:00
Anewbe
d85d89015e Ups the threshold to 50 2016-11-19 13:37:26 -06:00
Anewbe
89b8a66a44 Merge pull request #2749 from Yoshax/braindeath
Being unable to breathe and having oxyloss now causes brain damage that scales with your oxyloss
2016-11-16 17:16:33 -06:00
Yoshax
4885482d2b Moves the brain into the same place as the other organ files 2016-11-15 21:55:01 +00:00
Anewbe
189a9a4329 Brand disks now come in their own crates, prices increased 2016-11-13 16:03:03 -06:00
Anewbe
6df4ebe1c7 Makes tox damage more dangerous 2016-11-11 00:24:16 -06:00
Arokha Sieyes
bc2a51c64f FBP/Synth wound sprite updater
It returned before it got to the bottom with robotic limb repair, which would leave the wound sprites on them unless an admin forced an icon update on them. So now we update them just like we do for organics a few lines below when wound levels change.
2016-11-04 14:24:42 -04:00
MagmaRam
e066506ccb Blunt weapons can no longer cause cuts.
This is a necessary change for the intended effect of this bloodloss
system.
2016-10-16 15:53:04 -05:00
MagmaRam
289d32c23a Used the wrong defines for the organ tags, whoops. 2016-10-16 15:52:17 -05:00