Commit Graph

18558 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
ce2e4b1c54 Merge pull request #2367 from Natje0/master
Adds Large Feathered wings
2017-10-25 21:09:34 -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
2d9198780e Merge pull request #2350 from Verkister/unbrutal
Applies the gurgle damage scaling to borg gains as well.
2017-10-25 00:41:16 -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
Natje0
c2473bf948 Code for large angel wings 2017-10-24 13:47:43 +02: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
Cameron653
58bcdf46e2 fuck 2017-10-22 12:31:38 -04:00
Verkister
0e71454e5e Re-enables the old vox sprites.
-Requested and majorly preferred shitBIRDS
2017-10-22 15:40:05 +03:00
Verkister
c0056612ad Merge branch 'master' of https://github.com/VOREStation/VOREStation into unbrutal 2017-10-22 15:20:04 +03:00
Verkister
8c23737fea Applies the gurgle damage scaling for borg gains as well.
-Also lowers the dead mob gain to the same tickdamage-to-corpsegurgle ratio as it is to humans because fuck getting 100% charge from a mere handful of mice.
2017-10-22 15:19:38 +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
e36beffc16 Merge pull request #2344 from VOREStation/Cameron653-patch-2
Vampire Stuff
2017-10-21 23:29:34 -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
0e82f4f3bf Merge pull request #2332 from Verkister/backuppery
Adds a mind backup nifsoft and fixes sleevemate nif and quit issues.
2017-10-21 23:17:49 -04:00
Spades
58847349de Merge pull request #2326 from VOREStation/Cameron653-patch-1
Makes soulcatcher actually purchasable for most jobs
2017-10-21 23:17:28 -04:00
Spades
838654f9d5 Merge pull request #2339 from Verkister/unbrutal
Removes the minimum limits to gurgle damage and scales the nutrition gain with them.
2017-10-21 23:15:53 -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
killer653
d5465eab5f Merge remote-tracking branch 'refs/remotes/VOREStation/master' into HARD_VORE 2017-10-21 21:20: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
Yoshax
d58293749e Reverts Ace's changes to make parapens functional 2017-10-21 17:50:07 +01:00
Cameron653
25ae5840e4 Lets blood bags be drank in increments 2017-10-20 17:16:22 -04:00
Cameron653
43f7518e79 Lets vampires actually drink blood 2017-10-20 17:14:33 -04:00
Cameron653
d1e939a50d Adds holo collar to loadout 2017-10-20 16:24:29 -04:00
Verkister
c430022447 I actually made the lower limit obsolete with the scaling oops 2017-10-20 21:19:23 +03:00
Verkister
c65a281ca4 Update otie.dm 2017-10-20 21:07:15 +03:00
Verkister
d58cacc85a Scales the nutrition gain according to gurgledamage. 2017-10-20 20:50:02 +03:00
Verkister
32b8cbc080 Okay made it 1 minimum for both. 2017-10-20 20:39:01 +03:00
Verkister
ee83f721c4 Adds rng backgrounds to character setup preview.
-They swap upon every preview refresh.
-Current selection comes with full black, full white, 'steel' floor tiles, white flor tiles, bare plating, and reinforced floor.
-We'll see if I feel like figuring out how to make a proper selection button later.
2017-10-20 20:35:21 +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
Verkister
5d97f81047 Sets the minimum digest brute to 0 from 3.
-Afaik the 3 was supposed to be like the minimum total damage for the slowest gurgles, but with the limit being applied to both damage types, the actual minimum damage was restricted to 2+3 or 3+3 depending whether you had touched the default brute value or not, basically causing the slowest possible digestion still being faster than default.
2017-10-20 12:57:42 +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
Verkister
e7fc6a3800 Adds a mind backup nifsoft and fixes one-time scans not saving nifs.
-Adds a nifsoft that can be used for manual mind backups on the go sleevemate style.
-Fixes one-time backups not saving nifs (sleevemate and this thing)
-Apparently the backup proc only saved nifs on the second sync.
2017-10-19 12:16:53 +03:00
Cameron653
1f78750513 Gives prometheans the drain trait
Because why not
2017-10-18 21:42:20 -04:00
Cameron653
0a347293a9 Update 13_soulcatcher.dm 2017-10-18 18:13:57 -04:00