Commit Graph

107 Commits

Author SHA1 Message Date
deltanedas c93551dad7
upstream merge 7/9 (#1762)
* Remove always false checks (#31708)

* Remove calls to FormattedMessage obsolete methods (#31706)

* Remove FormattedMessage obsolete methods

* Oops

* remove misinformation from tip 26 (#31705)

tip 26

* Automatic changelog update

* Replace obsolete code in AnomalySystem.Generator.cs (#31718)

* replace obsolete

* weh

* Added cursor indicator for space dragon fire breath ability (#31725)

space dragon breath cursor indicator

Co-authored-by: YourUsername <you@example.com>

* Automatic changelog update

* small yml cleanup (#31720)

* Updates descriptions of station specific jobs. (#31713)

done

* Remove unused IoC dependency references. (#31704)

Remove unused IoC dependencies

* cleanup filing cabinets yml (#31211)

* partmedia ahh kommit

* ahh

* everything should be fine now

* f

* now should be good

* Update Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* fix suffix

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Move IgnitionEvent to shared (#30985)

* Cleanup railings yml (#31618)

* Cleanup railings

* fix line

* real fix

* Roundstart Grappling Gun (#31737)

Roundstart grappling hook

* Automatic changelog update

* Added in-hand sprite for Smile the Slime (#31731)

added smile the slime in-hand texture

Co-authored-by: YourUsername <you@example.com>

* Lite Magnet Rebalancing (#31726)

magnet rebalancing ish

* unnerf fishops

* Devmap crew monitor fix (#31677)

* Automatic changelog update

* Add ERT time stats (#31629)

* add jobs for ghost roles

* add job to ToggleableGhostRole

* typo

---------

Co-authored-by: Mota <belochuc@gmail.com>

* Automatic changelog update

* Fix CS0642 - Possible mistaken empty statement (#31740)

* Throw the book at em! The space law book now does 1 blunt projectile damage (#31387)

* you can now throw the space law book for 1 blunt damage

* made book damage a feature of all books

* Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)

* Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem

* guap

* More fixes

* Wait you can do that?

---------

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

* Add Donk Co. microwave board to Combat Bakery Kit (#31239)

* Add special microwave board to Combat Bakery Kit

* use event instead of trycomp

* make the board sus

* add instructions note

* embarrassing typo

* Add functionality to Donk Co. microwave instead

* update note

* Automatic changelog update

* Actions bar dynamic resizing (#31759)

* action bar dynamic resizing

* action bar dynamic resizing for separated style

* decreased indent for separated style

---------

Co-authored-by: YourUsername <you@example.com>

* Automatic changelog update

* Fix warnings related to non-exhaustive pattern matching.  (#31763)

old man shakes fist at modern syntax

* ats update (#31766)

* ats update

* fix pipenet

* Ninja throwing star ability fix (#31684)

fixed ninja star not spawning

Co-authored-by: YourUsername <you@example.com>

* Automatic changelog update

* Remove duplicate using from FoodSystem (#31769)

* vox voices revamp (#31679)

vox voices v2

* fixed broken pipe sprites (#31773)

* Return Long2 and Long3 hairstyles  (#30963)

* Sprites

* Prototype_&_Locale

* sorted_in_alphabetical_order

* Automatic changelog update

* Added many old ion lawsets for borgs and AI. (#31664)

* Added the Commandments, Paladin, LetLive, Station Efficiency, Robocop, Overlord, Dungeon Master, Artist, Antimov and Nutimov lawsets/

* Wording

* Anti-Antimov

* Fixed fun

* Add Snails (#30765)

* add snails

* scuffix

* migrate

* mo-grate

* oopsied the ftls

* Revert "oopsied the ftls"

This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.

* the curse of staging the wrong file, resolved.

* Snoth

* fix my dumbs

* reviews 1

* anti space technology

* salt hurty

* spelling

* Its a slotherhouse out here

* sequencing

* cooked snail

* volfix

* speed reversal

* Automatic changelog update

* Remove testbed command (#31793)

* feat: now when research is unlocked in console, approver of reasearch is radio-ed too (#31170)

* feat: now when research is unlocked in console, approver of reasearch is radio-ed too

* refactor: now most of events that require actor name to be radio-ed or logged use TryGetIdentityShortInfoEvent which is subscibed by id-card system and borg system (to work for both carbon and synthetic life-forms)

* refactor: moved TryGetIdentityShortInfoEvent on id card system to shared, fixed cargo cent-com-originated orders

* remove unused check

* refactor: decoupled systems from IdCardSystem (those that are not dependent on it anymore)

* refactor: removed unuseed usings

* feat: emagged cargo/research consoles wont radio messages on buy/research confirm anymore

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>

* Automatic changelog update

* New chemical based artifact nodes (#30873)

* Initial pH nodes, and description changes to indicate pH

* Psychoactive and stimulant nodes, Medical foundation, bioreactive hint

* Added medical reagents to medical node. Added norepinephric acid to acidic and made up a pH

* Added pyrotechnic chem node, and corresponding hint

* spelled psychedelic correctly

* Fixed capitalisation skill issue

* fixed indentation skill issue

* fixed a further indentation skill issue

* Removed extraneous whitespace

* Replaced bioreactive with theraputic and psychoactive. Also fixed typo skill issue.

* removed unnecessary comment

* Replaced heartbreaker with THC for psychadelic

* removed artifexium from acidic

* added tran acid to acidic

* added more medical chems

* removed pH values

* removed all but medical

* Automatic changelog update

* Add Red Neck Gaiter To Secdrobe (#30106)

* Red Neck Gaiter Added to SecDrobe

* Removes Gaiter From TheaterDrobe

* Automatic changelog update

* Fixed typos (#31811)

* Automatic changelog update

* Station AI has their name displayed in announcements now. (#31802)

* Station AI has their name displayed in announcements now.

* I'm so sorry

* Corrections

* part 2

* part 3 :|

* part 4

* Whitespace

* Fixing whitespace part 1

* No more whitespace

* PLEASE NO MORE WHITESPACE

* Automatic changelog update

* Add disabled station anchors version (#31794)

* Add disabled station anchors versions

* remove this

* add structural damage taken to a lot of prototypes (#30790)

* fix

* add structural damage taken to a lot of other things

* do requested changes

* how did this happen

* Automatic changelog update

* No Mr.Snail, I expect you to die! (fix sprite) (#31834)

* No Mr.Snail, I expect you to die!

* emoting

* Allow some mobs to walk slowly (#31360)

* Allow mice to walk slowly

* add more

* Automatic changelog update

* Delete nonsense solar assembly construction through the Construction window (#31425)

* Delete construction for solar assembly, it's the way to do it

* Fix description of solar tracker electronics

* Improvements to hand labeler UI (#31833)

Give line edit focus when window is opened
No longer require pressing enter to set the text
Give feedback when user hits the maximum label length

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>

* make tesla brighter (#31357)

* make tesla brighter

* radius to 10

* Automatic changelog update

* CorrectContraband levels on each type of magboots (#30960)

* Added a ClothingShoesBootsMagBase, to allow the other versions of the magboots to have their own contraband settings

* Changed Science Boots to not be contraband

* Made ClothingShoesBootsMagBase abstract

* Removed Engineering Contraband from base magboots. Now only the CE's Advanced Magboots are contraband (Grand Theft Contraband). Blood Reds are Syndie Contraband.

* Automatic changelog update

* Morgue system refactor remove unused VVs and into Entity (#31835)

* Remove unused VVs params and usings
from entityUid, MorgueComponent into Entity<MorgueComponent> ent

* remove unnecesary VVs cuz datafields add em

* Make midround zombie outbreaks much rarer (#30266)

* Remove midround zombies

* super rare, like, 1/651 chance every few minutes.

* weight to 1

---------

Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>

* Automatic changelog update

* Teleporting while pulling crash fix (#31787)

teleporting while pulling crash fix

Co-authored-by: YourUsername <you@example.com>

* Automatic changelog update

* quietify stealthbox (#30741)

* Automatic changelog update

* Atmospheric alerts computer (#25938)

* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version

* Automatic changelog update

* Day 0 bug fix for atmos alerts computer (#31858)

Initial commit

* Basically every electronic device can now be used by the AI. (#31730)

* Basically every electronic device can now be used by the AI.

* Removed stuff that didnt make sense

* oops

* Removed access from mailing and disposal units.

* Added AI wires to a couple machines.

* cool epic stuff

* Automatic changelog update

* Fix a typo in the 10 commandments (#31856)

* feat: #26107 uplink discounts for traitors (no nukies for now) (#26297)

* feat: #26107 uplink discounts for traitors and nukies

* refactor: #26107 extracted discount label from price of StoreListingControl

* refactor: minor renaming

* refactor: parametrized adding discounts to uplink store

* fix: #26107 prevent exception on empty discountOptions

* feat: uplink now have 'Discounted' category which contains all discounted items on this session.

* after merge fixups

* rename discount categories according to common sense

* refactor: DiscountOptions is now optional (nullable) on ListingData

* add nullability check ignore for already checked listingData.DiscountOptions

* fix after merge store menu ui

* remove unused using

* final fix after merge conflicts

* [refactor]: #26107 fix variables naming in UplinkSystem

* fix: #26107 fix after merge

* refactor: #26107 now supports discountDownUntil on ListingItem, instead of % of discount

* feat: #26107 support multiple currency discount in store on side of discount message label

* refactor: #26107 extracted discounts initialization to separate system. StoreDiscountData are spread as array and not list now

* refactor: #26107 move more code from storesystem to StoreDiscountComponent

* refactor: #26107 separated StoreSystem and StoreDiscountSystem using events

* fix: #26107 placed not-nullable variable initialization in ListingData for tests

* refactor: #26107 minor renaming, xml-docs

* fix: #26107 changed most of discounts to be down to half price for balance purposes

* ids used in with discounts are now ProtoIds, dicountCategories are now prototypes, code with weights simplified

* decoupled storesystem and store discount system

* xml-docs

* refactor:  #26107 xml-doc for StoreDiscountSystem

* is now a thing (tmp)

* fix: compilation errors + StoreDiscountData.DiscountCategoryId

* refactor: rename ListingDataWithCostModifiers, fix all cost related code, enpittyfy performance, uglify uplink_catalog

* refactor: removed unused code, more StoreDiscountSystem docs, simplify code

* refactor: moved discount category logic to respective system, now creating ListingData c-tor clones all mutable fields as expected

* refactor: rename back (its not prototype)

* refactor: move ListingItemsInitializingEvent to file with handling logic

* refactor: comments for StoreBuyFinishedEvent handling, more logging

* refactor: moved StoreInitializedEvent, xml-doc

* refactor: simplify StoreDiscountSystem code  (reduce nesting) + xml-doc

* refactor: restore old listing data cost field name

* refactor: fix linter in uplink_catalog.yml

* refactor: xml-doc for ListingDataWithCostModifiers

* refactor: limit usage of ListingData in favour of ListingDataWithCostModifiers

* refactor: purged linq, removed custom datafield names, minor cleanup

* refactor: removed double-allocation on getting available listings

* refactor: StoreSystem.OnBuyRequest now uses component.FullListingsCatalog as reference point (as it was in original code)

* fix: minor discount categories on uplink items changes following design overview

* refactor: StoreBuyListingMessage now uses protoId and not whole object

* refactor: store refund and discount integration test, RefreshAllListings now translates previous cost modifiers to refreshed list, if state previous to refresh had any listing items

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>

* Automatic changelog update

* Fixed AI Actions (#31823)

* Updated sprites for AI HUD

* Epic test fail

* Merged AGhost actions and AI actions together again.

* Seperate comms and bugfix. Fixed broadcast.

* Automatic changelog update

* add wireless net to evac shuttles

* Automatic changelog update

* A kit to help new botanists discover chemistry (#31738)

* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry.

* remove exclamation marks from names

* naming fix

* Rejected trademark application for 'Farmers Helper'.

---------

Co-authored-by: PraxisMapper <praxismapper@gmail.com>

* Automatic changelog update

* Board for the AI upload console (#31867)

board

* Automatic changelog update

* Fix typo in agri-chem manual (#31869)

* Fix typo in agri-chem manual

* Unremove my added newline

* Cleanup books.yml (#31838)

* Cleanup books.yml

* yeah

* shame

* Vox sign/N2 locker update (#31845)

* Vox sign/N2 locker update

The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in https://github.com/space-wizards/space-station-14/issues/31840, and do not fit our server culture.

The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets.

The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though.

* emogarbage adjustments

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>

* Automatic changelog update

* Pizza boxes now have a chance to contain cotton pizza (#31883)

Pizza box now contains cotton pizza

Co-authored-by: Ekkosangen <9094006+XyyxShard@users.noreply.github.com>

* Automatic changelog update

* Tech Anomaly (#31764)

* A

* B

* C

* D

* Update TechAnomalySystem.cs

* idle anim

* Update meta.json

* new animation

* Automatic changelog update

* Fixed throngler name inconsistencies (#31889)

changed throngler names

* I have spent more time today cleaning up garbage than coding new shit, and I am mad (#31246)

* Fix logging of GetWebhook errors

Yeah let's just not log the error only stack trace.

* I have spent more time today cleaning up garbage than coding new shit, and I am mad

Cleans up the custom vote Discord webhook code because I *happened* to lay my eyes on how completely terrible it was and immediately found an obvious bug with it.

Also did basic QA because jesus christ: it more clearly reports pending votes, properly indicates cancelled votes, improves footer formatting, better error logging, all the usual shit.

Requires https://github.com/space-wizards/RobustToolbox/pull/5375 to avoid test failures

* Mineral Scanner (#31390)

* Mineral Scanner

* doink

* review

* sunday funday

* review and fix bugs i think?

* Update MiningOverlay.cs

* Automatic changelog update

* Fix ai upload console itemslot whitelist (#31900)

* Fix ai upload console itemslot whitelist

* aw man

* Automatic changelog update

* improved vox laugh (#31798)

vox laugh not underwater

* fix pump shotgun wielded sprite (#31885)

* fix shotgun sprite

* fix take 2

* fix: Snail event wasnt tabled (#31884)

pest events reorganized and snails spawn

* Automatic changelog update

* Force stop pulling when fall asleep (#31893)

* break pull at sleep

* TryStopPull without user

---------

Co-authored-by: YourUsername <you@example.com>

* Automatic changelog update

* Energy Shotgun Change 2 - Narrow Nerf + instances from NoSpawn --> categories: [ HideSpawnMenu ] + self recharge removed + 1 more shot + normal recharge speed (#31235)

* narrow nerf

* last instance of nospawn gone

* removes self recharge

* 8 shots, less recharge time

* Automatic changelog update

* Add justice helm (#31905)

* Add justice helm

* backslash moment

* spinny light

* remove power cell from recipe

* Automatic changelog update

* Quiver Crafting Recipe (#27198)

* Update quiver.yml

* Create quiver.yml

* Update clothing.yml

* Update pneumatic_cannon.yml

* Update pneumatic_cannon.yml

* Update pneumatic_cannon.yml

* Update pneumatic_cannon.yml

* Delete RDs binary encryption key (#31909)

Deleting binary key

Silicon supremacy!

* undelete rd key

* Automatic changelog update

* split temperature protection into heating and cooling (#30662)

* split temperature protection into heating and cooling

* fugg

* weh

* update TemperatureProtection for stuff

* Automatic changelog update

* makes the maple wing marking have a primary and a secondary color (#31691)

bogos binted

* Automatic changelog update

* Remake bottles and syringes names to use labels (#29956)

* Remake bottles and syringes names to use labels

* vial

* fix and add stuff

* Automatic changelog update

* guide on agrichem and botanicals guidebook update (#31896)

* Automatic changelog update

* Automatic changelog update

* Lost evac pod thing tiny fan (#31915)

* disaster evacpod tinyfan

* real

* :trollface:

* untroll

* Ghostrole rule updates (#29249)

* First batch of ghostrole rule updates

* Second pass

* Re-word free agent

* Apply review comments

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* You heard it here first folks

God rules are weird to write.

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Honkbot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Mimebot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Jonkbot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Softer blue

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* :trollface:

* :trollface:

* :trollface:

* pro

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Co-authored-by: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: godisdeadLOL <169250097+godisdeadLOL@users.noreply.github.com>
Co-authored-by: YourUsername <you@example.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: Mervill <mervills.email@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: poeMota <142114334+poeMota@users.noreply.github.com>
Co-authored-by: Mota <belochuc@gmail.com>
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Fildrance <fildrance@gmail.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Lye <128915833+Lyroth001@users.noreply.github.com>
Co-authored-by: DieselMohawk <gavin.drinka@gmail.com>
Co-authored-by: Hreno <hrenor@gmail.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com>
Co-authored-by: Token <esil.bektay@yandex.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com>
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Ekkosangen <9094006+Ekkosangen@users.noreply.github.com>
Co-authored-by: Ekkosangen <9094006+XyyxShard@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Chubbicous <100180479+Chubbicous@users.noreply.github.com>
Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com>
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Co-authored-by: Futuristic-OK <141568243+Futuristic-OK@users.noreply.github.com>
Co-authored-by: Ian <ignaz.k@live.de>
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2024-09-10 01:20:38 +10:00
Alzore aa4d045721 Make space scanning T1 technology (#31321)
make space scanning and mass scanner t1 tech
2024-08-27 01:00:43 +01:00
deltanedas f941121384
upstream merge (#1636)
* uncomment grappling gun

* Remove rest of Geras files (#30912)

remove remaining geras stuff

* tweak(AgeRequirement): Make the requiredAge more sensible (#30913)

* chrore(ageRequirement): fix grammar. atleast -> at least (#30914)

* Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918)

* Fixes inhand hardsuit cross color from https://github.com/space-wizards/space-station-14/issues/26516#issue-2213917971

* Fixed HoS Turtle not covering all butt pixels

---------

Co-authored-by: Zachary Yona <magicalusf@gmail.com>

* Add execution component to all energy sword weapons (#30909)

Co-authored-by: plykiya <plykiya@protonmail.com>

* Automatic changelog update

* chore(grammar): correct some mistakes (#30916)

* Add diamond mining drills, buff regular mining drills (#30814)

* why do I have to change so much just to add drills

* diamon

* Automatic changelog update

* give trash a reusable entity table (#30921)

* Contraband marking & examining (#28688)

* System & loc strings

* pass over syndie contraband

* fixes

* grand theft pass

* contrabandexamine -> contraband

* examine text generation update

* all composition parents necessary

* bring back minor contra so it has a less confusing message

* minor

* weapon pass

* jumpsuit pass

* feet pass

* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH

* head

* AUUUUGH

* ear

* belt

* back

* fix

* bro

* rename for more clarity

* do da review

* add cvar for contraband examine

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Automatic changelog update

* Removes variant cube migration (#30934)

add

* First Review Pass Contraband Fixes (#30930)

* First pass contra fix

* bam

* More

* Security crates are now marked as security restricted

* Syndicate raid suit is contra

* damn I forgot gatfruit

* Add conducting gloves to the maintenance loot table (#30904)

* add

* lower weight

* Fix DoDrop to DropNextTo in container cases (#30911)

* Fix DoDrop to DropNextTo in container cases
DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method

* codestyle change

* Fix Reagent Fire Stacks (#30766)

* Fix Reagent Fire Stacks

* Comments on code

* little nicer wording?

* Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratva… (#30954)

Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.

* Automatic changelog update

* Fix permission check for whitelists in player panel (#30948)

* Automatic changelog update

* Grey mantle in winterdrobe (#29774)

* add the mantle

* fix a few things

* fix merge conflict stuff, remove from winterdrobe and lathe.

* Add mantle to loadouts (20 hour requirement)

* Automatic changelog update

* Sliceable doAfter (#30824)

* init

* wtf git

* Automatic changelog update

* Add capfruit, a gatfruit mutation. (#30850)

* add base

* add fake suffix and flavor fix

* address some reviews

* parent it

* fix test fail

* add FoodSequence support and address small review

* Automatic changelog update

* Fixes the grey mantle (#30971)

add the thing i missed

* Add keybinds for rotating and flipping objects (#30540)

* add keybinds for rotating and flipping objects

* no popup for verbs

* Automatic changelog update

* tweak(Shuttle_honki): Remove DeviceQuantumSpinInverter from honki shuttle. (#30618)

* Make the Borgs Names Appear When they Make an Announcement (#30107)

* Make the Borgs Names Appear When they Make an Announcement

* bwomp

* re-order

* Use Name instead of metadata

* goiup

* Automatic changelog update

* disable contraband examine

* rename our SliceFoodEvent

* Throngler Plushie Sprite (#30969)

Throngonkler Plush sprite

* Fix bug with rotating shelves (#30978)

* Main

* Update shelfs.yml

* Little bug fix

* No weather on concrete tiles (#30952)

* concrete weather

* miss

* development build ghostrole lottery changes (#30980)

debug ghostrole lottery changes

* Automatic changelog update

* Add a saline syringe to the combat medical kit (#29954)

saline

* Automatic changelog update

* fix the admin verbs trying to kill players by filling their lungs with plasma (#30991)

fix the admin tools trying to kill players by filling their lungs with plasma

* Custom Taco & Kebabs - FoodSequence 2 (#30905)

* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Fix popups not working properly with an eye offset (#30990)

* Adds a random smokable spawner (#30870)

* Textures to make lamps mappable to East/West.

* Adds a random smokable spawner

* remove double derma

* Increase chance for just basic cig

* Update to enitity tables

* Tweak values

* Remove space

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

* Fix lizards being unable to eat custom burgers (#31005)

* Fix lizards being unable to eat custom burgers

* ensure tag comp

* Automatic changelog update

* Sedin (#27110)

* Sedin

* almost forgot this.

* what

* Did a few fixes, tried to readd popup

* Fix popup, ready for merge

* minor change

* Generalize seed removal/destruction system, add popups in general.

* fix

* fix (again)

* deadcode is no more

* Sedin buff (nerfing the recipe soon)

* godont

* webedit moment

ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit

* CRIKEY

* Revert "CRIKEY"

This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.

I was not supposed to commit that >:/

* Alright, it should be good now but I havent tested it

* ready for merge/review

* prob -> probability

* Requested changes nodoc

* Review nodoc

* documento

* thumb up emoji

* Automatic changelog update

* Adds a Dinky Star Sticker for security officers (#29767)

* Sec-Star-TASTIC

* fix license

* now counts as trash

* Sticks to people + wearable

* no more sticky

* no more sticky

* mystery-space

* Update Loadout Yaml

* Automatic changelog update

* tweak(hospital): Reduce diamond stack from 30 to 1 (#31027)

* tweak(experiment): Reduce diamond stack from 30 to 1 (#31025)

* replace mapped diamond stacks with single

* Figurine voicelines (#30865)

* 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 <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Adding shock collar and electropack (#30529)

* 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 <98561806+EmoGarbage404@users.noreply.github.com>

* Automatic changelog update

* Greatly improve the usability of the Gas Analyzer. (#30763)

* 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

* Automatic changelog update

* Fix false and true in player-panel.ftl (#31043)

Fix false and true in player-panel

Add a new True string

* Contra Review Passs - Round 2 (#30942)

* Contra pass round two

* command too

* Stamps

* oopsied a bracket

* Namespace cleanup around Mind Roles (#30965)

* namespaces

* Comment does not need a semicolon

---------

Co-authored-by: Vasilis <vascreeper@yahoo.com>

* Contraband Review Pass - The Threequel (#30970)

Contraband pass number three

* Golden toilet (#31049)

* golden toilet

* Destructible

* sprite

* fix

* copyright

* Automatic changelog update

* Salvage Spawners (#31020)

* treasure entities and spawners

* no more smiles

* remove nyano shock collar code

* Event scheduler setting tweaks (#31018)

tweaks

* Automatic changelog update

* remove meteor swarms rule for a moment

* Revamped Meteor Swarm (#28974)

* meteor code and balanced values

* Meteor Swarms

* Update meteors.yml

* Update meteors.yml

* HOO! (fix overkill bug and buff space dust)

* undo BloodstreamComponent.cs changes

* DamageDistribution -> DamageTypes

* part 2.

* Missing meteor presets (#29044)

* add meteors into missing game presets

* changes for real

* implement code

* this too

* Meteors now leave behind a bit of ore (#30419)

* Meteors that leave behind asteroid ore

* bigger offset

* Bit more generic

* Better defaults

* hrm?

* I HATE CUSTOM SERIALIZERS

* More comments

* renamed a variable

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* refactor event schedulers to use explicit game rules (#29320)

* works, still has testing values, im sure I did stupid shit.

* shitvent crapfactor

* snap extra word out of existence

* shit I died of old

* remove useless inaccurate design comments

* Oopsie, handle requirement params in RandomRuleSystem too

* I'm a slash slinging hasher

* Address reviews, add admin alerts I forgor

* EntityMan saves the day

* address reviews 1

* eh, I actually don't care about the cargo gifts thing.

* started

* Do reviews

* you actually meant 1.2 lmao

* dependency inheritance is a fickle bitch

* I have no idea.

* Threads are for sheets not computers.

* fix traitor rule test

* fix round type tattling

* break things

* It worky

* Toolshed makes we want to drink depresso.

* Finished?

* remove debug values

* timings

* use defaults

* alphabetize

* bobby drop tables

* Float required fr fr

* continue

* more continence

* uno mas

* obsolution

* cleanup and documentations

* Yell at self

* use the right value defaults

* housekeeping

* Event scheduler setting tweaks (#31018)

tweaks

* Automatic changelog update

* remove(NukeopsRuleComponent): Remove a trap from the component file (#31029)

ah

* Fix bug with holding objects (#31009)

Main

* Automatic changelog update

* Replace obsolete map functions in IconSmoothSystem (#30958)

* first part

* second part

* Automatic changelog update

* Fix reagents with ReagentData being duplicated  (#30983)

Initial commit

* :trollface:

* :trollface:

* actually untroll

* a

* 50 burger

* add back old meteor code

* fix

* use some live config options in dev

* remove old shock collar icon

* make ammo more consistent and work more

* clean up lathes diff to upstream

* a

* move rubber bullets to deltav folder

* a

* untroll

* more untrolls

* more untrolls

* untroll

* :trollface:

* a

* b

* remove it for real

* add missing lathe recipes

* replace cvars with component field

* remove taco from roboisseur

* migrate cardboard box with smg mags

* remove kebabs

* a

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Co-authored-by: Zachary Yona <58833995+Magicalus@users.noreply.github.com>
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Token <esil.bektay@yandex.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: LeoSantich <108027402+LeoSantich@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com>
Co-authored-by: IgorAnt028 <118114530+IgorAnt028@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Eris <eris@erisws.com>
Co-authored-by: FATFSAAM2 <saamboroujerdi@gmail.com>
Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com>
Co-authored-by: Mervill <mervills.email@gmail.com>
Co-authored-by: Vasilis <vascreeper@yahoo.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
2024-08-18 17:21:07 +00:00
Alchebun 536e37d528
Plant bag of holding, Botanists rejoice! (#1651)
* Plant bag of holding, Botanists rejoice!

* Cost adjusted

---------

Co-authored-by: Alchebun <jimmy.12.or#gmail.com>
2024-08-18 10:44:31 +00:00
Danger Revolution! 26e2c78521
Peace Hypospray, Escalation Module (#1524)
* pax hypospray

* Fabricate from EE

* add escalation module

* Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml

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

* new icon

* forgot to set the icon (sigma moment)

* remove EE dependency

* Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml

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

* update recharge time to 20 seconds

* update maxvol to 5u

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2024-07-28 04:08:49 -05:00
Boaz1111 5af8272be1
moves explosive tech to T1 (#29227)
moves explo tech to T1
2024-07-25 00:37:16 +02:00
Nemanja c83d93e461
Add moon boots (#29009) 2024-07-25 00:14:05 +02:00
Danger Revolution! d67da18d52
Security Cyborg (#721)
* Create borg_chassis.yml

* Make da Borg

* Make da Borg craftable

* modules, most of which don't work

* Apply suggestions from death review

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

* we're so fucking back chat

* okay bola launcher is off the table

* cuffs part 2!!

* flashlight

* Rename

* Unparents NoSlip from BaseBorgChassis so SecBorgs can slip

* Gonna add PeaceKeeper modules as roundstart, lock the SecOff modules to research

* notes and a little less parentage

* planning out what modules we want

* modules

* Update borg_modules.yml

* more planning, more comments

* lowered health

* buff power cell & add holobarrier

* add to lathe & research

* add new module & implement new baton

* added the whistle :O

* sprites

* adds to lathe, updates module lathe to wizden standards

* i fucking hate construction

* balancing

* i still hate construction.

* locations of sprites

* put the research into the wrong place.

* renames

* baton change

* gonna try make the inventory fit.

* linter fix

* handcuff fix thank you vmsolidus

* linter >:(

* Update Content.Shared/Cuffs/SharedCuffableSystem.cs

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

* death suggestions

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

* Update security.png

* nuke the cuff system because i don't know how to fix it

* Delete Resources/Prototypes/DeltaV/Stacks/security_stacks.yml

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

* Update borg_chassis.yml

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

* Update borg_modules.yml

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

* Update borg_chassis.yml

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

* Update borg_chassis.yml

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

* Update security.yml

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

* rename to security cyborg

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

* Update borg_chassis.yml

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

* Update powercells.yml

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

* Update security.yml

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

* remove more handcuff stacking

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

* rename of certain items to be more general

* parents noslip to syndie chassis

* resprite

* rename

* Revert "resprite"

This reverts commit b08e2ed2ab.

* Update meta.json

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

* Update tags.yml

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

* Update arsenal.yml

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

* Update Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml

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

* Using WebEdit like a Sigma

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

* finally fixed the fucking transponder

* transponder please work

* Update security.yml

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

* Update security.yml

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

* lyndomen suggestions

* Add meta.json for wood baton texture in DeltaV weapons

* Revert additional construction steps; as they do not work.

* Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml

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

* Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* add delta-v comments per null

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

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-07-22 09:33:10 +00:00
Squishy77 ba28b83e81
Reverse Engineering Update (#1042)
* makes the re mechine buildable

I fucked up bad now im gonna fix it

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* adds the repcipe to the server i hope

Dear god i hope

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update handheld_mass_scanner.yml

adds the mass scaner to the list

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update handheld_mass_scanner.yml

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* more computers to the re list

adds boards!

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* adds more reable borards

dont really know about the deck guns and space heater ill have to test em

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* fixes a few lines

I hope this is ok

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* computer TURN OFF THAT NOISE

made the shuttle console consistent with its tier in the tech tree.

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* adds the spin inverter into the re list

yay?

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* adds beakers and the like

hope this works

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* adds magboots to be red

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* adds the Speeds boots to the re list

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update holoprojectors.yml

adds all the holo projectors.

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* removes the re compnet to the hand held

lagged the server I am told.

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* I think this recpie is simple to make and is just better then the intial one i had planed

that-

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* adds the grill!

i forgot!

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update production.yml

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update production.yml

quadruple check of the code

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update production.yml

* Update production.yml

* Update production.yml

Fixes lines

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update computer.yml

Adds references to delta for changed recipies

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update hand_teleporter.yml

Removes the re completed to the hand held teliporter

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Makes magboots fixed

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update experimental.yml

Fixes spacing and adds a delta reference 

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update holoprojectors.yml

Fixes up listing i think

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update misc.yml

Changes the addition to delta instead of nayno 

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update swapper.yml

Adds info that the change is made from delta.

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update handheld_mass_scanner.yml

Updates the nayo reference to a delta one

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update production.yml

Triple checks the naming and difficulty 

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update chemistry.yml

Adds references to delta in the changed code

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update computer.yml

fixed the line that I erased on accident. 

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update holoprojectors.yml

refernaces nanyo not delta

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update computer.yml

fixed a tag that would prevent building.

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update holoprojectors.yml

FIXES THAT ONE SPACE


Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update production.yml

adds the borg arms back

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update production.yml

all set

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update production.yml

fixed two ids

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update magboots.yml

fixed a unnecessary sister string.

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update chemistry.yml

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

* Update chemistry.yml

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>

---------

Signed-off-by: Squishy77 <165165480+Squishy77@users.noreply.github.com>
Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-05-20 22:30:45 +00:00
Boaz1111 9a1880fab0
Hyperconvection Circuit Imprinter (#27283)
* not done yet

* i may be stupid

* Update electronics.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-05-07 01:52:46 +02:00
Nemanja 043880a89b
welding gas mask (#27108)
* welding gas mask

* eek

(cherry picked from commit 0215292baaa50044189ffa5176431a99942e93bd)
2024-05-03 00:27:50 +02:00
Alzore 9de3cbed07
Make the cargo telepad T2 civilian (#26270)
therearetwowaystodothis

(cherry picked from commit 4290d5f13e16f01fd6a33af897665e0ba7795b3b)
2024-05-03 00:01:49 +02:00
Hannah Giovanna Dawson 4edf577b1b
SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit f059714a75601c73c0b7b917d0faac35c99f96fe)
2024-04-21 23:46:34 +02:00
metalgearsloth cc5d741a09
Added Jukebox (#26736)
* Added Jukebox, along with music for jukebox

* Fixed Jukebox meta.json copyright

* Removed songs I couldn't find a license for.

* Renamed files to solve check failures from spaces

* Added missing attributions.yml

* Fixed lack of description in Jukebox

* Jukebox is now constructable.

* Change Jukebox menu to FancyWindow

* Moved Jukebox messages out of jukebox component

* Removed Jukebox OnValueChanged.

* JukeboxComp now uses AutoGenerateComponentState

* Removed state code, since it's auto generated

* Fixed various Jukebox code to match conventions.

* Updated Standard.yml to match changed song list.

* fixes

* Jukebox workin

* Fix

* Polishing

* Finalising

* Revert

* bad

* jukey

* Reviews

* name

* Update submodule to 218.2.0

---------

Co-authored-by: iNVERTED <alextjorgensen@gmail.com>

(cherry picked from commit 2db374988c91c6ce5f932b9cee1ba251cbfb22e5)
2024-04-21 22:04:54 +02:00
GeneralGaws 2910bf21d5
Robotists technology icon fix (#26723)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
(cherry picked from commit 8cd0cce22e55ffe9755a7a76f78bb46f05c56cf8)
2024-04-07 14:34:18 +02:00
Flareguy b05cb2bb2d
Makes secglasses roundstart (#26487)
* makes secglasses roundstart

* fix epic fail

* fix tests questionmark?

* Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit a98d0cfe2e120f90c269e810f1365dad404d645a)
2024-04-07 14:17:35 +02:00
Boaz1111 43cc2e7db0
Industrial Reagent Grinder (#25020)
* all work done

* adress whitespace

* millions must factorio

* conflict fix

* i forgot

(cherry picked from commit 6ef592ddba336a41330eaf3760a600c805907e1d)
2024-04-07 14:14:05 +02:00
IProduceWidgets b8f3ef8bfc
Add astro-jungle/mowed grass and astro-snow (#26381)
(cherry picked from commit 89235b9e1b91b32b3e55b364d46c79daabe199e9)
2024-03-27 18:35:28 +01:00
deltanedas e45cbd7282
remove rped (#26316)
* remove rped

* trol

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 5ac88d9b2788182f607aeaf08eea8d26b1bb4d18)
2024-03-24 00:12:25 +01:00
Fluffiest Floofers 5ac3da210b
Another .38 special clean up / balance (#852)
* Fix weird firerates

The .45 magnum firerate is around 2 to 3 so it was extremely funny how the .38 would be slower than a .45 and even the snubbed version.

* change ejection port placement on psibreaker

* Rubber nerf + new ammo + fix recipe costs

Everyone gets incendiary and uranium bullets so why not.

* Make lucky available in salvage

Alongside the other revolvers

* Update look of speedloader

So it matches the other revolver speedloader. Slightly smaller just because.

* Fix mistakes 🍞

* Add extra speedloaders

* mindbreaker ammo box

* New markers, update old .38 markers

* commentfix

* firerate pass 2

* Fixes

* cleanup

* Add new colored tips to cartridges

* Fix typo

* holy update after someone pointed out the damage

It's technically still a bullet but coated in silver/holy magic whatever, so it should still pierce. Still have to print them one by one and they are not as good as normal bullet against normal things

* someone did the math for silver bullets

I guess.
2024-03-07 23:47:51 +01:00
FungiFellow 46e7aea655
Moved Grapple to T1 Industrial (#25782)
(cherry picked from commit 8d83efd254ce42758dbe013fa4cd91238b6f7bd8)
2024-03-07 01:19:29 +01:00
Nemanja 205b1f053c
move space heaters into cargo (#25735)
* move space heaters into cargo

* AAA!!! the indentation1!!!

* remove crate

(cherry picked from commit 9cdffb7b6e357da6b38833fa54fb6564d086de53)
2024-03-07 01:17:01 +01:00
Menshin 37c7ac7931
Add space heaters (#25250)
(cherry picked from commit 98843511014e1b5fce34b7e1215179dd3d0f94c8)
2024-03-07 01:05:02 +01:00
Ed 64ccfc1afb
Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix

(cherry picked from commit 7a5f81ddb46e47078b983bfc9ba015ee67752ee3)
2024-03-07 00:59:22 +01:00
Debug 9a246f9527
Remove drones, fix InnateToolSystem (#25372) 2024-03-05 09:34:57 +01:00
takemysoult c05ea5aa3e
balance Explosive Technology (#25397)
* update arsenal yml

balance ExplosiveTechnology

* small changes in arsenal research

small changes in arsenal research

* Update arsenal.yml

(cherry picked from commit 89d0b47354065bd6a50cf0f6b0d3ea04e0484d64)
2024-02-21 04:09:04 +01:00
Mangohydra 9df7cb37c9
Mechanized treatment improvements (#25356)
Medical module merge

(cherry picked from commit db809a27f40a0fbc175f675b86d326d0d15cc13f)
2024-02-21 04:03:38 +01:00
Ed b74146831d
Anomaly Synchronizer + Signallers tweaks (#24461)
* content

* nerf

* fix rsi

(cherry picked from commit 4d7fd1cace164a4fb31addc8e803962f55a01ca3)
2024-02-18 23:03:09 +01:00
Ubaser d364ed9a31
Roundstart Food Service research (#25046)
add

(cherry picked from commit 93d225d109904f89838fa0f07610f93ce1034e14)
2024-02-18 22:50:15 +01:00
FungiFellow d49acecdc5
Borg Module QoL and Gas Analyzer Module Removal (#24702)
* Borg Module QoL Focused on Engi Modules

* Update borg_modules.yml

* Update borg_modules.yml

* Removed Gas Analyzer Module Recipe

* Update borg_modules.yml

* Removes Gas Analyzer Module from research

* Update borg_modules.yml

* Update lathe.yml

* Update handheld_crew_monitor.yml

* Update borg_modules.yml

* Exchanged Service Module Dropper with BorgDropper

* Made a Lingering Plasteel Stack

* Made Lingering Reinforced Glass Stack

* Added Reinforced Glass and Plasteel into Construction Module

* Change Borg Crew Monitor Charge use

* Update handheld_crew_monitor.yml

* Removed Borg Crew Monitor

* Removed Crew Monitor From Diagnosis Module

* ID change

* Update handheld_crew_monitor.yml

* Delete Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml

* Update borg_modules.yml

* Update metal.yml

* Update glass.yml

(cherry picked from commit ce775891552f9fca2a54120b5a19f2a01c6e5c8b)
2024-02-08 12:39:31 +01:00
deltanedas 6a9259db2e
nuke biochem research discipline (#24871)
* make chem machine boards roundstart

* nuke biochem

* kill

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 24af66a544d9c0ef2330f7f5ff3e0a420a5655aa)
2024-02-08 12:34:15 +01:00
Nemanja e99fe9c116
remove compact power tech (#24558)
(cherry picked from commit ff207b2e0513700d52172ac151780ffd747dd23f)
2024-01-28 00:27:46 +01:00
Ed 145c2158ca
Star Wars 14: Shuttle weapon update (#23644)
* setup codebase

* make auto-fire, but its broken

* collider problem

* fix rate, add toggle port

* add laser

* power cages

* ginormous cells

* fix inhand

* add pirate cannon

* salvage gun

* functional Nuke cannon

* rewrite to standart grenade

* fix naming, add emp sprite

* grenade cartridge

* thruster fix

* nuke cannon

* audio + visual polish

* balance tweak

* tweaks

* laser balance tweak: new Electronic damage modifier set, reduce structural cannon damage

* resprite energy cages, start implementing in game

* fix cage recharger craft

* add small laser gun

* fix colliders

* add  lasers and ptk to research and crafting

* finish implementing weapon to rnd and sec

* some fixes

* splitted grenades and cannon balls

* integrate new cannon balls

* tweaks stick

* move circuits to sectechfab, fix

* fix?

* add ability to E shoot, without signals

* fix!

* fix?!?! and naming tweak

* go!

* Lank fix

* oh

* mornings don't start with coffee.

* the morning starts with bug fixes.

* fucking bugs!

* finally

* it is now possible to craft projectiles separately from cartridges

* +2 fix

* refactor

* piu

* More weight

* add AutoShootGunComponent

* move autoshoot to partial

* SetEnabled()

* some fixes

* remove CanShootWithoutUser field

* remove null-checks ToCoordinates from AttemptShoot()

* war without reason

* return to home

* ?

* forgot remove it

* review

* Fix formatting and update path

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit a2d5d74b46060d330e5aa14e166692f32dcce7a9)
2024-01-27 23:40:06 +01:00
Alzore fae6917f8e
Make crushers not craftable/researchable (#24319)
* nomorecrushersci

* nocomment

(cherry picked from commit 542aa11d8ea01d2b17c6d6cf46f2610161402b38)
2024-01-26 23:16:03 +01:00
Nemanja 703b4cb7cc
Quantum Spin Inverter (#23756)
(cherry picked from commit fdd18c9ae49cf98a766b5df484c67d9cf4f4418e)
2024-01-26 22:17:00 +01:00
Emisse 9d047a7e52
kill machine parts + migrate machine part spawners to salvage loot spawner (#23752)
* kill machine parts

* guidebook and artifact effect

* worst test ive ever seen in my life

* nuke test

(cherry picked from commit df1d8c36e5e8b0773123c744a4acca473fb135ea)
2024-01-26 22:14:43 +01:00
Nemanja 53c4793673
Turbo Recharger (#23723)
turbo charger

(cherry picked from commit c861b66a476a1ea1037ec173b088cafd5519f757)
2024-01-26 22:12:03 +01:00
Nemanja 77bd303603
Hellfire Thermomachines (#23543)
* hellfire thermomachines

* slight nerf? idk

* ilya review

* Improve clarity

* Update Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit a78e9a854ebb744ca82fcdbca4968f0197d05a84)
2024-01-26 22:07:36 +01:00
Ed acdef432dc
Teslaloose and Singuloose counterplay (#23444)
* add tesla dissapear mechanic
add field holobarrier

* add PD

* add crafting

* spacing

* added to cargo

* Fix

* resprite + damageable

* oopsie

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Locale/en-US/research/technologies.ftl

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 0f8c004a2f6cce3443f0e2e9bbbc3c8ac12d0eba)
2024-01-26 21:41:52 +01:00
Nemanja 96d1e4090f
Flatpacks and the Flatpacker 1001 (#23338)
* Flatpacker and flatpacks

* ok that's good enough

* convert solars/AME to flatpacks

* mats, mats, we are the mats

* basic mechanics are DONE

* thing

* final UI

* sloth

* rped jumpscare

* rename

(cherry picked from commit 1c11332fa4b77d556e7f3db17f391dbd2664cda5)
2024-01-26 21:27:25 +01:00
Ilya246 59f69e4d6c
biofabricator (#23319)
* initial implementation

* implement

* more mobs

* add tech

* buff abomination

* uncopypaste desc

* add sprite

* fix sprite

* remove biomass tag

* inden't

* less plasma for fish

(cherry picked from commit fc4ad82934b0b094c9125922258248b561b1b338)
2024-01-26 21:26:06 +01:00
Ilya246 64d260e005
minor science tree changes (#23269)
* it is done

* unbrokey rt again

(cherry picked from commit b9b88123d7a3e16a93f354b15cffde4009222397)
2024-01-23 22:50:23 +01:00
deltanedas 9df4c6302c
roundstart mop and stuff (#23203)
* roundstart mop and stuff

* dragonops

* move move

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit cf95dd39e2221326ebebf706eb27e75a1e19107c)
2024-01-22 21:09:07 +01:00
Nemanja 04f0a8811a
Hyper convection lathes and industrial ore processor (#23202)
* Hyper-convection lathes and industrial ore processor

* balance

* gold... why not?

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit c3f81bfe033a14922dc6e91de402c56d321f3370)
2024-01-22 21:00:37 +01:00
Ubaser 56877652f0
Science magboots (#23107)
* add

* uhhh

* fix RSI

* lathe

* fix

(cherry picked from commit 56884fd72df6ae88aca892e68dcd9829766864b7)
2024-01-22 20:59:01 +01:00
Nemanja 850e75a073
GORILLA Gauntlets (#23012)
* GORILLA gauntlets

* oh shit this too

(cherry picked from commit 9bd03824ac863cb4d87bfc984dcc163b84926649)
2024-01-22 18:47:45 +01:00
Stanislav4ix 27bebbcda9
Added disabler SMG! (#23051)
* Added disabler SMG!

* Changed a few errors

* errors.. again

* Update battery_guns.yml

* Update security.yml

* Update lathe.yml

* Update security.yml

(cherry picked from commit 28b825d898361b06fc3a942209c0b93d8c2eced0)
2024-01-22 18:46:27 +01:00
Debug 18f0af1f68
Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
Boaz1111 d86ac8804e Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo

* added depleted uranium to more ammo

* Last changes and additions

* Forgot something, theoretically resolved the merge conflict too

* Nerfed the DU munitions, renamed em to uranium because it's not really DU

* made the ammo more expensive, also fixing the crash at the same time

* Fixed the last error, theoretically at least

* Revert "Fixed the last error, theoretically at least"

This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.

* copyright changes, small sprite changes, last references of depleted uranium removed

* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"

This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.

* Update meta.json

* Update meta.json

* Update lathe.yml

* Update arsenal.yml
2023-12-22 23:22:09 +01:00
Stanislav4ix 795fd833c4 Added ore bag of holding (#22680)
* Added ore bag of holding

* Now its in industrial tecnologi

Yeah, I fixed it with Tunguso4ka

Co-Authored-By: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>

* Update ore_bag_holding.yml

Now the "magnet" has a larger radius of attraction

* Changed location

---------

Co-authored-by: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
2023-12-22 23:00:25 +01:00