Commit Graph

36638 Commits

Author SHA1 Message Date
deltanedas fd15be03d0
fix special scrubber/vent tags early merge (#3384)
fix special scrubber/vent tags

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-04-05 16:42:35 +01:00
deltanedas 0f69f40f7c
remove evil shitcode from RandomMetadata early merge (#3382)
* remove evil

* fix non-localizeddataset uses

* fix hostage ops warden

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-04-05 16:17:58 +01:00
Delta-V bot a8c277907d Automatic changelog update 2025-04-05 16:48:18 +02:00
deltanedas 3893764ff6
revert tactical hacking (#3373)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-04-05 15:47:59 +01:00
Stop-Signs 0cdf42bf5c
Fix changelog (#3381)
all credit to tryded i just did code cleanup
2025-04-05 15:41:48 +01:00
Stop-Signs 9e31d5d546
Fix new ERT (#3379)
fix ERT
2025-04-05 14:41:38 +00:00
Delta-V bot f70a40c3e3 Automatic changelog update 2025-04-05 16:35:26 +02:00
Tobias Berger f026ba0ad6
Hotfix for broken comms from empty message highlights (#3378) 2025-04-05 15:35:06 +01:00
Delta-V bot 9545808559 Automatic changelog update 2025-04-05 14:09:30 +02:00
Radezolid 6f10c63ba6
Fix rubber ammo not appearing on the security techfab (#3376)
Fix rubber ammo
2025-04-05 13:09:11 +01:00
Delta-V bot f79bfb77e9 Automatic changelog update 2025-04-04 23:35:11 +02:00
Stop-Signs 7996a5c55e
Unfucked version of ERT Overhaul 4.0 (#3365)
* Sprites + IK-30 and Advanced Energy Gun

* hardsuit YML

* Elite Hardsuit Sprites and Helmets

* fix laser mags rsi

* attempt fix

* fix 2

* fix3

* fix 5

* Give Chaplain ERT actual powers

* WHY IS THERE A 2 THERE

* Combat RCD

* advanced compact defib

* CMO Defib steal objective

* fix RSIs

* IK-60 redux

* RSI fixes

* License fix

* PDW-9 Redux

* Holorollerbeds

* Holostretcher folded

* Immolator Cannons

* Researchable Immolator Cannons

* rsi Fixes

* rsi fix

* fire protection to helmets

* typo

* Orderable Laser Carbines

* Lathe Recipes

* miss cap fixes

* helmet and projectiles fix

* chemical bottles

* ERT loadouts

* No more survival box

* Ghostroles for ERT

* fix

* fix2

* Update EmergencyResponseTeam.yml

* fix

* fix again

* ERT Hardsuit fix

* spritefix

* typo

* Typo fix 2.0

* mass commenting out

* Revert "mass commenting out"

This reverts commit 1ee6173328.

* hotfix

* fixes

* the gun fixes

* loadout fixes

* rsi fixes

* Loadout fixes

* No more DeltaV namespace

* no more textures DeltaV namespace

* fix order of meds

* whoops forgor to fix

* the great unfuckening

* defib ID fix

* second pass of unfuckening

* more unfuckening

* should be final wave of fixes

* stupid bottles

* fucking lathe pack

* whoops

* cleaning up

* they get plenty of these anyway

* guh

* wow i hate autofill

* nineteeneightyfour

* nineteeneightyfive

* requested changes

* whoops

---------

Signed-off-by: Tryded <tryded213@gmail.com>
Co-authored-by: Tryded <tryded213@gmail.com>
Co-authored-by: Tryded <139474617+Tryded@users.noreply.github.com>
2025-04-04 16:34:51 -05:00
Delta-V bot ee094a551d Automatic changelog update 2025-04-04 21:43:11 +02:00
deltanedas 730ec71337
hide surgeries that cant be done yet (#3335)
* kill xeno

* hide surgeries that cant be done yet

* a

* guh

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* empty

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-04-04 20:42:52 +01:00
Delta-V bot 248d1d5619 Automatic changelog update 2025-04-04 18:38:10 +02:00
deltanedas 764c4dcf54
fix ipcs not being able to disarm (#3374)
fix ipcs not being able to shove

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-04-04 17:37:52 +01:00
Delta-V bot 7ce299e117 Automatic changelog update 2025-04-04 18:18:39 +02:00
Tobias Berger 788d43ad99
Message highlights (#2990)
* Merge pull request impstation/imp-station-14#468 from hivehum/highlight

Add text highlighting

(cherry picked from commit e442cc4bb20fbb4d5b970275c82cc87508e6f687)

* More cleanly separate auto-generated and manual highlights

Edge case that's not handled: Closing and reopening the game drops the list of auto-generated highlights

* Use LocalizedDatasets to make higlight lists for all jobs

* DeltaV-ification

Since the implementation is now fundamentally incompatible
with the (still open) upstream PR, move to our own cvars

* Try to untroll code

* Untroll

* Untroll for real this time

* Fix wrong count in ChatHighlightBorg

* Escape highlights

Depends on space-wizards/RobustToolbox/pull/5688

* add missing using directive

* Fix failing test

* Rename CVars to avoid clash with previous implementation

* Tidy some stuff up

* Show auto highlights

* Remove redundant check

---------

Co-authored-by: V <97265903+formlessnameless@users.noreply.github.com>
2025-04-04 17:18:19 +01:00
Tobias Berger f1195c7050
Fix wrong ReagentId in Tortuga chapel (#3371)
Fix wrong reagentId in Tortuga chapel
2025-04-04 15:50:46 +00:00
This_Is_Gray 6d6cee3011
Elegance Engineering Rework (#3285)
* Update elegance.yml

* Update elegance.yml

* distro real

Hooks up the distribution line round start per request of FieldCommand.

* Update elegance.yml

* Update elegance.yml

* Update elegance.yml

* Update elegance.yml

* storage shutter button fixes + external scrap decor

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2025-04-04 07:44:28 -05:00
Delta-V bot ad8c77d073 Automatic changelog update 2025-04-04 14:40:32 +02:00
Colin-Tel 5bdc52da12
Updated Asterisk, Chibi, Micro (#3320)
Updated maps to be more in-line with current map rules/content.
2025-04-04 07:40:13 -05:00
Delta-V bot 19b47abef6 Automatic changelog update 2025-04-04 14:39:08 +02:00
Field Command 2b096463d1
Byoin fix 3 (#3352)
* Fixes

* AME Fuel increase
2025-04-04 07:38:46 -05:00
Radezolid f6a9ed3984
Move the advanced truncheon from upstream folder to ours (#3368)
Move the truncheon
2025-04-03 18:10:57 +01:00
Delta-V bot 5e433a3603 Automatic changelog update 2025-04-03 15:27:45 +02:00
Quanteey 10d9499ed5
Make the crew monitor on aghosts SHUT UP (#3367)
crew monitor aghost fix
2025-04-03 13:27:26 +00:00
Delta-V bot 7a8b3688d7 Automatic changelog update 2025-04-02 16:15:34 +02:00
Radezolid 486fe5e9c8
Fix atmos and spationaut helmet states for DeltaV species (#3362)
* Add unshaded version of atmos visor

* Fixed head states
2025-04-02 15:15:14 +01:00
TheRealSlimRedwoods 06f6301912
Watches to trinkets! (#3359)
* added watches to trinkets

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

* fixed some bugs + watches in trinkets!

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

* Update loadout_groups.yml

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

* Update trinkets.yml

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

* moved the shit to _DV

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

* slight miscalculation (moved error)

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

* you guessed it, ANOTHER UPDATE!!!!

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

* fixed a gap

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>

---------

Signed-off-by: TheRealSlimRedwoods <114874673+TheRealSlimRedwoods@users.noreply.github.com>
2025-04-02 03:02:51 +01:00
Delta-V bot e1f5ccce66 Automatic changelog update 2025-04-01 23:01:10 +02:00
Radezolid bf1decb79c
Fix the paramedic locker fill (#3358)
Fix the paramedic locker
2025-04-01 22:00:50 +01:00
Radezolid 166cd23fdc
Remove the foam toys set + minor cleanup of fun.yml (#3354)
* Remove the foam toys set

* Minor cleanup

* Removed amounts
2025-04-01 01:59:09 +00:00
Delta-V bot c3dbd5a75f Automatic changelog update 2025-04-01 03:04:48 +02:00
SolStar 7ae8c18136
Give Paramedics Emergency JoL (#3219)
* changes

* antag advantage

* Move body bag to locker for more space

* loadout changes

* space

* space space

* forgot one

* commit comment

* Consistency

* Seperated JoL into emergency and advanced

* broken

* running

* Working

* comment

* fish

* meow

* move
2025-04-01 02:04:29 +01:00
Delta-V bot 934955f90b Automatic changelog update 2025-04-01 03:01:07 +02:00
Stop-Signs 27b053209e
Gamblagator tweaks (#3341)
the PR
2025-04-01 02:00:47 +01:00
Delta-V bot ea3918a963 Automatic changelog update 2025-03-31 16:01:54 +02:00
deltanedas 981c93effe
remove cmo pill chemmaster flatpack (#3351)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-31 15:01:35 +01:00
Delta-V bot f01f555c79 Automatic changelog update 2025-03-31 15:58:57 +02:00
SirrRequiem ba992a5c9e
Chemmaster pill buffer change (#3329)
* Changed buffer to pull from beaker inside the chemmaster to make pills.

* Comment changes

* Revert "Automatic changelog update"

This reverts commit 56c9876dd3.

* Fixed comment lines

* Fixed comments

* update comment

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2025-03-31 13:58:37 +00:00
deltanedas 597465eb15
remove false cl (#3349)
1984

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-31 02:29:06 +01:00
Delta-V bot e27b98013f Automatic changelog update 2025-03-31 03:14:40 +02:00
deltanedas ded70320c5
wizard whitelist (#3348)
* whitelist wizard

* take from traitor instead of survival

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-31 02:14:22 +01:00
pathetic meowmeow 65d393c0b0
Revert "The Wizard - Coming to a Delta V near you" (#3347)
Revert "The Wizard - Coming to a Delta V near you (#3346)"

This reverts commit ed49e11a54.
2025-03-31 02:13:37 +01:00
Delta-V bot 98c4343283 Automatic changelog update 2025-03-31 02:39:20 +02:00
Avalon ed49e11a54
The Wizard - Coming to a Delta V near you (#3346)
Wizard
2025-03-31 00:39:01 +00:00
Delta-V bot 8efff0aeaf Automatic changelog update 2025-03-30 21:22:27 +02:00
deltanedas 69994977d9
fix radiation blockers (#3344)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-30 20:22:08 +01:00
Radezolid 50e335257c
Quick subdermal implants cleanup (#3340)
subdermal quick clean up
2025-03-30 20:08:05 +01:00