Commit Graph

12076 Commits

Author SHA1 Message Date
Casey
4c58c4b275 Merge pull request #12342 from Very-Soft/morphy
Adjust morph transform text
2022-02-27 00:25:16 -05:00
VerySoft
8c1188f477 Adjust morph transform text
Morphs aren't only green now, so let's just make them be piles of flesh instead of piles of green flesh.
2022-02-26 20:46:42 -05:00
FartMaster69420
fc4eb775ec Missed this
Gives service borgs shred limb verbs that other borgs have.
2022-02-26 15:19:12 -05:00
FartMaster69420
8580fa021b Initial Commit
Adds pipe dispensers to pupdozers and engiborgs, adds the circuit gripper to sci-borgs, fixes service borgs not having rider control verbs.
2022-02-26 15:15:06 -05:00
Heroman
f2659cc22c Fixes sect bugs not updating vore glow 2022-02-26 17:42:30 +10:00
VerySoft
2e0a740bf5 Also unabsorb 2022-02-22 16:41:34 -05:00
VerySoft
d6785fc908 Smol morph fix
When taking control of prey, if prey body is muffled, unmuffle them.
2022-02-22 05:22:01 -05:00
Heroman
1af55da1c7 Merge branch 'master' into upstream-merge-8341 2022-02-20 10:15:26 +10:00
Casey
9c7c1d507e Merge pull request #11700 from VOREStation/upstream-merge-8335
[MIRROR] Minor bodytemp warning refactor.
2022-02-19 17:11:49 -05:00
Casey
8e05b36f42 Merge pull request #12287 from Heroman3003/two-markings
Adds swept back rabbit ears and large antlers from Jackalope as independant markings
2022-02-19 17:05:01 -05:00
Heroman
ef4b377574 Adds swept back rabbit ears and large antlers from Jackalope as independant markings 2022-02-19 20:06:38 +10:00
Heroman
ae267030eb Merge branch 'master' into upstream-merge-8222 2022-02-19 18:41:29 +10:00
VerySoft
0f069c1b63 Unbuckle mobs when morphs take control
That way if someone's in a wheelchair or riding a taur they will not be pulled out of the inside of wherever they are when the thing they're buckled to moves.
2022-02-18 22:54:09 -05:00
DESKTOP-4BUBN9N\Mike
90c0725af3 adds avida's clothes and alt bnnuy eas 2022-02-19 00:08:19 +00:00
VerySoft
c1a6a0277f Morph tf color fomx
Missed this little thing
2022-02-18 14:31:02 -05:00
Casey
a6f79daf7a Merge pull request #12266 from PastelPrinceDan/moretails
more kitsune tails + slight tail list tweak
2022-02-18 13:55:37 -05:00
VerySoft
08422e2e5c New sprite, new ability, nerf health 2022-02-18 13:31:29 -05:00
PastelPrinceDan
f5310f409a tail stuff 2022-02-18 13:43:08 +00:00
VerySoft
21eb698c23 Buffs Morphs
Allows morphs a couple of neat new things

Resting:
While resting and morphed, morphs do not 'look strange'. 

If a morph stops resting while someone is on their turf, they may instantly, stealthily eat the person. (If prefs allow)

Take over prey:
A morph may choose to attempt to completely take over their prey's form, actually assuming control of their prey's body. 

This interaction allows the morph to pick any non-simple mob in any of their bellies that has a ckey. The morph gets a confirmation prompt, and the prey gets a double confirmation prompt. The prompt can only appear if the prey has the preference for allowing body impersonation enabled. 

For lack of an easy better option, this interaction is undone by way of the transformed morph ejecting the prey from their belly. Instead of actually ejecting the prey, it will restore both to their original conditions. (And THEN you can eject them if that's what you want to do) There is text explaining this to the morph when they succeed at the takeover.

OOC escape does also work with this, despite its complicated interaction. OOC escape returns both parties to their original bodies and undoes the effects of the interaction.
2022-02-18 06:48:55 -05:00
Casey
7c0ae649ec Merge pull request #12255 from PastelPrinceDan/tails
kitsune 9-in-1 tail
2022-02-17 08:01:46 -05:00
VerySoft
46b6bbaf74 Misc Tweaks
Fixes a space vine runtime

Makes it so space vines can't climb stairs (because that leads to practically unkillable stacks of vines that lag the server)

Makes it so space vines can't grow on open space (because you usually can't kill vines if they're way out in open space and that doesn't make much sense anyway.)

