275 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
Killian 2c11b12814 Headset Refactor and Selection (#16568)
* headset refactor and selection

* Update headset.dm

formatting

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/_helpers/global_lists.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2024-11-06 18:49:11 +01:00
Nadyr 2cd150b294 fixes fireaxe path (#16504) 2024-10-22 20:48:56 +02:00
Selis 242fa3a66b Ports over configuration controller (#16484)
* Ports over configuration controller

* Fixes

* Manual path fix

* patch (#16490)

* patch

* .

* SQL Fix

* Post-rebase fix

* Added missing examples

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-10-22 19:26:44 +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 a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Heroman3003 5260e2cfda Merge pull request #16360 from ShadowLarkens/mapci
Make map selection marginally better and more CI friendly
2024-09-29 19:25:13 +10:00
Guti 1862c0e11b Deconf 2: Electric Boogaloo 2024-09-27 13:43:21 +02:00
Killian a81f2b15cf laserdome improvements 2024-09-27 08:46:02 +01:00
ShadowLarkens d32600b0bf Make map selection marginally better and more CI friendly 2024-09-23 18:58:38 -07:00
Guti f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul 7fa41d248f alt titles and order 2024-09-14 04:20:37 +02:00
Kashargul b041bca268 some alt titles 2024-09-13 23:00:17 +02:00
Kashargul a123f87e68 some mind jobs 2024-09-12 23:48:31 +02:00
Kashargul 8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Kashargul 4ba7beeb9c up to field medic 2024-09-12 21:20:47 +02:00
Kashargul 8a3520e2e0 move all factions to defines 2024-09-12 20:17:41 +02:00
Kashargul 10dc8510b3 up to engineer 2024-09-12 02:01:36 +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 186475ef6d Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-06-03 22:08:11 +02:00
SatinIsle c807c3179e Event prop and areas (#15995)
Added a shinto arch prop for use in events.

Added a bunch of areas for the upcoming facility redgate. They need to be in early so that they can be used for the event map which will be uploaded on the day.
2024-05-22 07:16:22 +10:00
izac112 95279d346e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-515 2024-04-24 23:28:19 +02:00
SatinIsle 8b71cf692f Jungle Redgate and New Vore Mobs (#15889)
* [WIP] New Vore Mobs

Added new vore mob: Cave Stalker, a 6 legged canine/feline like creature that charges at prey from a distance to pounce them. It immediately stops on the spot if spotted and then retreats quickly if stared down.

* Fixed missing file

* More mobs, still WIP

* More stuff! [Still WIP]

Added another mob called the sonadile that works based on sound similar to the lurker.

Added a bunch of mobs to the maint pred list, including the kururak because that's a cool one.

* Update vorestation.dme

* Update sonadile.dm

* Another mob and stalker tweaks, still WIP, need to add flavour text for all mobs

* Update devil.dm

* Update stalker.dm

* Even more maint pred options

* More Capture crystal mobs

* Finishing touches, no longer WIP!

* Update vore_raptor.dmi

* Added the jungle map redgate

Also resolves a runtime with the scrubble.

Forces jungle redgate only for the first few days at least.

* Update jungle.dmm

* Update jungle_underground.dmm

* Update paint.dm

Fixes paint runtime
2024-04-07 10:34:24 +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
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
izac112 2fdeac8c38 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-28 09:22:14 +01:00
Kashargul 58ac42145a generalized the blaclists, too 2023-12-18 05:20:29 +01:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
Kashargul 250f02c9b7 generalized 2023-12-17 23:05:32 +01:00
Kashargul c6f211e0c6 ensure the blacklisted items are not on the pulled bed by kicking them 2023-12-17 07:47:21 +01:00
Kashargul 85e7823cff allows pulling of whitelisted items through redgate 2023-12-17 01:48:49 +01:00
Runa Dacino 8c08652eb4 TWEAK: Enables roller beds to cross redgate 2023-12-16 20:41:00 +01:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Killian d90c7f5771 laserdome: (basic) inhands and more layout tweaks
portals are a pain
2023-09-28 16:03:59 +01:00
Killian 01d7c54ebe laserdome: descriptions, comments, and concourse 2023-09-27 22:41:02 +01:00
Killian cd2a6cb7ce laserdome: portals and comments 2023-09-27 20:29:41 +01:00
Killian 1950a7e0cc laserdome: hyperball gameplay 2023-09-27 16:14:54 +01:00
Killian 3b53ac54a8 laserdome: hyperball arena 2023-09-27 14:34:09 +01:00
Killian 2d2bedc7a8 laserdome updates
makes it so you can't pass through the gate whilst holding an object that has a new var set to false
2023-09-27 01:33:58 +01:00
Killian eb1311b7ef laserdome updates
adds entertainment radio key, amongst other things
2023-09-26 18:21:12 +01:00
Killian 1b3c757e72 Update redgate.dm 2023-09-26 10:28:17 +01:00
Killian 075e3a9510 redgate laserdome 2023-09-26 09:33:08 +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
SatinIsle 9d7a1329e0 Redgate train map
Adds a new redgate map: A moving train. A long, linear map with two levels, all aboard a moving train. Has a few things to find and mobs to eat/get eaten by. lots of different rooms, mostly to vibe in. Very very deadly to fall off of, but has railings everywhere except one roof section.

Adds a new death step_trigger, which deletes the body of the person who steps on it and gives them a message about how they died. Also logs and messages the admins so that it can be tracked easily.

Adds a new subtype of ticket printer, which prints permits instead, only little pink tickets. Idea is for them to be used for train tickets if someone wanted to RP a train conductor, but made them broad so that they can be used for anything. Does not add the message to the end of round report, but does notify the staff when a ticket is produced to prevent abuse.
2023-09-05 13:25:10 +01:00
SatinIsle ee1baecdba New redgate Islands map
Added a new redgate islands map. This consists of two Z-levels: An ocean with a few islands to visit, many with vore mobs on them. An underwater Z-level with lots of things to find hidden around the ocean floor, a little more sparse on vore mobs.

Added a new underwater turf. Standing on this turf feeds you CO2 instead of air, suffocating you. It is a subset of water turfs, and therefore interacts with aquatic, which also allows you to breathe on these turfs. This does mean that you can use the "dive" ability of aquatic under the water too, but it can be treated as though you are swimming up above the sea floor.

Added a "diving" subset of the ocean turf, which allows you to dive down to the turf beneath it, or to swim up from below. Uses normal move up/down verbs.

Added a bunch of underwater flora.

Added a collapsed ships mast prop.

Added a new variation of Fake_Sun that applies a new underwater weather effect and has only one option for the colour and brightness.

Added a new "vorny" variation of the great white carp. This one is very hard to escape from and digests quickly, but is stunned if you manage to do so to give you a chance to flee.

Added a new water resistant and friendly hiveless hivebot called Harry.

Added a couple of creative commons 0 sound effects for the ocean and underwater areas.
2023-08-30 14:51:00 +01:00
Heroman 7c39d0bb14 low sorting priority fixes 2023-08-27 12:27:15 +10:00