Commit Graph
1766 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
izac112 578e38108f Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-25 19:31:25 +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 19e46d19b2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-17 01:06:24 +01:00
KashargulandGitHub 59d751a9f9 Round value adjustments for react (#15764)
* input adjustments

* .

* .
2024-02-16 14:18:54 +01:00
Selis d99321bfdf Cleaning up defines 2024-02-10 16:44:44 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
KashargulandGitHub d3b0c1ebe6 robot upgrade overhaul 2024-01-27 13:29:19 +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
NadyrandGitHub 9347a99f5b Ports QoL, upgrades, and a lot of bug fixes 2024-01-18 21:04:36 -05:00
izac112 2fdeac8c38 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-28 09:22:14 +01:00
BlackMajorandGitHub 6bf0ce0efb whoops 2023-12-21 23:08:37 +13:00
BlackMajorandGitHub ac3fee4bb0 Update powernet.dm 2023-12-21 22:45:23 +13:00
BlackMajorandGitHub bc856ac67c Update cell.dm 2023-12-21 22:33:08 +13:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
KashargulandGitHub fe66178f93 changed icon of the syndicate cell to make it clear that it's better than a standard 2023-11-28 20:22:44 +01:00
KashargulandGitHub 607dd63941 finished todos
-> moved robot batteries to path
-> reworked the rejuvenation
-> added component add / remove
2023-11-28 03:11:06 +01:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +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 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
CaseyandGitHub b8b56174ac Merge pull request #15380 from KillianKirilenko/kk-mini1
Fixed tesla examines (again)
2023-09-11 01:49:46 -04:00
Killian bc646ab0d5 fixed tesla examines (again) 2023-09-11 03:44:30 +01:00
SatinIsle 11f799ca16 Fixed city sprites
Fixed some neon signs in the city.
2023-09-05 20:54:28 +01:00
Heroman 10b3895fcd Fixes recaster 2023-09-02 21:58:35 +10:00
Heroman e8d739008a Replaces Limiter with Collector due to redundancy 2023-09-02 21:46:37 +10:00
Heroman d31f91fb65 Adds a variety of new tesla coils with unique properties and upgrades 2023-09-02 21:39:24 +10:00
Heroman3003andGitHub f1ee225c83 Merge pull request #15342 from KillianKirilenko/kk-mini1
Tesla Component Examine Tweaks
2023-09-02 13:52:59 +10:00
Killian c5216c0645 tesla component examine tweaks 2023-09-02 01:17:47 +01:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
SatinIsle 34c9953d75 Rain City
Adds a new redgate map: Rain City. This map is a single Z-level, but very very dense, with close to 70 buildinds, most of which are unique (about 18 of them are homes, the rest are all different). It has a LOT of randomly generated loot. Alley ways have random vore mobs, whilst buildings and streets have a variety of preset ones. Makes use of the new fake_sun weather feature to have it raining outside.

In addition to this, it also adds a whole bunch of neon signs, and coloured bulbs to go with them.

It also adds a new darker pavement type called City Slab, a new road turf and dashed line decals to mark the road.
2023-08-22 21:53:41 +01:00
Heroman 67b14352af Borg module consolidation - initial commit 2023-08-06 20:55:34 +10:00
Heroman c23577bb1e Adds some altevian-themed props 2023-06-23 17:16:21 +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
ItsSelis 10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00
Heroman3003andGitHub 9983fc2447 Merge pull request #14821 from Youtubeboy139/2023-EnerGen-Power-Cells
2023 EnerGen Power Cells
2023-06-04 05:09:19 +10:00
izac112 30f994a544 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-05-10 16:00:23 +02:00
Killian fc9c2732de friendlier tesla components 2023-05-06 08:28:27 +01:00
Youtubeboy139 9f625e65d5 Base Commit
Minor Fixes
Found some errors while testing. Fixed.

Minor Fixes
Found some errors while reviewing code. Fixed.

Minor Fixes
Found some errors while reviewing sprites. Fixed.

Major Changes
New Cell Charger icon_update system
New Crap Device Cell
Removes Secborg power cell

Minor Fixes
Found some errors while reviewing code. Fixed.
2023-05-04 12:48:28 -04:00
izac112 5c0a04dad0 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-04-30 14:31:02 +02:00
Killian 18cf24069b field generators glow 2023-04-07 06:11:10 +01:00
izac112 4cc81d7c73 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-03-19 22:24:48 +01:00
AtermoneraandVirgoBot def3b6c762 Merge pull request #9030 from Ilysen/if-i-dont-do-a-small-thing-here-and-there-im-gonna-melt
Fixes a small hiccup in cable coil examine text
2023-03-14 03:46:15 -04:00
Heroman3003andGitHub ac1782cc4d Merge pull request #14624 from ItsSelis/selis-sdmm
Resolves SDMM warnings
2023-03-09 15:19:56 +10:00
ItsSelis c2b084ebfa Resolves sdmm warnings 2023-03-08 19:06:01 +01:00
Seris02 aadd99ba94 more fixed admin hrefs 2023-03-01 11:27:34 +08:00
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00
Heroman 042ef04bdf Various minor fixes 2022-12-27 16:17:24 +10:00