Attempts to limit the maximum range of plant bioluminescence (having hundreds or thousands of dynamic light sources with maximum possible light range seems to lag the server)

Adds a funny dog that no one should ever actually spawn but I will one day as a joke and everyone will cry. (its base form is actually not hostile so if you kill that one the hell you earn will all be on you)
2022-02-17 07:36:53 -05:00
PastelPrinceDan
4f99800084 9 in 1 babey 2022-02-17 04:14:14 +00:00
Heroman
44fa030ed5 Fixes a bunch of xenobio bugs 2022-02-16 19:25:35 +10:00
VerySoft
a751b73cd4 Absorb Languages
Makes it so when someone is absorbed, the pred and prey share languages. (and this is undone when unabsorbed/released)
2022-02-13 23:37:16 -05:00
Cerebulon
f2bc8d030f Cybernetic Augments and Sick Tats 2022-02-13 02:52:16 -05:00
Casey
11f17f38da Merge pull request #12205 from PastelPrinceDan/typofix
fixes a couple typos
2022-02-12 21:42:40 -05:00
PastelPrinceDan
dc01ce11fb spellcheck your shit grrr 2022-02-13 02:21:17 +00:00
Heroman3003
0b71c7ed4c Merge branch 'master' into bradny 2022-02-13 07:21:19 +10:00
Heroman
1e30fcca1f Adds Slicker hair and Tall Bunny ears 2022-02-12 16:04:09 +10:00
TheDavestDave
3a0ea667ba Update sprite_accessories_ear_vr.dm 2022-02-12 01:12:08 +00:00
TheDavestDave
4a630f301e Update sprite_accessories_ear_vr.dm 2022-02-12 00:57:28 +00:00
TheDavestDave
c3c1743a88 Update sprite_accessories_ear_vr.dm 2022-02-12 00:34:36 +00:00
Casey
6e1a8935d4 Merge pull request #12173 from KillianKirilenko/kk-test
Allergen Reaction Tuning
2022-02-07 18:16:45 -05:00
Killian
5eac0aea1a confusion addon 2022-02-07 10:29:03 +00:00
Killian
121f36b8c8 allergen reaction tuning 2022-02-07 10:10:21 +00:00
Casey
7dea00c790 Merge pull request #12161 from KillianKirilenko/kk-test
Allergy Rebuff
2022-02-06 18:10:29 -05:00
Killian
18169803b9 allergen hardmode 2022-02-06 21:30:20 +00:00
Killian
a1b1100983 allergy rebuff 2022-02-06 21:28:18 +00:00
Heroman
d834a6f08f Updates Whitelist with recent additions 2022-02-07 05:12:33 +10:00
Killian
c01bc7fe2d Update startreader.dm 2022-02-01 15:21:23 +00:00
Casey
23911356a9 Merge pull request #12124 from Heroman3003/unwhitelist
Removes Polaris whitelists from certain sprite accessories
2022-01-28 17:26:38 -05:00
Casey
8841ad4b6e Merge pull request #12118 from KillianKirilenko/kk-test
Eyeglow Toggle
2022-01-28 17:24:17 -05:00
Casey
f2a301858a Merge pull request #12100 from Heroman3003/vulplore
Makes vulpkanin ingame lore match our actual lore
2022-01-28 17:19:51 -05:00
Heroman
f5455c0491 Also adds two missing ones 2022-01-29 08:18:01 +10:00
Casey
60a8cde032 Merge pull request #12079 from Heroman3003/blobuff1
Buffs speed of protean blobs
2022-01-28 17:18:01 -05:00
Heroman
7506e3c7f6 Makes comments less aggressive 2022-01-29 08:17:07 +10:00
Heroman
ddeb3b84b5 Removes Polaris whitelists from certain sprite accessories 2022-01-29 08:10:00 +10:00
Killian
322886289c eyeglow toggle 2022-01-27 04:32:36 +00:00
Novacat
d89be9937b Merge pull request #12085 from Heroman3003/rulemaker-taur
Adds Rat taurhalf
2022-01-23 10:07:00 -05:00
Heroman
ccf337a0a5 Fixes wrong place to put lore 2022-01-22 13:57:50 +10:00