Commit Graph

4539 Commits

Author SHA1 Message Date
deltanedas bee11f3a16
add glimmer wisp (#1383)
* add sacrafice/drain sound

* refactor glimmer event yml + uncomment wisp + make mites scale at lower glimmer

* remove glimmer wisp rule and make GlimmerMobRule much more flexible + better

* add LifeDrainer code that wisp uses

* add ai primitives and compounds

* add glimmer wisp

* a

* fixes

* add wisp texture

* desc

* add sounds

* buff so you cant literally 2 shot it with bible

* make it harder to kill but drop more ectoplasm

* make it work properly

* let it use zap in combat i hope

* add glimmer creatures guidebook

* test

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-01 22:05:56 +02:00
Colin-Tel 579d8aed3e
Change hunger rate again (#1384)
They hunger for change.
2024-06-14 21:15:48 +00:00
Colin-Tel e6bafb2a64
Adjust Hunger rates (#1302)
* Upped hunger rates

* vulp hunger and diona thirst

* Revert "Upped hunger rates"

This reverts commit da6bf53687.

* changed hungercomponent

* Update diona.yml

adjusted diona hunger

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-06-12 16:30:02 +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
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
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
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
DrSmugleaf 58e1b529fe
Add DoPopup data field to OnUseTimerTrigger (#28691) 2024-06-08 20:30:56 +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
Tayrtahn b693a16b93
Add support for LocalizedDatasets to RandomMetadata (#28601) 2024-06-08 20:24:12 +02:00
Leon Friedrich 7d903800a8
Add closing storage UIs to StorageInteractionTest (#28633) 2024-06-08 20:23:33 +02:00
Plykiya f0c639cdf4
Make cuff default range again (#28576)
* Make cuff default range again

* uncuff distance

* how about ONE

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-08 20:20:36 +02:00
Leon Friedrich e0ea8adb9a
Add Job preference tests (#28625)
* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
2024-06-08 20:19:39 +02:00
TsjipTsjip 6b2145241f
Prayable datafield typo (#28622)
* notifiactionPrefix -> notificationPrefix

* notifiactionPrefix -> notificationPrefix
2024-06-08 20:17:23 +02:00
icekot8 fe16eb1cd4
hand teleport portals now may start in the same grid. (#28556) 2024-06-08 20:16:59 +02:00
Kevin Zheng 67c27e351e
Add CVar to disable pow3r parallel processing (#28488)
* Add CVar to disable pow3r parallel processing

* Cache CVar value

* Fix pointyhat

* Move all CVar-ing to Content.Server
2024-06-08 20:16:21 +02:00
Hannah Giovanna Dawson 842d633cb9
Make projectile & hitscan reflection only try once with the best reflector (#28539) 2024-06-08 20:15:15 +02:00
Hannah Giovanna Dawson 2bf0e82b7a
SS14-26964 Clown Waddling Replicates, etc (#26983) 2024-06-08 20:15:12 +02:00
Errant 772296179a
Don't switch-unwield if mob has more than 2 hands (#28438) 2024-06-08 20:15:09 +02:00
null 993959ae58
Replace deprecated whitelist functions 2024-06-08 20:12:43 +02:00
Plykiya edf125c481
Gets rid of obsolete EntityWhitelist.IsValid() function (#28565)
Gets rid of obsolete IsValid function

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-08 20:03:28 +02:00
Plykiya 6583105f10
Replace obsolete EntityWhitelist IsValid usages part 2 (#28506) 2024-06-08 20:03:26 +02:00
lzk a633095da1
Make borgs shown in logprobe (#27788) 2024-06-08 20:02:43 +02:00
Ed 667d1d5941
Accent trait limit (#28046) 2024-06-08 20:02:27 +02:00
AJCM-git 95dd203ec6
Small code cleanup to health bar (#28554) 2024-06-08 19:59:29 +02:00
AJCM-git 426896a432
Cleans up StatusIconSystem and fixing some bugs (#28270) 2024-06-08 19:59:10 +02:00
leo c82affb78b
Adds the Justice Department (#660)
* legal departmant

* god i wish i knew what i was doing

* minor rsi fixes

* i forgor the legal radio frequency

* Minor fixes to radio, stamp, PDA, etc...

* add department

hehe

* Edits from Velcroboy

* Add trial timer

* add department signs

* Changes all references of legal -> justice and adds prosecutor access

* Missed one

* Adjust lawyer

* update lawyer icon

* temp to fix

* revert to fix

* add airlock texture

adds justice department airlock texture. Still need to do the yaml part of it but the texture's there.

* fix bureaucracy meta

* More meta fixes

* Connect airlocks to yaml

* Fixes, tweaks, and last reference of "legal" maybe

* Add justice to airlock groups

* add prosc. drip and fix prosecutor typos

adds prosecutor badge and suit, as well as fixes the spelling of "prosecuter" to "prosecutor"

* Changes prosecutor's supervisor to CJ

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Attorney <- Lawyer locale edit

* Removed modified shoukou file

* Added antag objective and touched up yaml
Fixed Clerk PDA and CJ jumpsuit error. Additionally moved notary stamp from paper.yml to rubber-stamp.yml, and fixed some indentation in the meta.json of the pda.rsi file

* Attorney <- Lawyer, now including the PDA
Forgot this last commit

* Fixed typo in Clerk Vest ID

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Added Chief Justice locker, all of its contents, and a prosecutor PDA (sprite pending)

* lockers 2, electric boogaloo. Committing files I forgot to commit

* Added CJ stamp and put it into CJ locker. Fixed notary stamp and put the sprites in the correct RSI

* Attempt to resolve merge conflicts

* Remove conflict markers

* Added stamp sprite, implemented CJ cloak

* Implemented Gavel Prototype and added to CJ locker

* Removed justice access from attorney as it will be used to secure Clerk's locker. Disabled antag for all justice besides attorney.

* Added Clerk locker and placed Notary Stamp into it. Uncommented gavel in CJ locker

* Added lawyer's stamp to lawdrobe

* Added Prosecutor PDA, icon, and ID sprite

* Added gavel block and made gavel tap when clicking on it

* Add component, EmitSoundOnInteractUsing onto the gavel block

* Added sprites for CJ and Clerk locker

* Spell-checked and edited job descriptions slightly

* Fixing missing type entity access.yml

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Adjusted rsi paths for gavel and gavel block to use forward slash

* Fixed a variety of invalid rsi references, and door remote yaml issue

* Added Lawyer access to Justice access group, fixed door_remote.yml access

* Remove antagadvantage from chief justice

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Apply suggestions from code review

line at the end for readability & matching current standards... line at the end for readability & matching current standards...

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Hopefully remove shoukou.yml from the changed files

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Once again attempt to remove shoukou.yml from changed files

* Attempt once more to remove shoukou.yml from changed files

* Fixed justice pda box description

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Please go home, shoukou. We don't want you here

* Fixing prototype references pt1

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Renamed headsets/legal.rsi to headsets/justice.rsi

* Added hyphen to chief justice localizations

* Ordered justice accesses alphabetically

* Added prison key to justice headset

* Various yaml fixes from review

* Apply suggestions from code review

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Localized changes to pdas and jobs

* Removed indents in locale

* Fixed reference to chief justice stamp

* Apply suggestions from code review

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Renamed Lawyer to Attorney in locale, added deltav marker

* Lawyer to Attorney, Warrant Document in Clerk and CJ locker

* Apply suggestions from code review

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Replaced legal with justice in job-description.ftl

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Moved job-name-lawyer to DeltaV locale

* Remove added space in accesses.ftl

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Removed unneeded deletion of unneeded spaces in headsets.yml

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Changed Lawyer ID name to Attorney ID

* Updated copyrights in all of the meta.json files affected

* Added formal and white variants of CJ jumpsuit to locker

* Updated to use upstream's EmitSoundOnInteractUsing

* Removing old component stuff

* Gave Prosecutor Filled Lawyer Backpack

* Deleted old component

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Removed old comments

* Updated doors to electronics system, fixed courier spawner that I botched

* Fixed door_access indentation

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Adding a little bit of loadouts

* Add loadouts for justice

* Removed accessreader from windoors

* Added job spawner icons

* Fixed spawner sprite layering

* Added missing parent in ID cards

* Removed redundant laceup shoes loadout

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Added lawyer windoor, fixed spawner names, fixed locker names

* Added station beacons

* Softened justice dept palette

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>

* Added justice key to telecomms

* Added deltaV comments to telecomms

---------

Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com>
Co-authored-by: Timemaster99 <elijahrobot@gmail.com>
Co-authored-by: luckywill339@gmail.com <luckywill339@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: Azzy <azzydev@icloud.com>
2024-06-07 15:22:37 +02:00
null 792afce5cb
Some tool related fixes 2024-06-06 22:16:17 +02:00
DrSmugleaf d58b6b49dc
Add more info to GettingAttackedAttemptEvent (#28548) 2024-06-06 22:04:16 +02:00
deltanedas bf146480f9
make objectives use entityCategory (#28269) 2024-06-06 22:04:13 +02:00
Cojoke aaa96befa1
Make projectiles not hit crates unless clicked on (#28072) 2024-06-06 22:01:50 +02:00
Verm 22c7f4e610
Welding tweaks (#27959) 2024-06-06 21:59:35 +02:00
Plykiya f8b3a797be
Emergency Fix for Whitelist logic (#28510)
fix issue

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-06 21:50:29 +02:00
slarticodefast 7f5be661f8
Flash overlay rework and bugfixes (#27369) 2024-06-06 21:46:58 +02:00
Leon Friedrich 0f8b1bbde5
Content changes for entity categories PR (#27232)
* Content changes for entity categories PR

* Poke tests

* Why are tests suddenly working?
2024-06-06 21:44:49 +02:00
eoineoineoin c62bd23656
Replace Matrix3 with System.Numerics.Matrix3x2 (#27443)
Replace Matrix3 with Matrix3x2
2024-06-06 21:44:48 +02:00
Plykiya b2931f9a33
Replace obsolete EntityWhitelist IsValid usages (#28465)
* Replace obsolete whitelist is valid with whitelist system

* Consistency

* Fix logic

* Bork

* I figured out how to get whitelists on the client lol

* test fail

* woops

* HELP ME FUNCTIONS

* Fix errors

* simplify

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-06 21:44:41 +02:00
Tornado Tech 91f0ba53e5
Cleans up tag system (#28272)
* Updated tag system

* Added params methods

* Fixed tag integration tests

* Fixed params methods recursion

* Revert has All/Any tag one argument realisation

* Updated tag integration tests

* Shit happens

* Added individual List/HashSet methods, docs, tests
2024-06-06 21:33:38 +02:00
Tornado Tech 228e653572
Hiding and clearing department prototype code (#28114) 2024-06-06 21:33:27 +02:00
AJCM-git ab59cfea40
Makes machine parts stackable, removes unused field in stack prototypes (#28434)
* Makes machine parts stacks, removes unused field in stack prototypes

* forgor

* Fix tests

* Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely

* detail

* a
2024-06-06 21:29:09 +02:00
Nemanja 5e39323307
Clean up store system (#28463) 2024-06-06 21:28:46 +02:00
deltanedas 708e17a3d3
reverse engineering refactor and missing recipe test (#1230)
* make jugg not atmos hardsuit reable lmao

* re machine yaml refactor

* use the enum name to localize re results

* move a lot of code to shared and refactor

* clientside rework

* add test for missing recipes

* untroll

* make exped board recipe yml consistent with upstream

* fix unearthed sneaky bugs + generic does nothing so remove

* add mass media console board, remove roundstart boards from dynamic recipes

* remove roundstart stuff, add rcd ammo to protolathe

* dont dupe because of access electronics prototypes

* fix final fails

* final untroll

* final untroll 2

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
2024-06-01 21:31:06 +00:00
Mnemotechnican 380c858476
Fix pseudoitem fitness check (#1232)
* fixie

* Prettier code

* Bleugh
2024-06-01 23:16:10 +02:00
DrSmugleaf eed9c58386
Add job whitelist system (#28085)
* Add job whitelist system

* Address reviews

* Fix name

* Apply suggestions from code review

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* cancinium

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2024-06-01 18:02:43 +02:00
DrSmugleaf 185a61175f
Fix the client thinking it cannot shoot after mispredicting when it actually can (#28464) 2024-06-01 18:02:04 +02:00
Nemanja 19eefe623d
Clean up command perms (#28451)
* Change BanExemption command to AdminFlags.Ban permissions

* Change LOOC to check for Moderator permission

* Change ListVerbs from Admin to Debug AdminFlags

* Change RunVerbAs from Admin to Fun AdminFlags

* More permission changes

* Change GhostKick to Moderator perm

* Clean up command perms

* fuck

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-06-01 18:01:58 +02:00
Geekyhobo f7581b1f21
Adds a Pii Flag, Censors Hwid and Ip (#27776)
* yes

* fixes
2024-06-01 18:00:39 +02:00
Verm fe3892977d
Randomizes more humanoid appearances (#27997) 2024-06-01 18:00:15 +02:00
Nemanja bacd52c991
Decouple interactions from hands, cleanup old events, add new fears (#28393)
* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* 👁️ 👁️

* shadowcommander review
2024-06-01 18:00:07 +02:00
Leon Friedrich 6427cc560e
Make chat & examine systems use FormattedMessage.EscapeText() (#28431) 2024-06-01 18:00:05 +02:00