Commit Graph

28815 Commits

Author SHA1 Message Date
Heroman
1af55da1c7 Merge branch 'master' into upstream-merge-8341 2022-02-20 10:15:26 +10:00
Heroman
920e917e7b Conflict resolution 2022-02-20 09:12:49 +10:00
Heroman
891dc7ecb3 Merge branch 'master' into upstream-merge-8325 2022-02-20 08:43:17 +10:00
Casey
4f752bf068 Merge pull request #12292 from Heroman3003/8316-fix
8316 fix
2022-02-19 17:32:54 -05:00
Casey
08e35faab0 Merge pull request #12291 from Heroman3003/8330-fix
8330 fix
2022-02-19 17:32:34 -05:00
Heroman3003
3c62f555c7 Merge branch 'master' into 8316-fix 2022-02-20 08:15:09 +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
Casey
fc7a67073b Merge pull request #12288 from Hatterhat/slimeiyoshi-plush
[ready] pastelprincedan plushie fluff item
2022-02-19 17:04:46 -05:00
Heroman
9a9f77fa3c Merge branch 'master' into 8330-fix 2022-02-20 07:56:55 +10:00
Heroman3003
9a5708ef66 Merge branch 'master' into branch 2022-02-20 07:27:34 +10:00
Hatterhat
04ffef5571 Merge branch 'master' into slimeiyoshi-plush 2022-02-19 04:27:40 -06:00
Hatterhat
40c9947bca bro i dont wanna talk about loadout_general.dm 2022-02-19 04:23:35 -06: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
d788a61aa4 Compile error resolution 2022-02-19 19:42:32 +10:00
Heroman
f00ca28602 Merge remote-tracking branch 'upstream/upstream-merge-8339' into 7914-fix 2022-02-19 19:24:25 +10:00
Heroman
e8789c951c Merge remote-tracking branch 'upstream/upstream-merge-8321' into 7914-fix 2022-02-19 19:07:44 +10:00
Heroman
0563c28c59 Merge branch 'master' into 7914-fix 2022-02-19 19:02:20 +10:00
Heroman
8cd5fd66ca Compile Error Resolution 2022-02-19 18:58:43 +10:00
Heroman
ae267030eb Merge branch 'master' into upstream-merge-8222 2022-02-19 18:41:29 +10:00
Casey
67c3f83c15 Merge pull request #12281 from Very-Soft/norphbuckleswoah
Unbuckle mobs when morphs take control
2022-02-18 23:27:03 -05:00
Casey
1432ca2b22 Merge pull request #12253 from GhostActual/Donk-Co.-Toys
Donk Co. Toys
2022-02-18 23:26:48 -05: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
Casey
34fd6460ac Merge pull request #12274 from Heroman3003/brad-drip
Add's Brad's Air Jordans
2022-02-18 15:21:01 -05:00
Heroman
1da6f5f724 Add's Brad's Air Jordans 2022-02-19 06:10:17 +10:00
VerySoft
c1a6a0277f Morph tf color fomx
Missed this little thing
2022-02-18 14:31:02 -05:00
Casey
de8906e315 Merge pull request #12247 from ktccd0/ktccd-dev-Corner-Sofa-Fix
Fixes sofa paths
2022-02-18 14:04:56 -05:00
Casey
5c509fa4da Merge pull request #12268 from PastelPrinceDan/ar-b
ar-b glasses are now actually ar
2022-02-18 13:57:11 -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
Casey
8970c14b13 Merge pull request #12265 from KillianKirilenko/kk-glasses
AR Glasses Shading Tweak
2022-02-18 13:55:04 -05:00
Casey
8be6127416 Merge pull request #12263 from GhostActual/doom-barrels
Doom Barrels
2022-02-18 13:54:40 -05:00
VerySoft
08422e2e5c New sprite, new ability, nerf health 2022-02-18 13:31:29 -05:00
PastelPrinceDan
1691ab4136 fix 2022-02-18 14:03:51 +00:00
PastelPrinceDan
f5310f409a tail stuff 2022-02-18 13:43:08 +00:00
Killian
d1c88ab6a4 Update hud_vr.dm 2022-02-18 13:02:46 +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
klaasjared
98636f4e68 Laser Tag Revamp/Additions
Laser Tag Revamp/Additions 2
Laser Tag Revamp/Additions
Update toy.dm
2022-02-18 02:53:17 -05:00
klaasjared
7b52c0abfe Base Commit 2022-02-18 01:04:34 -05:00
klaasjared
8a5afc9d6f Small Fix 2022-02-17 21:04:05 -05:00
klaasjared
2c312f71a0 Ruin Marine 2022-02-17 21:04:05 -05:00
klaasjared
e8e7bf3990 Toy Guns
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
klaasjared
af020f08ad Toy Additions
Second Commit
2022-02-17 21:04:00 -05:00
Casey
3a2f07a743 Merge pull request #12256 from GhostActual/sizegun-revamp-2022
Sizegun Revamp 2022
2022-02-17 15:32:19 -05:00
Casey
522b931dd8 Merge pull request #12244 from PastelPrinceDan/revfluff
revolver eloise fluff item
2022-02-17 08:15: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
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