Commit Graph
1845 Commits
Author SHA1 Message Date
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01:00
DrathekandGitHub 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
Heroman3003andGitHub 6d1acf98db Merge pull request #15695 from Kashargul/endOfStaticCol
remove static chat colour tags
2024-01-27 15:47:33 +10:00
SpaceMan-JimandGitHub dba08cdfa8 Raptor sprite overhaul 2024-01-26 16:29:34 -06:00
izac112 1c2d4da6bd Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update 2024-01-22 05:18:14 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
KashargulandGitHub c0339df32c downstream.... 2024-01-18 00:21:36 +01:00
KashargulandGitHub 05dceb78f7 fix runtimes and donking! 2024-01-18 00:18:14 +01:00
Heroman 1fa77e046f Gives Altevian Slicer a better sound 2024-01-15 05:11:14 +10:00
izac112 376ce75686 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-01-09 21:28:33 +01:00
Heroman 456474e272 Adds altevian mineral slicer 2024-01-07 20:58:28 +10:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
Heroman3003andGitHub 864248da9b Merge pull request #15424 from KillianKirilenko/kk-laserdome
Redgate Laserdome
2023-12-03 11:07:22 +10:00
izac112 5052f6f672 Merge branch 'release' of https://github.com/VOREStation/VOREStation; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2023-11-28 16:48:53 +01:00
Heroman cb9f552988 Adds confetti gun (unused for now) 2023-11-03 06:58:13 +10:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Killian 6cafbe5dce laserdome: miscellaneous additions
multimode lasertag guns with multihit rules, non-rotating mannequins, and new laserdome-specific gear lockers
2023-10-10 09:32:30 +01:00
Enzo-Leon f13f395db7 Altevian Adjustments - Descriptions & Small Tweaks 2023-10-02 11:40:19 -07:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
SatinIsle 1479907300 A few more items consolidated 2023-09-22 22:47:06 +01:00
SatinIsle 0c39b8b7d8 Fantasy redgate map
Added a new fantasy redgate map that consists of a fantasy town and a large dungeon beneath it.

Added a selection of fantasy props.

Added a variety of "magic" resprites of existing items. These are intended to be tech disguised as magic and have descriptions to hint at it, along with some papers on the map.

Added an alchemy system that creates potions in an alembic out of an ingredient and a base. If the ingredient and base match, an interesting potion is created, if they don't, a poor quality potion is created.

Added a new reagent that polymorphs the drinker into a random creature.

Added a chest version of crates.

Added wooden wall lockers.

Added random spawners for fantasy items, potions, ingredients and bases for mapping.

Added hedge and wooden fences.

Added an old fashioned resprite of the oven.

Added a cooking pot resprite of the microwave.

Added wall torches.

Added barrel version of water tanks, beer tanks, wine tanks, blood tanks and a kettle resprite of a coffee dispenser.

Added a wooden tub bath.

Added 19 new vore mobs: 2 Catslugs, 6 succubi, 1 cryptdrake, 4 vampires 5 peasants and a bat.
2023-09-22 21:44:22 +01:00
VerySoft b4922aedc9 Remove all mention of nazis from code
Also removes some old lore references from the listening post
2023-09-14 17:43:57 -04:00
Killian 10474205d0 killian's grab bag PR
a scattershot package of various changes
2023-08-27 18:08:28 +01:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman 9852a24114 A bunch of small fixes 2023-08-16 17:03:05 +10:00
Heroman 67b14352af Borg module consolidation - initial commit 2023-08-06 20:55:34 +10:00
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
Selis 271ff9408f Spell Fixes 2023-06-18 12:47:36 +02:00
Enzo-Leon 95359bf02a Re-adjusts Altevian Weapons 2023-06-15 13:50:32 -07:00
ItsSelis 10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00
izac112 9cedb2ec47 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-03 19:53:45 +02:00
Youtubeboy139 6242ac9664 Some Grammar Fixes 2023-05-30 21:29:29 -04:00
Killian 0a843cd816 gun reloading microtweaks 2023-05-27 01:01:42 +01:00
izac112 5c0a04dad0 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-04-30 14:31:02 +02:00
Heroman3003andGitHub 592c6ae435 Merge pull request #14814 from KillianKirilenko/kk-shottedgun
Shotgun Tweak
2023-04-24 06:50:35 +10:00
Killian 274dbcd7e0 shotgun tweak 2023-04-22 10:04:18 +01:00
Killian 68acecf26b ion beam redux 2023-04-21 18:33:37 +01:00
izac112 4cc81d7c73 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-03-19 22:24:48 +01:00
Killian d85d9306df melee weapon info on examine 2023-03-12 03:12:21 +00:00
AtermoneraandVirgoBot 58e324ccf6 Merge pull request #8997 from Mechoid/ProjectileSetStarting
Projectiles properly set starting var.
2023-03-04 16:55:36 -05:00
DESKTOP-4BUBN9N\Mike 6426469da6 Makes mining drones have a smarter IFF 2023-02-27 15:01:03 +00:00
Heroman3003andGitHub b1ea933dee Update revolver.dm 2023-01-30 18:41:39 +10:00
Heroman3003andGitHub 0250871772 Update revolver.dm 2023-01-30 18:40:03 +10:00
AtermoneraandVirgoBot f326dddfa9 Tiny grammar tweaks 2023-01-29 18:27:45 -05:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
Runa Dacino b07c9e3227 Time travel fix! 2023-01-24 14:45:08 +01:00
Unknown 70f4c1f7f2 More bug fixes 2023-01-20 12:54:04 -05:00
Unknown f631ae70fb Event Stuff Bugfix/Balance Pass
- Fixes some pathing bugs on a submap
- Fixes the Frontier DMR to have the correct ammo cost and firing sound
- Fixes ERT voidsuits back slots
- Buffs armor values of ERT and Merc voidsuits
- Nerfs armor values of Heartbreaker voidsuits
- Buffs armor values of Asset Protection, Combat, and Military rigs, as well as the knockoff Breacher rig
- Nerfs armor values of the genuine Breacher rig
2023-01-19 16:58:18 -05:00
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00