Commit Graph
28759 Commits
Author SHA1 Message Date
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
CaseyandGitHub 3a2f07a743 Merge pull request #12256 from GhostActual/sizegun-revamp-2022
Sizegun Revamp 2022
2022-02-17 15:32:19 -05:00
CaseyandGitHub 522b931dd8 Merge pull request #12244 from PastelPrinceDan/revfluff
revolver eloise fluff item
2022-02-17 08:15:55 -05:00
CaseyandGitHub 7c0ae649ec Merge pull request #12255 from PastelPrinceDan/tails
kitsune 9-in-1 tail
2022-02-17 08:01:46 -05:00
VerySoft ad936326c1 How about this? 2022-02-17 07:50:08 -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
klaasjared 6550b428d2 Base Commit 2022-02-17 00:00:57 -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
PastelPrinceDan bbfb205625 rev claymore 2022-02-16 08:59:05 +00:00
CaseyandGitHub e73983fd6f Merge pull request #12241 from Heroman3003/lollipops
Adds lollipops to Nanomed
2022-02-16 02:20:42 -05:00
klaasjared 58fe8ef497 Base Commit
Tresh
2022-02-16 01:50:14 -05:00
Heroman c59f7e09e7 Adds lollipops to Nanomed 2022-02-16 16:01:34 +10:00
CaseyandGitHub b5e1cef448 Merge pull request #12235 from Heroman3003/refill_cartridges
Adds vendor refill cartridges to cargo
2022-02-14 16:35:48 -05:00
CaseyandGitHub 9b8bc2c486 Merge pull request #12233 from KillianKirilenko/kk-fluff
Heavy-duty Engineer's Gloves
2022-02-14 16:31:57 -05:00
Heroman 53584daf99 Forgot to remove a test variable for refillers. 2022-02-15 07:17:28 +10:00
Heroman 19e522b437 Adds vendor refill cartridges to cargo 2022-02-15 07:08:16 +10:00
Killian f65b633500 heavy-duty engi gloves
added temp protection
2022-02-14 13:29:01 +00:00
Killian dfd40e42fb heavy-duty engi gloves fix 2022-02-14 13:23:58 +00:00
Killian 3abb52f578 heavy-duty engi gloves
today's word is "funkoscopy"
2022-02-14 13:00:26 +00: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
VerySoft dee8667de8 Item bank tweak!
A couple more restrictions!
2022-02-13 19:52:51 -05:00
CaseyandGitHub a7aa485d01 Merge pull request #11897 from VOREStation/upstream-merge-8354
[MIRROR] Initialize engine_loader landmark immediately
2022-02-13 16:57:50 -05:00
CaseyandGitHub 325e969a27 Merge pull request #12218 from Very-Soft/noqpadsonshuttls
No Quantum Pads on Shuttles
2022-02-13 16:49:26 -05:00
VerySoft a4970a6bc2 No Quantum Pads on Shuttles
Related to the cargo shuttle thing, the same exploit would work for any shuttle, so! Now it don't.
2022-02-13 16:32:20 -05:00
KillianandGitHub cfb0cb86a1 Merge branch 'upstream-merge-8200' into kk-mergefix 2022-02-13 14:29:57 +00:00
VerySoft 84be287740 Admin resize adjustments
Caps it at 50 and allows negative values
2022-02-13 07:11:22 -05:00
CaseyandGitHub ad214b6666 Merge pull request #12211 from Heroman3003/sightfix
Fixes Ghost Sight being missing from Preference verbs
2022-02-13 07:07:15 -05:00
Heroman 07c8cd6d3e Fixes Ghost Sight being missing from Preference verbs 2022-02-13 19:38:04 +10:00
CerebulonandVirgoBot f2bc8d030f Cybernetic Augments and Sick Tats 2022-02-13 02:52:16 -05:00
CaseyandGitHub d8b0ebf7b4 Merge pull request #12208 from Heroman3003/tether-passage-block
Tether passage blockades
2022-02-13 01:40:47 -05:00
Heroman b065074976 Applies passage block to ladders 2022-02-13 15:03:30 +10:00
CaseyandGitHub 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
Heroman3003andGitHub 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
CaseyandGitHub ca6169fba7 Merge pull request #12196 from Very-Soft/noladdersonshuttle
Don't build ladders on shuttles
2022-02-11 16:48:26 -05:00
CaseyandGitHub 4083e13dd2 Merge pull request #12191 from TheDavestDave/strapless
strapless bag
2022-02-11 16:35:08 -05:00
VerySoft 24a24c59f7 Don't build ladders on shuttles
It doesn't work anymore.
2022-02-11 16:32:20 -05:00
TheDavestDave 89c1bf4bbc strapless bag
a bag without straps taking out the body spirte. A kit bash of other things but should work
2022-02-10 18:56:31 +00:00
ktccd0 d8e9f07352 Adds info to user
Adds the information on how to use the formating variables in the description textboxes.
2022-02-10 14:44:59 +01:00
ktccd0 d79da76c54 Whoops missed a tab
Fixes stupid error I made
2022-02-10 14:43:51 +01:00
ktccd0 575744e65c More elegant code?
Remade the previous change I made so there's less repeated code inside of those if-statements.
2022-02-10 14:30:55 +01:00
ktccd0 7528ac8da9 Variable replacement descriptions
Making it so the description and absorb description allows the use of replacement variables such as %pred, %prey, and %belly. Not sure if there's a use for %count and %countprey though, so did not add those yet.
2022-02-10 13:56:13 +01:00
VerySoft e867d1d937 ONE MORE AGAIN 2022-02-09 19:42:03 -05:00
VerySoft 4d9af38a9b One last one! 2022-02-09 19:00:46 -05:00
VerySoft db663b0b53 This too 2022-02-09 16:39:28 -05:00