Commit Graph

18529 Commits

Author SHA1 Message Date
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
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
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
Cyantime
231859ae27 Fixes the sizegun's origin_tech 2017-10-17 19:15:43 -04:00
Verkister
a5146769e0 Fixes a game breaking conflict related to disabled polaris trait system 2017-10-17 13:27:20 +03:00
Verkister
23b81fa0ed Fixes the special type tails using wrong blend mode.
-The ones using effects/species_tails_vr.dmi
-Unathi, tajaran, sergal(old), akula, nevrean, tesh, fox, fennec.
2017-10-17 09:36:12 +03:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Neerti
5af9c1971d Merge pull request #4077 from Anewbe/rings
Rings
2017-10-16 19:04:36 -04:00
Neerti
d42edb679b Merge pull request #4069 from Anewbe/costumes
Halloween Costume Outfits
2017-10-16 19:01:25 -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
Neerti
7b5f8bddd1 Merge pull request #4081 from Cameron653/512_FILTER_FIX
BYOND 512 Compiling Errors Fix
2017-10-16 18:47:47 -04:00
Cameron653
266e300d27 Merge pull request #2306 from saysage/master
Hotfix for custom clothes
2017-10-16 16:47:50 -04:00
Anewbe
4f86947108 Merge pull request #4079 from Mechoid/Organ_Harvesting_Not_Included
Prosthetic Organ Expansion
2017-10-16 14:21:19 -05:00
Anewbe
b14766ff92 Merge pull request #4078 from Mechoid/Projectile_Turretfunctions
Turret Targetting Update
2017-10-16 14:03:05 -05:00
saysage
934288aa9e Update custom_clothes_vr.dm 2017-10-16 16:02:35 +03:00
Anewbe
fc59e6ee4c Merge pull request #4076 from Kholdstare34/outbox
Adds heads of staff cloaks, adds them to the loadout.
2017-10-16 04:27:30 -05:00
mistyLuminescence
f87a6d7d8c Adds a white robe. (#4074)
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!

* Adds a hooded white robe.

* Fixes the white robe.

* Fixes the robe, again
2017-10-16 04:27:03 -05:00
Anewbe
03aa2d691d Trait tweaks 2017-10-16 01:07:56 -05:00
Anewbe
c2b7542c4e Merge pull request #4075 from Mechoid/NANOMACHINES_SON
Fixes roboheads being crammed onto flesh-bodies.
2017-10-16 01:04:18 -05:00
Anewbe
dc0d445383 Merge pull request #4073 from Mechoid/Knight_Of_The_Living_Shield
Dead bodies are no longer perfect shields.
2017-10-16 00:37:10 -05:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
killer653
0f20177c5f Some more fixes 2017-10-15 19:02:26 -04:00
killer653
3cd3054811 Fixes filter being used, which prevented compiling 2017-10-15 19:01:55 -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
Mechoid
a9e9236d7f Prosthetic Organ Expansion 2017-10-15 15:12:51 -07:00