Commit Graph

36638 Commits

Author SHA1 Message Date
Lyndomen 47337d2ece
Revert "Removes DragonSpawn event" (#1329)
Revert "Removes DragonSpawn event (#1298)"

This reverts commit 4ced3fb175.
2024-06-12 18:17:24 +02:00
github-actions[bot] da348c5a70
Update Credits (#1335)
Co-authored-by: DeltaV-Bot <github@delta-v.org>
2024-06-12 18:16:58 +02:00
Velcroboy 14c5eea75e
Add missing windoors (#1355)
* Add missing windoors

* Adjust notes

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-06-12 18:15:01 +02:00
DeltaV-Bot 01e23f245d Automatic changelog update 2024-06-12 16:13:11 +00:00
deltanedas 96cacd06c4
fix ninja requirement not existing (#1358)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-12 18:12:37 +02:00
Velcroboy 6fa9131ca4
Fix justice/sec access (#1359)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-06-12 04:07:55 +00:00
Null 21cd750ff4
Merge pull request #1331 from NullWanderer/2024/06/06-upstream-merge
Upstream merge
2024-06-11 17:12:03 +02:00
null 976aa679e2
Fix number 2 hopefully 2024-06-11 13:41:06 +02:00
null b70880595d
Fix test fail? 2024-06-11 13:21:14 +02:00
DeltaV-Bot 3a9e50ed56 Automatic changelog update 2024-06-11 02:23:22 +00:00
therealDLondon 091550f9d2
Pebble Update (#1342)
* Changes Map

* Update YML

* trolled by a space

* Trolled by spawns

* Troll prevention

* Map changes

* Update YML
2024-06-10 21:22:45 -05:00
Adeinitas 97e0f6f1b7
Shoukou Hotfix (#1339)
* Shoukou Hotfix

Fixes the wall eating the CMO's dresser, does some shit with tiles, fleshes out the bridge bar and dock more.

* Unfucks the Clerk's access by replacing the door

Keeping in with that PR timemaster did and was accepted
2024-06-10 20:46:26 -05:00
Velcroboy 25efbc7f52
Map Edits: Clerk Kant Edition (#1347)
* Map Edits: Clerk Kant Edition

* Hammu DetDrobe

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-06-10 20:42:28 -05:00
deltanedas b1ad9858a4
lighthouse justice dept (#1322)
* lighthouse justice dept

* fixy

* update prototype

* changes

* 1 of them somehow got locked real

* justice hallway, id computer, yml cleanup

* add cj to the round table

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-10 20:33:35 -05:00
Colin-Tel fd925d1b6c
Micro & Asterisk adjustments (#1344)
* Map adjustments

MICRO: clerk room adjustments, atmos adjustments, added the paper
ASTERISK: minor changes to Justice

* Update micro.yml

labelled brig timers and removed sec multitool/paper
2024-06-10 19:54:29 -05:00
DeltaV-Bot 48397c83a2 Automatic changelog update 2024-06-10 10:18:10 +00:00
Timemaster99 4455e1ec30
Justice patch 06/09/2024 (#1340)
* Removed service access from attorney, added sec playtime to prosecutor

* Fixed many bugs
2024-06-10 12:17:38 +02:00
Nairod 6eb6c276fa
Fix Some Equipped PDAs Not Appearing (#1337)
Fix Equipped PDAs not Appearing
2024-06-09 10:10:53 +02:00
deltanedas 4bc45dd098
add ChiefJustice to command (#1334)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-09 00:55:47 +00:00
Null 80b2566567
Update deltav.toml (#1333)
Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
2024-06-08 23:03:55 +02:00
Adeinitas 80a7e299ba
Converts all existing lobby art to WebP (#1332) 2024-06-08 22:34:53 +02:00
DeltaV-Bot b68884b4c0 Automatic changelog update 2024-06-08 19:39:49 +00:00
Adeinitas a5648c598c
Brings Justice to Shoukou (#1321)
* Brings Justice to Shoukou Station

* adds a space in the map prototype yml

* Adei leaves a spot between "Chief" and "Justice" like a fucking dingus

* Map Error Fixes

reroutes pipes by the robo lab, adds maint door by reporter's office so it's still accessible, 1984s heads spawning in their rooms. adds scrubber in the vault so ratcliff the mouse doesn't choke on their own breath and die. adds tiny fans on the command dock, labels clerk fax and allows clerk to breathe air. takes away the warden's cannabis butter and replaces it with a sec encryption server.
2024-06-08 14:39:20 -05:00
null 5ab73ea298
Merge remote-tracking branch 'refs/remotes/upstream/master' into 2024/06/06-upstream-merge
# Conflicts:
#	Resources/Prototypes/Maps/submarine.yml
2024-06-08 21:03:00 +02:00
Scribbles0 6efdbf66c9
Unrevivable trait (#24226)
* unrevivable trait + remove unclonable remnants

* cleanup

* change to hascomp
2024-06-08 20:47:28 +02:00
null a1c590fe53
Fix duplicate locale entries 2024-06-08 20:44:24 +02:00
null 303e71d84c
Some code fixes 2024-06-08 20:37:53 +02:00
PJBot 27b6ccbb6a
Automatic changelog update 2024-06-08 20:31:58 +02:00
PJBot 2d61e4e434
Automatic changelog update 2024-06-08 20:31:55 +02:00
nikthechampiongr aa1fd64b44
Make freeze, freeze & mute, and unmute verbs work on disconnected players. (#28664) 2024-06-08 20:31:53 +02:00
PJBot 3ce06b4ed5
Automatic changelog update 2024-06-08 20:31:51 +02:00
Vasilis 55f09b8ffa
Ensure packager creates a release folder (#28426)
I was screaming at the github actions runner before i noticed something i had done before caused me to never have a release folder and thus fail.
2024-06-08 20:31:25 +02:00
PJBot 698cde53f0
Automatic changelog update 2024-06-08 20:31:23 +02:00
Leon Friedrich e08280c6e1
Try fix RGBee (#28741) 2024-06-08 20:31:21 +02:00
PJBot 6e7a632c38
Automatic changelog update 2024-06-08 20:31:18 +02:00
metalgearsloth 0da82f6d47
Add loadout group check for role proto (#28731)
MFW same bug twice at 2 layers because I'm stupid.
2024-06-08 20:31:16 +02:00
MerrytheManokit e787d02b73
rn, atp (#28674)
* Update speech-chatsan.ftl

* Update word_replacements.yml

* Atm-at the moment

* Atm

* Update Resources/Locale/en-US/speech/speech-chatsan.ftl

* Update Resources/Prototypes/Accents/word_replacements.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-08 20:31:13 +02:00
DrSmugleaf c75ac999fa
Fix DamageOtherOnHit.OnDoHit when the target is terminating or deleted (#28690) 2024-06-08 20:31:03 +02:00
Tayrtahn 44bd6b37c1
Improve grammar of various petting messages (#28715)
Improve grammar of various petting message
2024-06-08 20:31:01 +02:00
PJBot b80e2fbe6c
Automatic changelog update 2024-06-08 20:30:59 +02:00
Lyndomen 3d56f8dfd5
Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709)
* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-08 20:30:58 +02:00
DrSmugleaf 58e1b529fe
Add DoPopup data field to OnUseTimerTrigger (#28691) 2024-06-08 20:30:56 +02:00
DrSmugleaf bd54ddce12
Fix action icons when dragging an active action to another slot (#28692) 2024-06-08 20:30:54 +02:00
PJBot d130dac329
Automatic changelog update 2024-06-08 20:30:41 +02:00
Plykiya 48534934bd
Swap some InRangeUnobstructed for InRangeUnoccluded (#28706)
Swap InRangeUnobstructed to InRangeUnoccluded

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-08 20:30:39 +02:00
lzk 5546c21aac
Add locale support for booze and soda jugs labels (#28708) 2024-06-08 20:30:36 +02:00
Ubaser fdf0ec422a
Tweak chapel salvage wreck (#28703)
add
2024-06-08 20:30:22 +02:00
Leon Friedrich b45a42f353
Add JobRequirementOverride prototypes (#28607)
* Add JobRequirementOverride prototypes

* a

* invert if

* Add override that takes in prototypes directly
2024-06-08 20:30:16 +02:00
PJBot c39af75588
Automatic changelog update 2024-06-08 20:28:50 +02:00
PJBot be805b64b6
Automatic changelog update 2024-06-08 20:28:36 +02:00