481 Commits

Author SHA1 Message Date
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Kashargul 49d89c0059 usr to user up to player effects 2024-11-12 00:10:20 +01: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 a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
Kashargul cc737be0a0 bunch of to_chat failures 2024-09-01 04:10:55 +02:00
izac112 42b345b3cc Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-08-28 20:22:38 +02:00
Killian 388736f98d techmaint tile fixes 2024-08-03 18:28:13 +01: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
Repede 734ead1be6 Ready to review version 2024-01-18 18:37:54 -05:00
Repede 29fd7df39f Draft 2024-01-18 00:47:56 -05:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10: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
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman3003 e047e89ba7 Merge pull request #14638 from VOREStation/upstream-merge-9002
[MIRROR] the little construction pr
2023-07-07 17:29:50 +10:00
Heroman 63e9a069be Compatibility fixes 2023-07-07 17:17:49 +10:00
Heroman3003 6c136a427e Update tile_types.dm 2023-07-07 16:52:55 +10:00
Heroman ef61023c04 A variety of miscellaneous bugfixes 2023-07-02 09:13:10 +10:00
izac112 9cedb2ec47 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-03 19:53:45 +02:00
Killian 8c8c24e180 Update stack.dm 2023-05-14 13:37:26 +01:00
Killian 01f56888cd mecha nanopaste repairs fix 2023-05-14 13:27:02 +01:00
Varlaisvea 1ae49ef905 the little construction pr 2023-03-08 23:24:56 -05:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
Heroman d2e2bf9d66 Makes all carpet types orderable and gives them tile icons 2023-01-13 17:15:44 +10:00
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00
Heroman 547382e647 Fixes autolathe and smartfridge issues 2022-12-28 17:43:04 +10:00
izac112 1a7326e546 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-10-16 23:13:42 +02:00
Killian 33efd08ddb talon, vb, and typhon fixes 2022-10-12 13:25:58 +01:00
izac112 509325db9f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-09-17 22:18:49 +02:00
TheGreatKitsune 772e3bca7b Fixes bug regarding feral xenochimera and treating others/being treated 2022-09-07 09:32:16 -05:00
izac112 00994205e0 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-09-05 13:47:14 +02:00
Heroman 62c6b9c50c fixes runtime with stack dna transfer 2022-09-04 10:35:13 +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
izac112 352c8c5323 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-08-03 18:09:45 +02:00
C.L d2778bb97f Places advancedtoolchecks and fixes two-handed weapons for simple_mobs
Modernizes code to today's standards.

Also makes it so that simple_mobs that have hands can use two handed weapons and guns correctly.

Bonus of making it so scugs can now mine and put ointment and bruise packs on.
2022-07-24 21:06:42 -04:00
izac112 8f96195fdb Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-23 13:40:54 +02:00
Heroman 69cbc2e62b Fixes conflicts with casino PR 2022-07-12 16:12:00 +10:00
izac112 4e5f16920f compile errors 2022-07-09 11:20:03 +02:00
izac112 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02:00
klaasjared e410047ff8 Conflict Fix 2022-06-30 19:45:03 -04:00
Casey e0ef010384 Merge pull request #13114 from Heroman3003/happycarpet
Adds Happy carpet
2022-06-18 23:58:23 -04:00
Heroman 8e1b2e6ea1 Adds Happy carpet 2022-06-19 11:53:23 +10:00
ItsSelis 2d7b081a55 Input Conversion Part 2 2022-06-19 03:40:24 +02:00
Casey 0f7ef0cce1 Merge pull request #12800 from VOREStation/upstream-merge-8556
[MIRROR] Adds Some More Decorative Flooring Types
2022-06-18 20:44:13 -04:00
VerySoft f7f9d4f5f0 Fixy 2022-06-18 20:31:11 -04:00
izac112 891967a990 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-06-06 15:26:15 +02:00