Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update #24

Merged
merged 693 commits into from
Aug 15, 2024
Merged

Update #24

merged 693 commits into from
Aug 15, 2024

Conversation

Truoizys
Copy link
Collaborator

upstream update!!
actually had conflicts this time 😔

IProduceWidgets and others added 30 commits August 7, 2024 15:47
* butter slippery

* rerun tests

* standardize
* Add test for drag drop to open strip menu

* Make screencoords change based on deadzone
* add verbose examine text to gas miners so their behaviour can be understood

* no need for these to be properties

* use an enum instead of two booleans for the miner state

* require the gas miner to be anchored in order to not be disabled

* xmldoc

* pr feedback

* file-scope namespace

* it's to late to hide my transgressions in a rebase

* turns out the normal examine distance is totally fine for this
Tests should work decently again
* Spanish and French comment

* Added the interrobang

* Make spanish accent use sting builder
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <[email protected]>
* Add EntityWorldTargetAction initial implementation

* Update obsolete methods

* Partially working EntityWorldTargetAction

* Fix entity selection

* Move and clean up AfterInteract

* Fix building new walls

* Readd no entity or coordinates error

* Consolidate action validation code

* Add summaries to component

---------

Co-authored-by: Ed <[email protected]>
* ai stays seated while cuffed.

* Do the thing I thought was dumb.... whatever.

* less than
* first-commit

* second commit

* i think i get git kinda maybe

* all of resources i think

* last easy changes

* oops

* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml

---------

Co-authored-by: stroopwafel <[email protected]>
Co-authored-by: Plykiya <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
* Тыкнул и нету ЦК

* review

---------

Co-authored-by: metalgearsloth <[email protected]>
…s (#30361)

* Add BreakOnDropItem, update do afters, remove unnecessary declarations

* bola

* Changed my mind about the nuke

* gennies too

* Make the comments more clear.

* Sorry for the trailing commas

* Revert "Sorry for the trailing commas"

This reverts commit e60fd9a30977393df3344948e6d5c0ce035723cd.

---------

Co-authored-by: plykiya <[email protected]>
Fixed typos in name and description of syndicate recruit jumpsuit.
* Added the ability for blood to track DNA using ReagentData; Forensic Scanner now accounts for solution DNA, non-DNA holders have "Unknown DNA"

* Removes touch DNA for puddles, adds DNA to vomit

* DNA now leaves traces in containers and those marked without don't show DNA on scan (except for puddles), gibbed parts have DNA

* Fix stupid metamorphic glass bug grrr

* Removed SpillableComponent since DnaSubstanceTraceComponent is used instead

* Removes data field from maps, adds DNA tracking for some missed items

* Give default value, fix missing values.

* Fixes recipe bug

* Review changes

* Make the Data list into a nullable type

* Revert map changes

* Move gibbed unknown DNA to forensicssystem
* jnk sprites

* scrap pt 2

* metal inhands

* hell yeah brudda

* Update meta.json

* Update scrap.yml

---------

Co-authored-by: Flareguy <[email protected]>
PJBot and others added 14 commits August 15, 2024 01:52
* packed update

* bartender spawn
* more cogmap fixes

* updated cog a bunch
* lox update

* real
* Relay entity

* Server
* initial commit

* tweaks to the new voice lines

capitalizations of I's and the Y on hos 3 voice lines
also changed the captain figuring voice line 2 to something completely different

* capitalized one letter

man i really suck at capitalization

* more capitalization

i never thought this pr would need so many changes

* changed one comma to a dot

* Update Resources/Locale/en-US/datasets/figurines.ftl

Co-authored-by: slarticodefast <[email protected]>

---------

Co-authored-by: slarticodefast <[email protected]>
chavonadelal and others added 11 commits August 15, 2024 10:30
* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <[email protected]>
* greatly improve how the gas analyzer behaves

* don't close the analyzer when the object goes out of range

* cleanup

* always switch to the device tab when a new device is analyzed

* modern api part one

* modern api part 2

* modern api part three

* file scope namespace
Fix false and true in player-panel

Add a new True string
@Truoizys Truoizys merged commit c109c0b into Prison-Station-14:master Aug 15, 2024
11 checks passed
@Truoizys Truoizys deleted the update branch August 17, 2024 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.