Skip to content

Merge conflicts - #1

Open
greatguys1 wants to merge 436 commits into
Dridje:MSR-Scriptsfrom
MSRevive:MSR-Scripts
Open

greatguys1 wants to merge 436 commits into
Dridje:MSR-Scriptsfrom
MSRevive:MSR-Scripts

Conversation

@greatguys1

Copy link
Copy Markdown

No description provided.

greatguys1 and others added 30 commits February 11, 2023 17:29
- Fixes a few issues
- Makes dialogue easier to access for foutpost knight
- New players now receive an assortment of packs to put away their starter loot.
Not that itll spawn because the flesheater is still broken
- Fix votemap to those places via nps not properly showing up.
- Organized world script into a folder
- Many obsolete or non-useful devcmds removed
- Removed lesser dev mode
- renamed and revised some dev commands
- Force cages and whatnot no longer stop the player from being flung around.
- Should also help fix #209
therenderman1337 and others added 30 commits September 27, 2026 21:43
Different then first commit. Added steam hiss sound to each reload.
Steam Crossbow ammo selector fixed
Forsuth chests trigger moved to his goodbye sequence
Chest was only awarding fireball, no other spells
Made the sxbow look smoother on final reload. Had a partial reload near full reload.
-Script part of the submodel commit
-Bandit Mage fix, would get into a buff ice shield loop sometimes and just stand there.. MENACINGLY!
SUSPEND AI MADE FALCO A DEV(temporarily)
Fixed Envenom Plate so it gives XP to Affliction
Sylphiel Soup can now be acquired through turning in ingredients(1 Strong HP Pot, 1 Mana Pot, 1 Mead, 3 Apples +200g)!
Sylphiel still sells soup to players who have completed the m2_quest chain however many times they have done it through her inventory.
-  Armor invisible bug re-visit. Hopefully fixed - Testing needed. Report to Dravus
-  Hoarfrost Ice Lance dot should now reward only swordsmanship experience.
-  Idle animation stutter on most weapons fixed, no more shaky hands!
-  Steam Crossbow ammo selection SHOULD keep whatever weapon ammo you've chosen on map changes/death/server changes.
-  Cast animations for Healing Wave and Lightning Disc have been synced up with their effects.
-  Ice Staff Frostbolt(Charge 1) should no longer have a weird obsession with other players.
-  Ice Staff Frostbolt(Charge 1) homing should no longer be able to turn on a dime like it's drifting in the Fast and Furious.
-  Fixed a few spell effects not rendering correctly or being "see through" when casting towards a model or sprite.(litdisc, frostbolt, icelance) Report more to Dravus
-  Dark Staff laser fixes. You shouldn't be able to visually control other player's lasers. That's not nice. Also report to Dravus if this looks off(again).
-  Made the worm's HP update. Finally.
-  Removed worm hit chance mechanic.
-  Increased worms HP to 18,000.
-  Any issues, report to Dravus
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants