cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-09 08:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,115 Commits 7 Branches 0 Tags
04378e159ea4e611aa5da3be63a20c2a2ee8a0be
Commit Graph

1447 Commits

Author SHA1 Message Date
KasparoVy
04378e159e Abstract Eating of Ore to Fix Unintentional Prompt 
Using the verb with nothing in your hand brings up a prompt to select an object due to the argument in the verb.

This resolves the issue, instead just showing the "nothing in your hand" message as intended.
 2020-04-03 23:14:42 -04:00
Aronai Sieyes
ff718f4aef Merge pull request #7085 from KasparoVy/i-could-swear-kobolds-ate-rocks 
Adds Ore/Gem Eater Trait
 2020-04-02 10:55:36 -04:00
KasparoVy
5ba1fda952 Slight Grammar Adjustment 2020-04-02 09:53:25 -04:00
KasparoVy
bb756cbdc9 Adds a Rocky Diet 
Taking the ore eater trait, you only gain nutrition from ore.
The amount varies, mainly based on the rarity/quality of what you're eating.

5 raw diamonds or verdantium will feed you well, while it'll take a handful of hematite or carbon to do the job. Better stick to the good stuff - it's in your best interest!
 2020-04-01 21:52:27 -04:00
Aronai Sieyes
301b5eb467 Allow wings with a secondary color 
Adds code to support wings with extra_overlay having a secondary color, like tails do. Currently extra_overlay is just ignored on wings.
 2020-03-31 22:40:48 -04:00
Matica
2b9c021f08 Ports YW's ears and wings 
Port's YW's big dragon horns, as well as their wings.
 2020-03-31 20:02:42 -04:00
Aronai Sieyes
35448c5b53 Merge pull request #7054 from VOREStation/aro-sscleanup 
Clean up some subsystem things
 2020-03-30 21:07:17 -04:00
Leshana
771c09ad2f Make attempt_vr print more complete debugging info/stack trace. 2020-03-30 20:30:36 -04:00
Aronai Sieyes
cdb2336bf7 VS: Convert bellies to processing subsystem 2020-03-30 16:11:30 -04:00
Novacat
a338bca46b Merge pull request #7008 from Natje0/master 
Ports triple and 9x kitsune tails from YawnWider
 2020-03-26 21:20:22 -04:00
TheFurryFeline
94ddb5eb13 Vakashi's Permit Expiration 
Expired permit removal, code cleanup.

Changlog Notes:

- Removes Vakashi's Permit and allowed item.

- Also removes code for Ace's long expired permit and the same for the commented out items.
 2020-03-26 20:50:26 -04:00
