Commit Graph

8317 Commits

Author SHA1 Message Date
Spades
7f9acb1fa0 Angry comments on color_mult vs color_add 2017-10-27 14:52:53 -04:00
Yoshax
714472bd08 Revert "Reverts tajaran blend conversion." 2017-10-27 14:42:11 +01: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
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
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
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
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
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
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
Verkister
c65a281ca4 Update otie.dm 2017-10-20 21:07:15 +03:00
Verkister
69cbcf21ba trim 2017-10-20 19:14:04 +03:00
Verkister
000dcef006 Replaces live otie grabs with a different feature.
-Grabbing a live otie no longer does the classic "break sprite offset and piss off the mob" function.
-Instead it now just leads to a disapproving growl and a loss of bonding if the grabber had befriended the thing before.
-Grabbing a dead one does the old stuff tho so ya can still 'dispose' of the bodies or whatever.
-Serious there's always someone who goes grabbing the nonhostile ones fgshjd :v
2017-10-20 18:50:09 +03:00
Spades
def5fadfa9 Merge pull request #2327 from VOREStation/Cameron653-patch-2
Gives prometheans the drain trait
2017-10-20 02:07:09 -04:00
Cameron653
02e61a6f04 Update station_special_abilities_vr.dm 2017-10-19 21:46:47 -04:00
Cameron653
b270124ae7 I accidentally reversed the messages 2017-10-19 21:43:41 -04:00
Yumi (AKA Gowst)
110f23bbbe adds panda ears and eye markings to character customization 2017-10-19 16:06:53 -05:00
Cameron653
1f78750513 Gives prometheans the drain trait
Because why not
2017-10-18 21:42:20 -04:00
Cameron653
d399a51e63 Update negative.dm 2017-10-18 13:52:20 -04:00
Cameron653
c180781ee5 Update positive.dm 2017-10-18 13:52:18 -04:00
Cameron653
0b1c73d97f Adds minor weaknesses 2017-10-17 19:16:50 -04:00
Cameron653
4853adf0e4 More potent positives & minor positives. Higher cost & clarity 2017-10-17 19:14:41 -04:00
Cameron653
dcf87543d4 Makes some negative traits have more of an "oomph"
Also adds EXTREMELY low endurance trait, which gives you as much hp as a teshari.
2017-10-17 18:57:54 -04:00
Verkister
a5146769e0 Fixes a game breaking conflict related to disabled polaris trait system 2017-10-17 13:27:20 +03:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe
d886e52ac3 Merge pull request #4080 from shazbot194/Synth_color
Synth Coloring
2017-10-16 17:55:24 -05:00
Neerti
9ae54fb2ac Merge pull request #4083 from Anewbe/trait_fix
Trait tweaks
2017-10-16 18:51:01 -04:00
Anewbe
03aa2d691d Trait tweaks 2017-10-16 01:07:56 -05:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
shazbot194
d199d4caf7 Adds in the option to color all synth parts and two sets of parts
As the titles says
2017-10-15 14:56:14 -08:00
killer653
61e1333f88 Adds a "finalize" variable and toggle for drain. 2017-10-15 18:31:28 -04:00
Cameron653
4716e4900d Merge branch 'master' into SUCCUBUS_DRAIN 2017-10-15 17:46:52 -04:00
Spades
9e5594d7cf Merge pull request #2291 from Verkister/excercise
Makes the metabolism traits affect movement drain and weight gain/loss.
2017-10-15 16:32:47 -04:00
Spades
056ed4ca34 Merge pull request #2301 from Screemonster/revivemarkings
reapplies markings after revive for human mobs
2017-10-15 16:32:07 -04:00
Cameron653
dd18ee66fd Update station_special_abilities_vr.dm 2017-10-15 15:25:22 -04:00
Cameron653
3235b77eaa Update station_special_abilities_vr.dm 2017-10-15 15:22:31 -04:00
killer653
2673025daa Removes halloss, adds digestion check 2017-10-15 11:30:19 -04:00
Screemonster
5b03f953f1 reapplies markings after revove 2017-10-15 09:32:46 +01:00
Screemonster
51f3624020 revive fixes and disease purge 2017-10-15 09:17:37 +01:00
killer653
68c1563048 quick edit 2017-10-15 03:28:24 -04:00