Commit Graph

932 Commits

Author SHA1 Message Date
Kashargul
a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Kashargul
e0d694e8ac rid of old span macros 2024-10-01 23:51:48 +02:00
Guti
a3c7599065 Fix 2024-09-18 18:33:15 +02:00
Guti
06a46a237b stuff 2024-09-18 18:12:57 +02:00
Guti
f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul
8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Kashargul
0425a4e396 up to officer 2024-09-12 00:00:11 +02:00
Guti
409aaba802 Remove 2024-09-09 02:36:53 +02:00
Nadyr
90720f8a67 Various fixes (#16176)
-Patches map-spawn random objects inside loot piles
-Adds counter-clockwise rotation to many objects
-Prevents borers from crashing VR
-Tweaks blood drying to not queue dry timers on mapload
-Prevents adding grabs to crates
-Fixes look up verb when outdoors
-Lets vehicles fall through open space
-Lets the cargo tug dangerously use stairs
-Fixes med/sec bot runtimes
-Fixes TECH_MAGNETS incorrect define
-Fixes damage/stumblevore procing every step when riding taurs/borgs while confused
2024-08-12 05:20:18 +10:00
Kashargul
6cabe9f7e6 Undefines local defines and moves global to __define (#16028)
* first set of defines

* some more

* .

* final defines

* del local define
2024-06-09 17:29:20 +10:00
Kashargul
32204eeafd some borg upgrade overhaul, power use function, bluespace pounce and some fixes (#15924)
* some borg upgrade overhaul

* .

* adjust icon some

* .

* fixes the borg hud store icon breaking

* refactor borg skill power usage, add bluespace pounce

* .

* .

* copy paste mistakes...

* first check distance then drain power on leap

* small oversight in the calculation

* comment

* second silicon hud store icon case
2024-04-21 21:11:37 +10:00
Drathek
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 afbdd1d844.

* 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 de22ad375d.

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

* Try again
2024-02-20 11:28:51 +01:00
Kashargul
e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
Kashargul
c0339df32c downstream.... 2024-01-18 00:21:36 +01:00
Kashargul
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
Heroman
456474e272 Adds altevian mineral slicer 2024-01-07 20:58:28 +10:00
Heroman3003
864248da9b Merge pull request #15424 from KillianKirilenko/kk-laserdome
Redgate Laserdome
2023-12-03 11:07:22 +10:00
Heroman
cb9f552988 Adds confetti gun (unused for now) 2023-11-03 06:58:13 +10: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
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
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
Killian
0a843cd816 gun reloading microtweaks 2023-05-27 01:01:42 +01:00
Killian
d85d9306df melee weapon info on examine 2023-03-12 03:12:21 +00:00
Heroman3003
b1ea933dee Update revolver.dm 2023-01-30 18:41:39 +10:00
Heroman3003
0250871772 Update revolver.dm 2023-01-30 18:40:03 +10:00
Atermonera
f326dddfa9 Tiny grammar tweaks 2023-01-29 18:27:45 -05: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
Pandora
54bea70e21 Update protector_vr.dm 2022-12-25 17:26:40 +00:00
Runa Dacino
f71e2d2bac Fixes timetravel
changes book to be 24th not 26th century

more date stuff, fixes guns

typos

Updates POI lore for nuclear rack and growth canisters
2022-12-03 12:23:34 +01:00
DESKTOP-4BUBN9N\Mike
b2055c52cd Makes the unmaintained antique behave like one 2022-11-20 23:03:00 +00:00
VirgoBot
de58b679e2 [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED) (#12899)
* Adds Sjorgen Inertial Shotgun (by H-H)

* Update munitions.dm

* Update visible_weapons.dm

* Update shotgun.dm

* Update guns_and_ammo.dm

* Update munitions.dm

* Update guns_and_ammo.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
2022-09-22 21:05:00 -04:00
Heroman
b63b72a1cc Typo fix 2022-09-21 15:13:50 +10:00
Heroman
10596cfb1b Adds a ton mroe altevian stuff 2022-09-21 14:59:26 +10:00
Heroman
50b714db79 Removes last references to simple_animal 2022-09-11 06:38:57 +10:00
Novacat
1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892
d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
DESKTOP-4BUBN9N\Mike
7c7c46683d better sounds thanks to SOFT 2022-08-01 10:23:21 +01:00
DESKTOP-4BUBN9N\Mike
56d7ccfe0d adds cool and fun and totally balanced new weapon 2022-08-01 07:39:39 +01:00