Commit Graph

8359 Commits

Author SHA1 Message Date
Cameron Lennox
c99e7b51da Changes the knockout checks to incap all.
Also stops micro interactions while flying.
2017-10-29 11:30:43 -04:00
killer653
28e75a89aa Makes incap checks more extensive. 2017-10-28 21:28:56 -04:00
killer653
884e80cd7d Checks for incap instead. Prevents floating on tiles 2017-10-28 20:29:07 -04:00
killer653
e9585bfc6d Allows flight with wings. 2017-10-28 19:51:14 -04:00
Spades
fe812c9f87 Merge pull request #2371 from Verkister/nastiness
New gurgle contamination system.
2017-10-28 11:18:50 -04:00
Spades
db8a51cf98 Merge pull request #2380 from Cameron653/master
Polaris Sync
2017-10-28 11:18:35 -04:00
Yoshax
0aeae047b1 Revert "Angry comments on color_mult vs color_add" 2017-10-27 22:09:03 +01:00
killer653
0c480ec15f Polaris sync 2017-10-27 15:30:24 -04:00
Spades
5778cc3f1e Merge pull request #2379 from VOREStation/tajaran-icon-fix
It's just comments.
2017-10-27 14:54:03 -04:00
Spades
7f9acb1fa0 Angry comments on color_mult vs color_add 2017-10-27 14:52:53 -04:00
Spades
64230d9726 Merge pull request #2376 from Cyantime/patch-1
Minor drain and HV cleanup
2017-10-27 14:32:35 -04:00
Cyantime
d98f9949c5 Missed a ) 2017-10-27 11:30:45 -04:00
Cyantime
2714be459a Minor drain and HV cleanup 2017-10-27 11:24:22 -04:00
Yoshax
714472bd08 Revert "Reverts tajaran blend conversion." 2017-10-27 14:42:11 +01:00
Neerti
b4597f06bd Merge pull request #4147 from Anewbe/footstep_tweaks
Adds a footstep volume modifier to shoes
2017-10-26 20:11:15 -04:00
Mechoid
e1eaec0add Merge pull request #4154 from Anewbe/footsteps_fix
Corrects the walking footstep play ratio
2017-10-26 15:31:23 -07:00
Mechoid
05367ba8d9 Merge pull request #4152 from Anewbe/claustrophobia_nullcheck
Adds a nullcheck to the claustrophobia trait
2017-10-26 10:56:59 -07:00
Verkister
f059fd2704 New gurgle contamination system.
-Added a new type of dedicated contamination proc for gurglestuffs.
-New gurglecontamination can have different outcomes depending on item.
-New soggy overlay with stink lines lmao.
-Also affects the items' name and flavor text until washed.
-Washable in regular sinks too.
-Affects a whole lot of more items than the phoron contamination with the ability of decontaminating without washing machine.
-Also made gurgled "holder" items (picked up mobs like mice, micros, and monkeys) drop their mob into the belly instead of just poofing out of existence with it.
2017-10-26 19:13:49 +03:00
Spades
6bc4b68e10 Merge pull request #2351 from Verkister/oldvox
Re-enables the old vox sprites.
2017-10-26 00:30:06 -04:00
Spades
1b5910b65f Merge pull request #2359 from Verkister/missinghisperiod
Fixes missing limbs showing no names and shit on custom species.
2017-10-25 21:11:19 -04:00
Spades
6dd44b58cb Merge pull request #2368 from Xsdew/master
Catwoman Markings
2017-10-25 21:09:20 -04:00
Spades
6cf8f56489 Merge pull request #2366 from Verkister/tajaddsfghjd
Reverts tajaran blend conversion.
2017-10-25 21:08:45 -04:00
Spades
8e549b8084 Merge pull request #2340 from Verkister/otiegrabs
Replaces live otie grabs with a different feature.
2017-10-25 00:40:59 -04:00
Neerti
98e94ddbf2 Merge pull request #4150 from Anewbe/betterMedAviators
Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout
2017-10-24 21:18:11 -04:00
Xsdew
4b6ff72f6d Catwoman Markings
This adds four new markings, all inspired from Felicia from Darkstalkers. The Catwoman chest,groin,left leg, and right left markings.
2017-10-24 20:12:22 -04:00
Anewbe
a29f386fd3 Corrects the walking footstep play ratio 2017-10-24 17:36:19 -05:00
Anewbe
820f264055 Adds a nullcheck to the claustrophobia trait 2017-10-24 16:34:49 -05:00
Anewbe
b915565655 Merge pull request #4145 from MisterLayne/GimmeDemMaterials_BORG
Ends organic bias.
2017-10-24 11:38:11 -05:00
Verkister
1a097c71f1 Reverts tajaran blend conversion.
-Now sit down before I come there and actually destroy your crops, slaughter your cattle, and pollute your waters et cetera.
2017-10-24 14:30:32 +03:00
Cameron653
f30dfd4304 RIP AND TEAR 2017-10-23 22:39:39 -04:00
Anewbe
09ff4c1a3a Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout 2017-10-23 16:30:09 -05:00
Verkister
23811f4dab Fixes missing limbs showing no names and shit on custom species.
-Yeah found out the reason, pretty clear by logic after figuring it out, but still somehow functional for normal species apparently(itjustworks.jpg)???
-The stuff was relying on some sort of "descriptor" in the has_limbs list that does not seem to even exist.
-Adding this "descriptor" to custom species limbs list reliably fixed the issue on test runs.
-No fucking clue how the other species somehow manage without that thing however.
2017-10-23 20:56:32 +03:00
Neerti
ca84cd326a Merge pull request #4139 from Anewbe/nicknames
Adds the ability to choose nicknames
2017-10-23 13:37:34 -04:00
Anewbe
f35ae9dae5 Adds a footstep volume modifier to shoes 2017-10-22 23:37:51 -05:00
MisterLayne
ce9181877e Gives engineering robos some nice new materials. 2017-10-22 23:10:02 -04:00
OrbisAnima
f7228ba3ab Sanitize sprite sheet species call
Fixes #2186 , this bug was not reported in Polaris, and its kinda critical due to its grieffy nature, so its best to first patch it, and then get someone to comment it upstream.