Natje0
66d6778957 Fixed tails.dmi to tails_vr.dmi 2020-03-27 00:52:29 +01:00
Natje0
fdd85c3812 Code for kitsune tails 2020-03-27 00:23:47 +01:00
Leshana
5f9ec463c3 VOREStation Specific: Always call update_use_power() instead of directly setting the use_power var. 2020-03-24 14:40:54 -04:00
EllyBrown
b6d893db49 Changes to the custom item. (#6929) 
* Add files via upload

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm
 2020-03-21 00:55:55 -04:00
Aronai Sieyes
4aaff0704e Merge pull request #6925 from ShadowLarkens/vore_cleanup_less_cursed_maybe 
Cleanup vore code
 2020-03-21 00:52:46 -04:00
Novacat
aacc6e0869 Merge pull request #6826 from TheFurryFeline/patch-19 
Boostage Mk 3
 2020-03-20 00:43:13 -04:00
ShadowLarkens
d5d5385b76 Cleanup vore code 2020-03-19 21:17:24 -07:00
Unknown
a6a12b3a9e Merge remote-tracking branch 'VOREStation/master' into nova-heterochromia 2020-03-17 13:16:11 -04:00
Aronai Sieyes
921079908d Merge pull request #6839 from Meghan-Rossi/fluffstuff 
fluff items
 2020-03-12 15:21:34 -04:00
Meghan-Rossi
f7eabadf22 fluff items 
*Adds Medal of Valor for Brynhild Vandradottir - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1688
*Adds Medal of Valor for Lilith Vespers - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1690
*Adds Vox scrap armor for Yikatihaki - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1662
*Adds silver pocket watch for Cappy Fuzzlyfeathers - approve in https://forum.vore-station.net/viewtopic.php?f=27&t=1651
*Adds green sweater vest for Zaku Fyodorovna - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1674
 2020-03-12 17:42:19 +00:00
Arokha Sieyes
e6f766d4c6 Rework resleeving sickness for voredeaths 2020-03-12 12:48:14 -04:00
TheFurryFeline
ddabe46b8b Boostage Mk 3 
MOAR BELLEHS
 2020-03-11 22:10:35 -04:00
Aronai Sieyes
f5e3ec2e62 Make protean blobs get vore prefs 2020-03-09 15:44:01 -04:00
Heroman
0586676320 Fixes Pip's ears 2020-03-02 12:58:52 +10:00
Heroman
df83acadfc Adds Pip's Ears 2020-03-01 12:46:52 +10:00
Heroman
b45f37b7c8 Adds Pip's Cloak 2020-03-01 12:32:31 +10:00
Aronai Sieyes
39d0a8490f Fix madness 2020-02-29 20:00:16 -05:00
Unknown
2604093ff0 Species consolidation 
- Consolidates the two zorren species into one zorren species.
- Merges Xenohybrid into Custom species, Xenohybrids no longer whitelisted.
 2020-02-25 15:45:10 -05:00
Novacat
7821dcd2bc Merge pull request #6603 from Meghan-Rossi/fluffstuff 
Fluff item
 2020-02-25 10:48:57 -05:00
Leshana
25fed81d9f Fixed Runtime in simple_animal_vr.dm,41: Cannot read null.digest_mode 
- Caused by using "Toggle Animal's Digestion" verb on non-vore-capable mobs.
- Even better, changed it to not even add those verbs on mobs without vore
- Also remove the path from VV addverb since it is a proc now.
 2020-02-24 17:57:56 -05:00
Meghan-Rossi
f0ed7d1f8b Switch to combined sprite for Excess's custom uniform 2020-02-20 09:38:53 +00:00
Meghan-Rossi
b9abe73b7c Fluff item 
*Adds custom latex clothing for Excess - Approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
 2020-02-18 23:39:15 +00:00
Meghan-Rossi
dfc42293c7 Fluff items and species whitelisting 
*Adds AmareWolf to Xenochimera whitelist - approved in https://forum.vore-station.net/viewtopic.php?f=46&t=1655
*Adds medal of unity for Roy Tilton - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1629
*Adds balaclava for Monty Kopic - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1628
*Adds warning collar for Excess - approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1593
*Deletes obsolete/unused file "custom_items.txt"
 2020-02-18 00:27:36 +00:00
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
d841259cf3 Adds logging to the breaking of devourable/feeding prefs 2020-02-10 13:43:35 +10:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Leshana
b7da221856 Fixes Runtime in living_vr.dm,428: Cannot read null.name 
This was happening when null is passed for belly. Now it will print *null*
Also fixed root cause (at least one of them).
Animals can't have vore attributes enabled when vore_active = 0 because
then they don't get a belly.
 2020-02-04 16:33:22 -05:00
Heroman
43065cb062 Changes harpoons push mode to teleport user and not everything else (pull mode unchanged) 2020-01-14 11:12:10 +10:00
Novacat
022c7edaae Merge pull request #6405 from Mithrandalf/mouse3 
more mouse stuff, bugfix
 2020-01-09 22:51:47 -05:00
Novacat
afb879ae23 Merge pull request #6379 from Heroman3003/resleeving_sickness 
Adds resleeving sickness
 2020-01-09 22:50:42 -05:00
Novacat
9b2ff8f8f7 Merge pull request #6312 from TheFurryFeline/TFF-No_Absorbee,_No_Absorbee,_Noooo_Absorbee 
Absorption Permission Stuff
 2020-01-09 22:50:18 -05:00
Heroman3003
5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Mithrandalf
1e8a54b736 mouse 2020-01-08 15:32:07 +00:00
Heroman
2b10027024 Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides 2020-01-07 17:02:39 +10:00
Novacat
76f323984c Merge pull request #6373 from Verkister/ridewild 
Adds a verb for rideable mobs to toggle rider control without a riding crop
 2020-01-01 12:03:42 -05:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes 
Misc Changes and bugfixes
 2019-12-31 18:39:10 -05:00
Unknown
64b4d435f9 Joan's spacesuit no longer NORMAL size 2019-12-29 11:26:37 -05:00
Verkister
9093b84d24 Adds a verb for rideable mobs to toggle rider control without a riding crop. 
-Mountable mobs/borgs/taurs can now let the rider in control without requiring a riding crop.
-And yes, riding crop has always been "the key" for rider control for these mechanics.
-Also tweaks the AO a little bit more because ouch my ocd.
 2019-12-26 17:57:26 +02:00