Leshana
2e59e24dca
Merge branch 'master' of ../Polaris into polaris-sync
2017-04-16 20:58:40 -04:00
Neerti
6d60fb7cd6
Merge pull request #3276 from Anewbe/bloodloss_tweak
...
Weakens bloodloss from burn damage
2017-04-16 00:16:40 -04:00
Leshana
7a4dc4bf79
Merge remote-tracking branch 'polaris/master' into polaris-sync
...
# Conflicts:
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Anewbe
d1657e23c2
Ling and Technomancer now have ways to cure infections
2017-04-12 19:15:32 -05:00
Anewbe
8a2c84eba3
Weakens bloodloss from burn damage
2017-04-11 12:28:48 -05:00
Arokha Sieyes
6d74e20e2a
Fix up a few more things with synth printing
...
Species now 'suggested' by robolimb manufacturer, helps with getting the correct hairstyle choices for each synth, so Taj have access to Taj hair styles and whatnot in mirrors if they are using a Taj-based synth. Also adds a DSI Akula variant that Zalvine should touch up later hopefully.
2017-04-09 23:56:13 -04:00
Arokha Sieyes
909231963e
Add generic tails for DSI synths
...
So when made they come with the generic species tail, at least.
2017-04-09 22:13:34 -04:00
Arokha Sieyes
7f8e013178
Merge pull request #1354 from DemgelZalvine/Synthwork_Branch
...
Synthwork Species Update!
2017-04-06 18:03:13 -04:00
Zalvine
474728e540
fixing this all for PR, whee. (+1 squashed commits)
...
Squashed commits:
[3981ec7311] fixing this all for PR, whee.
2017-04-06 09:27:13 -05:00
Arokha Sieyes
85a489b9b6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-04-04 20:25:00 -04:00
Anewbe
cb877ab09a
Robolimbs last longer without negative effects
2017-04-02 19:35:31 -05:00
Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
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
Arokha Sieyes
e116f08d24
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-30 18:05:20 -04: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
Yoshax
1120d8c633
Fixes the color application on Vey-Med prosthetics
2017-03-29 00:42:53 +01: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
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04: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
Arokha Sieyes
be9bcf81f0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-03-21 11:22:29 -04: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
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