Special thanks to Bluehaus for testing the fix, and to Mewchild for reporting and testing the bug in the first time.
2017-10-22 22:19:50 -03:00
Mechoid
6f27d2ae7e Merge pull request #4115 from Anewbe/modular_armor
Steals Bays modular armor, for later use
2017-10-22 17:55:25 -07:00
Mechoid
9e8c4b07ff Merge pull request #4121 from Anewbe/bring_back_sneak
Makes footsteps less common on walk intent
2017-10-22 17:46:38 -07:00
Anewbe
f1975c5f18 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vatborn 2017-10-22 19:06:09 -05:00
Anewbe
6fe70cd0a3 Merge pull request #4122 from MisterLayne/emotes4dayz
More emotes!
2017-10-22 14:52:07 -05:00
Verkister
0e71454e5e Re-enables the old vox sprites.
-Requested and majorly preferred shitBIRDS
2017-10-22 15:40:05 +03:00
Verkister
dd9c6da94f Update otie.dm 2017-10-22 09:54:42 +03:00
Anewbe
28c9c12837 Adds the ability to choose nicknames 2017-10-22 00:56:46 -05:00
Anewbe
6543723c6e Merge pull request #4124 from Belsima/giantmobs
Fixes giant mobs and adds more.
2017-10-22 00:26:58 -05:00
Spades
f83ede7428 Merge pull request #2314 from VOREStation/TRAITS_CLARITY_AND_CHANGES
Traits clarity, changes, and additions.
2017-10-22 00:31:45 -04:00
Spades
75a9be5307 Merge pull request #2346 from Cameron653/HARD_VORE
Brutal Predation & minor adjustments.
2017-10-21 23:29:07 -04:00
Cameron653
39a47803b8 Removes the bloodsuck and shred from Prometheans 2017-10-21 23:18:56 -04:00
Spades
433627ca15 Merge pull request #2335 from Yewmi/panda-time
Adds character options for panda ears and eye markings
2017-10-21 23:14:18 -04:00
killer653
c85fe528d6 REST OF THE OWL- I MEAN CODE 2017-10-21 22:42:39 -04:00
Cameron Lennox
0af2a17acc Hard vore code.
EIGHT HOURS OF WORK. AAAAAAAAAHHHHHHHHHHHH
Now time to add it to traits & other species.
2017-10-21 20:38:08 -04:00