Arokha Sieyes
805b473976
Polaris Sync Merge
...
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Neerti
d4b6fc9f32
Merge pull request #3052 from Anewbe/emp_things
...
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Arokha Sieyes
6e8667e948
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
...
# Conflicts:
# code/game/objects/items/weapons/tanks/tank_types.dm
# code/modules/events/canister_leak.dm
# code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29: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
Arokha Sieyes
755bc0d7d1
Adds Serdy's Robobutt
...
Also adds a general cyberlimb whitelisting system since that's apparently needed now.
App: http://forum.vore-station.net/viewtopic.php?f=45&t=875
2017-03-04 17:25:17 -05:00
Arokha Sieyes
9c27dede54
Fix color_mult species.
...
THIS IS WHY WE ADD COMMENTS TO AREAS WE EDIT.
2017-03-03 20:34:08 -05:00
Arokha Sieyes
1ad97486d2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-030217sync
...
# Conflicts:
# code/modules/organs/organ_icon.dm
2017-03-03 19:39:56 -05:00
Anewbe
81549fc965
Revert "BlockHeadHair doesn't make players bald."
2017-03-03 17:19:07 -06:00
Arokha Sieyes
8749e2bc02
Fix custom ear sprite code
2017-03-02 22:50:59 -05:00
Arokha Sieyes
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -05: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
killer653
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05: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
killer653
832418c7c9
Polaris sync
2017-01-15 18:12:15 -05:00
Spades
c9579a3247
Revert "Fix: Promethean coloration error"
2017-01-09 20:42:41 -05:00
Anewbe
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
OrbisAnima
ff73133b3a
Fix: Promethean coloration error
...
Fixes #801 , I tested and everything seemed to work, but given the nature
of organ_icon, I suggest someone else checks it too.
2017-01-06 15:48:54 -03:00
Anewbe
a9c1d34518
Limbs and heads now have a force and throwforce value
2016-12-17 17:33:21 -06:00
killer653
0c73b9da2e
Polaris December Sync
2016-12-10 09:51:11 -05: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
Arokha Sieyes
1be4d0a019
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:15 -04:00
Arokha Sieyes
5de7a29ca4
Tweaks to restore a few VS things
2016-10-21 01:00:59 -04:00
Arokha Sieyes
92833e335c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.
# Conflicts:
# code/datums/uplink/ammunition.dm
# code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
# code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
# code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
# code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
# code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
# code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
# code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
# code/game/gamemodes/technomancer/spells/projectile/overload.dm
# code/game/gamemodes/technomancer/spells/projectile/projectile.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/science.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/flashlight.dm
# code/game/objects/items/weapons/power_cells.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/client/preference_setup/loadout/loadout_shoes.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/clothing/spacesuits/void/station.dm
# code/modules/integrated_electronics/assemblies.dm
# code/modules/integrated_electronics/input_output.dm
# code/modules/integrated_electronics/tools.dm
# code/modules/mob/living/carbon/carbon_defense.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/organs/blood.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/dnalocking.dm
# code/modules/projectiles/effects.dm
# code/modules/projectiles/guns/energy.dm
# code/modules/projectiles/guns/energy/laser.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/research/designs.dm
# html/changelogs/.all_changelog.yml
# html/changelogs/Anewbe - Beret.yml
# html/changelogs/Anewbe - Tape Roll.yml
# html/changelogs/MagmaRam-PR-2631.yml
# html/changelogs/Redstryker - EMTVoidsuits.yml
# icons/mob/head.dmi
# icons/mob/items/lefthand_hats.dmi
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_hats.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/skrell/helmet.dmi
# icons/mob/species/skrell/suit.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/mob/species/tajaran/suit.dmi
# icons/mob/species/unathi/helmet.dmi
# icons/mob/species/unathi/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/species/seromi/hats.dmi
# icons/obj/clothing/species/seromi/suits.dmi
# icons/obj/clothing/species/skrell/hats.dmi
# icons/obj/clothing/species/skrell/suits.dmi
# icons/obj/clothing/species/tajaran/hats.dmi
# icons/obj/clothing/species/tajaran/suits.dmi
# icons/obj/clothing/species/unathi/hats.dmi
# icons/obj/clothing/species/unathi/suits.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/power.dmi
# maps/RandomZLevels/stationCollision.dm
# maps/polaris-1.dmm
# maps/polaris-2.dmm
2016-10-20 21:24:07 -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
MagmaRam
c10b145782
Made bleeding from staunched wounds dynamic
...
yoshax did the thing etc
2016-10-13 22:36:00 -05:00
MagmaRam
b141a993de
More tweaks that Yoshax should get credit for
2016-10-12 22:02:56 -05:00
MagmaRam
45d1dcc966
Merge branch 'bloodloss' of https://github.com/MagmaRam/polaris
2016-10-12 22:00:33 -05:00
MagmaRam
38a037edb3
Optimization tweak, credit to Yoshax
2016-10-12 15:59:18 -05:00
MagmaRam
bdf3dde514
Readd bleeding from open surgery stages.
2016-10-12 07:28:22 -05:00
MagmaRam
0fd5631c27
Bloodloss now depends on wound type and limb
2016-10-12 07:20:35 -05:00
MagmaRam
59d2608fbb
Bruises now bleed at a much higher damage threshold.
2016-10-11 22:28:57 -05:00
