Commit Graph

1259 Commits

Author SHA1 Message Date
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
PsiOmegaDelta 7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
Arokha Sieyes 6b0ca056d6 Make NIFs survive Rejuve 2017-06-06 19:34:53 -04:00
Arokha Sieyes 08e7703e4f Finishing Up NIFs
Squashed commit:

[4b18ca1] Finishing up NIFs

[e4adb4a] Tons more NIF work

All the implants are done!
2017-06-06 19:34:41 -04:00
Arokha Sieyes 58ee6891f2 Additional Work on NIFs
Squashed commits:

[9563a9a] All the stuff I forgot to commit
2017-06-06 01:00:46 -04:00
PsiOmegaDelta ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Arokha Sieyes d63303f136 Merge pull request #1609 from VOREStation/polaris-sync-2017-06-01
Polaris sync 2017 06 01
2017-06-03 00:43:51 -04:00
Verkister 8af7fe67be Verk's synthfluff stuff for possible easylazy approval. (#1600)
* Adds the Rahboop synth limb set. Also fixes the white stray pixel in ponytail 6 hair.

* combined rahboop tail to the groin component I have no idea whether the loose tail icon would've showed up at all :v

* fixed slight pixel offset in left side limbs.

* more pixel adjustment smh

* an attempt.

* Figured out the tail stuff.

* Fuck it. Sharing is caring.
2017-06-02 09:08:38 -04:00
Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Arokha Sieyes 4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
MagmaRam cfa6387f15 Reduces autoheal cutoff on all external wounds to 10. 2017-05-24 15:45:48 -05:00
Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe a2c4c91789 Starts support for species robolimbs 2017-05-04 20:50:16 -05:00
Neerti ccb5e5700b Merge pull request #3387 from VOREStation/aro-pol-zzz
Stasis Bag and Sleeper Changes
2017-05-02 12:09:33 -04:00
Neerti 6de110303e Merge pull request #3400 from LorenLuke/Limb-sever-speed
Limbs no longer sever at supersonic speeds.
2017-04-30 21:16:39 -04:00
LorenLuke a8c0247902 Limbs no longer sever at supersonic speeds. 2017-04-30 09:58:25 -07:00
Arokha Sieyes 58fec31ea4 Allows 'escaping' sleepers, among other things
Added some helper procs for stasis things, and also allows using grabs on sleepers like the advanced scanner because that inconsistency between the machines was bothering me.
2017-04-29 18:59:28 -04:00
Anewbe fdee83cd40 Fixes the spare brand in the prosthetic fabricator 2017-04-29 15:00:26 -05:00
Cerebulon 09cea78cdd Adds Unbranded monitor head.
https://gyazo.com/d37e65286cefb0d8611b8bd95747cc36
https://gyazo.com/e432d6a286c50f79f223725bcebd1733
https://gyazo.com/6f63caa3db135ff27ea5e9dcd77469f7
2017-04-26 02:56:24 +01:00
Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Neerti e951ff344e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 4/18/2017_modifier_system_and_lings 2017-04-19 13:47:57 -04:00
Anewbe bf7dce79cc Unathi mechanical changes (#3256)
* Unathi changes

* Tweaks blurb

* Alcohol tweaks

* Age tweak

* Slowdown

* Adds Unathi to the codex

* Fixes Unathi Organs, adds sprites

* Fixed the changelog

* Sprite and language tweaks, Unathi
2017-04-19 13:42:51 -04:00
Neerti ea6128f986 Adds Modifier System, Changes Some Ling Stuff
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc.  The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
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