1118 Commits

Author SHA1 Message Date
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
Killian ef78be37ce space traffic updates 2024-12-08 08:00:55 +00:00
Killian 553675edf5 Merge branch 'master' into kk-spacetraffic 2024-12-06 20:45:06 +00:00
Kashargul ead0180057 converts area vars to flags 2024-12-04 22:21:38 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
Killian 9d3a7986d8 traffic update
more khi cleanup
2024-12-01 18:37:08 +00:00
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Killian 5d854f0c76 traffic update 2024-11-11 20:41:43 +00:00
ShadowLarkens dc3fd79427 The final action buttons PR (#16514)
* Make action button target datum

* Initial working action palette

* Action related refactors

* tgstation/tgstation/pull/71339
2024-10-26 13:20:54 +02:00
ShadowLarkens bcc107c7cd Ports tgstation/tgstation/pull/15673 (#16495)
* Ports tgstation/tgstation/pull/15673

* Add a small delay to icon updating to cover up SSoverlays

* Fix actions on robot modules
2024-10-20 17:12:24 +02:00
Kashargul b594520a74 next set of spans (#16434)
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
2024-10-16 23:37:27 +02:00
Kashargul 98293e1aa9 gunshot residue should only be on clothing/human (#16446)
* should only be on clothing

* .
2024-10-12 16:43:13 +02:00
Kashargul db5b408538 some more and fix filtering 2024-10-05 21:27:23 +02:00
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
izac112 42b345b3cc Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-08-28 20:22:38 +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
izac112 04de351a1e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-07-17 16:14:16 +02: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
izac112 95279d346e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-515 2024-04-24 23:28:19 +02: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
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01: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 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
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
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
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
Heroman3003 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