Commit Graph

2079 Commits

Author SHA1 Message Date
Novacat
35d97e041c Merge pull request #9339 from VOREStation/Verkister-patch-5
Fixes digested PDAs dropping IDs on the floor
2020-11-23 04:55:57 +00:00
Razgriz
34ae4d5fc1 Update living_vr.dm
Problem: Pressing cancel would eject someone from belly anyway.

Solution: Fix code.

I am actually entertained that that this has been around for years and only now someone has actually clicked cancel :P
Also entertained that the following condition has a != operator but not the former.
2020-11-19 01:41:26 -07:00
Verkister
edbf60861c Merge pull request #9319 from VOREStation/Verkister-patch-6
Fixes flavor double post on vore
2020-11-17 22:06:00 +00:00
cadyn
a67c751841 Merge branch 'master' into upstream-merge-9307 2020-11-15 00:48:22 -08:00
Chompstation Bot
f932e65178 Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss 2020-11-15 08:44:14 +00:00
Razgriz
a9b48f90b2 Change OOC Escape message
Because old message is crap and OOC Escape is great for escaping stupid mobs because vore mechanics in combat is a meme, and with other people consent is important. You should never feel threatened or intimidated to press this button.
2020-11-13 02:59:24 -07:00
cadyn
3904a62aaf fucking stupid demons 2020-10-29 20:38:24 -07:00
cadyn
64693de63a Accounting for lack of demons is_incorporeal() 2020-10-29 19:28:50 -07:00
Cadyn
d88245bd55 Slip vore is upon us 2020-10-29 19:00:45 -07:00
Razgriz
f8d66d3f54 Update living_vr.dm 2020-10-28 18:36:19 -07:00
Razgriz
5992126672 Update living_vr.dm 2020-10-28 18:35:45 -07:00
Razgriz
7d2b99504f Merge pull request #755 from CHOMPStationBot/upstream-merge-9250
[MIRROR] Add Lamia Mobs (sprites by Prof. Smokey!)
2020-10-27 01:13:24 -07:00
Chompstation Bot
04a00319a7 Add Lamia Mobs (sprites by Prof. Smokey!) 2020-10-26 17:03:13 +00:00
Razgriz
23defa0ac2 Merge pull request #747 from Darlantanis/PitcherPlants
Pitcher plants
2020-10-23 19:52:13 -07:00
Darlantan
6662067c99 Fixes synx oversight
Removes "retaliate" because this parent doesn't exist and fixes bump noms
2020-10-22 08:05:48 -04:00
Cadyn
0c96b58f3f Fixing conflict and allowing export chatlog 2020-10-21 13:28:59 -07:00
Chompstation Bot
19517fcede 13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation 2020-10-20 03:19:38 +00:00
Cadyn
77336c7c98 Finally setting up the PR bot 2020-10-14 21:14:38 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Verkister
6b743affa9 Small item digestion fix/tweak
Fixes gurgle damages higher than the item's w_class value giving excess nutrition (like 6+6 damages would give 3 w_class worth of nutrition per cycle, totaling to be worth w_class 6 when taking 2 cycles) and also lets the digestion handle the entire item with one cycle if the damage is sufficient enough. A ciggy butt will no longer be worth 1,5 mining drills on max damage.
2020-10-05 20:12:06 +03:00
Razgriz
879e7156e8 Chomp-specific 2020-10-04 23:58:23 -07:00
Verkister
b1dd9b0531 Update sprite_accessories_taur_vr.dm 2020-10-02 17:57:15 +03:00
Verkister
a00e979e17 haha me funney 2020-10-02 17:56:42 +03:00
Verkister
fa176c3b5c Couple taur fixes.
Fixes skunk being a wolf subtype and thus going for the wolf fitted taursuits (oops)
Also fixes the taur riding mechanics not allowing non-ridable "taur tails" (aka tails just using the subtype for wider sprites without actually being taurs) to ride.
2020-10-02 17:50:08 +03:00
Riley
ec42a286d0 Clara's Vacuum Flask
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831

Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
2020-09-29 18:01:07 -04:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Heroman
c9a019ee01 Adds Charles' Tophat 2020-09-28 04:54:23 +10:00
Razgriz
411d757f90 Comment out Liquid Belly, awaiting TGUI port 2020-09-26 15:02:07 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
bf73137818 Add Shadow Larkens laptop fluff item 2020-09-20 03:35:28 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Verkister
864f1cce66 more tweaks and also bags 2020-09-12 21:07:19 +03:00
Verkister
b5bb1e038e Adds skunk taur
Also fixes fat wolftaur markings (no more rectangle crop-over overlapping the legs)
2020-09-12 20:38:35 +03:00
Matica
c04771f0fe Dogborg Uprising
Brings in dogborg markings for character creation! Made by skits.
2020-09-07 17:00:38 -04:00
Riley
1e97b46c9a Hyena & Moth Ears
Adds Hyena & Moth Antenna to the ears tab.
2020-09-07 13:26:17 -04:00
Nadyr
35fa371286 Merge pull request #513 from cadyn/liquid-bellyfix
Many bugfixes!
2020-09-05 06:17:03 -04:00
Novacat
d87dcbf0f7 Merge pull request #8958 from Muffindrake/lead_typo
Fix refined MAT_LEAD 0 nutrition, gem_eater typos
2020-09-02 11:03:32 -04:00
ShadowLarkens
051710824b Allow shuffling vore bellies around. 2020-09-01 20:35:13 -07:00
Repede
1aed482d7d Fixes some M << to to_chat references. 2020-09-01 23:16:25 -04:00
Muffindrake
eb830751ee Fix refined MAT_LEAD 0 nutrition, gem_eater typos 2020-09-02 01:31:36 +02:00
Darlantan
56e2ed6fb5 SynxTweaks
-Fixes synx chem
-Fixes synx venom injection
-Balancing stuff
-Adds Distend Stomach ability
-Re-adds parasitism
2020-08-30 06:01:08 -04:00
Braiden
eb40f1d483 adjustments and loadout addition 2020-08-29 16:31:04 -05:00
Braiden
3917de9579 kbrid outfit code fixed, now enabled 2020-08-28 16:18:34 -05:00
Braiden
8a7d1265df small adjustment
to my outfit's coverage
2020-08-27 05:32:46 -05:00
Braiden
e933dceee8 kbraid outfit (disabled code state)
tried to add my outfit into the code but kept getting the error [code\modules\vore\fluffstuff\custom_clothes_yw.dm:1710:error: hoodtype: undefined var]

the code is in a disabled state so it should not interfere with the game proper.
i would greatly apreciate it if someone could help me troubleshoot.
2020-08-27 05:21:32 -05:00
ShadowLarkens
0c2c82fe5f TGUI Drag Inventory 2020-08-25 21:56:51 -07:00
Cadyn
3bc407b0d3 Consistency with upstream PRs 2020-08-24 14:28:07 -07:00
Cadyn
f18c075cfd Feedback and forgot the VS edit goodies 2020-08-23 20:41:03 -07:00
Cadyn
0d0cd61e60 Yummy bugfixes 2020-08-23 20:24:04 -07:00
Cadyn
5e02857320 Many bugfixes! 2020-08-23 19:54:11 -07:00