Commit Graph

65 Commits

Author SHA1 Message Date
Ed
a0a827ea5a Upstream sync (#846)
* Additional Ionstorm Law Updates (#34197)

* Added a couple entires, removed the references to IRL countries, and fixed a grammar mistake on "Telecomunications Equipment"

* Fixed another awkward grammar situation

* Commented out a bunch of law elements I felt weren't good for discussion, added some new ones to help fill in the missing areas

* Reverted pylons, and added more entries to help fill out the lists more

* reverted all deletions

* implemented feedback, also realized the IonStormActions section was rather short, so I added a bunch there

* realized I didn't remove the extra resources line, also added more things, and fixed one grammatical error

* Removed Portugal again, added more Musts since that list was the new shortest one.

* Automatic changelog update

* Add option to disable bwoink sound. (#33782)

* Add option to disable bwoink sound.

* Now it's working only with active admin status.

* No bwoink, only "notification sound"

* Moar changes

* Another one

* Automatic changelog update

* Pride Scarves  (#34448)

* More scarfs (#216)

* Sprites + Colored Scarf Implimentation

Doesn't include into quickthreads or other clothing vendors

* File Paths are important

* Metas, items exist, winterdrobe

I'm iffy on them being in the winterdrobe but the other option is quickthreads so idk

* File Path Fix

* Typo fix

* Resolved merge conflict

* Moved scarves around

* Moved scarf textures out of the _CD directory

* Removed final CD folder

* Removed extra scarfs

* Removed extra scarfs, again

* Replaced ClothingNeckBase with ClothingScarfBase

---------

Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com>

* Automatic changelog update

* Replace the djstation intercoms with freelance intercoms (#34478)

* Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys

* removed a new line

* Update nix flake for .NET 9 (#34480)

* Automatic changelog update

* Holopad networking rework (#34112)

* Initial commit

* Finalizing main changes

* Addressed reviews

* Fixed a few issues

* Switched to using global overrides

* Removed unnecessary references

* Make GasMixture enumerable

I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works.

* Improve canister admin logs.

1. Now clearly says "opened"/"closed" when changing the release valve.
2. Clearly says whether the valve was opened while a canister was inserted or not.
3. When a tank is ejected, logs if the valve is open and the ejection started spilling into the environment.

Fixes #34488

* Optimize & clean up RadiationSystem (#34459)

* Optimize & clean up RadiationSystem

* comments

* Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update engine to v240.0.1 (#34497)

* Various Locale Typo Fixes (and spaces) (#34483)

Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that)

* Space lizard plushie can now be worn on your head (#33809)

* space weh can now be work on top of head

* space weh can now be worn on top of head

* trim out unnecessary comps

* Automatic changelog update

* Adds bullet collision to wall mounted cameras (#34500)

* Automatic changelog update

* Change MaskComponent to accommodate sprites namings (#33451)

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>

* Automatic changelog update

* Add a 10u vial of plasma to the chemical locker (#33871)

Add 10u plasma to the chemistry locker so the chemists stop stealing tables.

* Automatic changelog update

* Rarer Highcaps (#34469)

* Removed highcap from seclite

* Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to.

* Gave cyborgs back their medcap

* Rounded seclite wattage down to 0.5

* Automatic changelog update

* New dry fire sound (#34447)

* new empty.ogg

* source to tg commit

* Automatic changelog update

* CentComm Map Updates (#34475)

* Bandage fix denied animations playing on devices without them

* CentComm blast door prototype

* CentComm button

* CentComm window shutters

* CC Updates

* Save as grid

* Remove an extra detective figurine

I like them better in the interrogation room

* Remove paramed locker, let pumps shut off

* Fix wrong HOP locker prototype

* Automatic changelog update

* Cog power setup fix (#34188)

* many changes

* contentingregrationtests

* serialized invalid removed

* blank

* "Changes and fixes as suggested"

* blank

* blank

* added desk bells

* engi rework rework rework

* added gate to content integration

* tweaks

* aaa

* bbb

* added holopads

* ccc

* Update default.yml

* hotfix

* aaa

* bbb

* many many tweaks and fixes

* aaa

* decals and maints

* aaa

* bbb

* ccc

* cog power setup was bad

* made it artsy

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* Add Airlocks with Bar and Kitchen access (#33821)

* Add kitchen access to Bar-Cafeteria airlocks on Cog

* Fix merge conflict

* Remove mapping changes

* Add Glass and Maints versions

* Fixed minor spelling mistake in Noir Trenchcoat description. (#34519)

Update coats.yml

* Update Credits (#34507)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* Make storage implant drop items on gibbing (#33493)

* Make storage implant drop items on gib/removal

* Better way

* Fix error

* Forgotten trash

* Cleanup

* Unused var

* Update Content.Server/Implants/ImplantedSystem.cs

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: 0x6273 <0x40@keemail.me>

* Automatic changelog update

* Fix `emergency_elkridge` being saved as a map (#34496)

Save `emergency_elkridge` as a grid

* Update engine to v240.1.0 (#34524)

* Fixes some mobs not being able to honk/weh (#33777)

* fixes some mobs not being able to honk/weh

* addresss review

* Automatic changelog update

* Welding gas mask toggleable with action (#32691)

welding mask removable

* Automatic changelog update

* Update engine to v240.1.1 (#34527)

* Automatic changelog update

* Plasma Dirt Fix (#34534)

did the dirt thing

* Plasma station population tweak (#34549)

* Plasma Station initial commit

* Map fixes 1

Expanded science's SMES array
Added advanced SMES
Redone stamped documents with custom stamps
Expanded atmospherics with more storage tanks
Added status displays
Add missing beacons to solars
Replaced the passive gates in science with valves
Removed protolathe in engineering
Added guitar to CE office
Replaced throngler plushie with weh cloak
Add a lattice tile outside the atmos burn chamber and storange tanks
Added atmos network monitor in bridge

* Add cargo and emergency shuttle

* Updated maps

* Add plasma to map testing list

* Map fixes 2

Reworked pipenets to not go under walls
Redid salvage and disposals
Reworked the bar to include a new bar extension facing the pool
Replaced arrivals cryo with an arcade
Replaced the toilets in the service plaza with cryo
Removed the cryo in dorms
Added more details to hallways
Redid tools room to include a front desk for the janitor closet
Reconnected sci to power roundstart
Removed some unideal spawns
Expanded the TEG airlock to be 2x3 instead of 1x3
Reduced the size of the SMES bank from 10 to 6
Disabled the plasma miners (downstreams or admins can re-enable them)
Replaced illegal maint items

* Fixes a 6 pack destroying the universe

Ok maybe cracking a cold one with the boys wasn't a great idea.

* Map fixes 3

* Quick research assistant fix

* Map fixes 4

* Map fixes 5

* webedit go brrrt

* Map fixes 6

* Map fixes 7

* Map fixes 8

* Fixes non-existent object

It's amazing this game runs at all

* Map fixes 9

* update pools

* Map fixes 10

* forgot to clear my multitool

I love mapping I love mapping I love mapping I love mapping I love mapping

* Tweaked player counts

* Update population caps

Removed population cap of 60 players to make plasma into a highpop map - it's that easy!

---------

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* Automatic changelog update

* Job contraband rework (#33385)

* contraband system rework to allow restriction by job, not just department

* Fixing detective trenchcoat inheritance

* removing unnecessary using declarations

* trying to fix testing error by re-adding diagnostics using declaration

* removing unecessary dependency, making allowedJobs nullable

* Adding all of slarti's requested changes except for the hacky job icon method fix

* removing accidental whitespace

* choosing to use the non-localized version because we're comparing the string against the AllowedJobs field, and the contraband classes that fill that field are written in english

* removing unneeded using dec, fixing nesting logic problem

* didn't remove the old nesting, doing that now

* using localized job title and localizing the allowed jobs string, removing usages of JobTitle field. Also networked the _jobTitle field instead.

* rewrite some stuff

* fixes

* fix energy pen

---------

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

* Automatic changelog update

* Electrified doors/windoors now spark, new tips to deal with doors without access or when electrified (#34502)

* new tips to open doors (throwing PDA/ID, dragging body)

* electrified door sprite for players

* tooltip to reset AI electrified doors

* windoor electrified sprite

* highsec electrified visual

* increase tip dataset to 138

* corrected square bracket convention in this commit

* removed door corpse tip from prior commit

* Automatic changelog update

* Blueprint double emergency tank (#34232)

* blueprint

* NitrogenTank

* description

* Automatic changelog update

* Add system to kick people if they connect to multiple servers at once. (#34563)

* Automatic changelog update

* bagel update (#34572)

* bagel update

* Decal fault tolerance

* Also fix writes

* fix mv cable, decal issues, yar

* fix a floor tile and some other shit

---------

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

* remove tropico from devmap (#34585)

* Update wizden config to disallow multiple connections to multiple wizden servers (#34584)

* Give the chef access to cloth boxes (#34403)

* Give the chef access to fiber bags

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

---------

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

* Automatic changelog update

* lecter visual update (#34589)

* Automatic changelog update

* Box Station - Update (#34605)

* Various changes

* Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well

* Added reporter to prototype, and fixed dirt

* Resolved outstanding issues

* Fixed a floating camera

* pluralize the job name in the contra description (#34559)

* pluralize the job name in the contra description

* pluralization specific to contraband descriptions

* Automatic changelog update

* Feature/make radial menu great again (#32653)

* it works! kinda

* so it works now

* minor cleanup

* central button now is useful too

* more cleanup

* minor cleanup

* more cleanup

* refactor: migrated code from toolbox (as it was rejected as too specific)

* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame

* refactor: major reworks!

* renamed DrawBagleSector to DrawAnnulusSector

* Remove strange indexing

* Regularize math

* refactor: re-orienting segment elements to be Y-mirrored

* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button

* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.

* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters

* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly

* fix: enabled any functional keys pressed when pushing radial menu buttons

* fix: radial menu sector now scales with UIScale

* fix: accept only one event when clicking on radial menu ContextualButton

* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>

* Automatic changelog update

* Return Drozd full-auto and semi-auto firing modes (#34604)

return drozd full auto and firerate, arrange available modes in alphabetical order

* Automatic changelog update

* added missing allowed department to the restricted severity (#34558)

* added missing allow job to the base restricted severity

* no need to make a list

* no more linq in ContrabandTest

* less nesting in ContrabandTest

* Automatic changelog update

* C4 Helmet (#34076)

* worn bomb

* Update meta.json

* Update meta.json

* Automatic changelog update

* Make radioactive material radioactive (#34436)

* Make radioactive material radioactive

* Increase the slopes of item uranium

No free power for engineering

* Glowing uranium

* Revert "Increase the slopes of item uranium"

This reverts commit 2acbda26

* Nerf Wall Rocks

* Automatic changelog update

* Small fixes for Meta station (#34613)

* Fixed a few minor things, removed salvage's shuttle parts (sorry), added more equipment to armory.

* Added back salvage shuttle equipment, now in a crate

* Fix

* replace all instances of "department-{id}" with department.name (#34607)

replace all instances of "department-{id}" with department.name"

* Renaming sexy mime and clown mask (#34258)

* Renamed sexy clown and mime mask and removed lusty xenomorph poster.

* removing odd file changes. not sure why these were edited at all.

* gaaaahhh

* removed some of the old templates

* Renaming sexy mime and clown instances.

* removed unwanted gitignore edit

* Renaming sexy clown and sexy mime mask and
Removing lusty exomorph poster.

* Remove lusty xenomorph poster.

* reverted changes to maps files, actually. Other contrib is learning, appologies for excessive commits

* requested changes

* lusty migration removal

* dirty hanging whitespace

* correct date format comment

---------

Co-authored-by: NathanielJ14 <nathanielalbert1202@gmail.com>

* Automatic changelog update

* Moved Cyborg Recharging Circuit Board from Lathe to Circuit Imprinter (#34612)

Moved Cyborg Recharging Cirbuit Board from Lathe to Circuit Imprinter

* Automatic changelog update

* Replace starter borg brain with Positronic (#34614)

THE FLESH IS WEAK

* Automatic changelog update

* Elkridge Depot fixes and changes (#34539)

* fixed grav gen room, gave atmos room to branch off, replaced AME controller crate with AME controller

* added rust to maints, expanded atmos, expanded bar, expanded cap bedroom, fixed some tiles under doors, removed some gamer loot

* removed interrogator lamp and some more gamer loot

* fixed some more tiles under doors, replaced intercomall with intercomcommand in bridge and vault

* added clothing drobes to arrivals, added bin to HoP, more stuff i forgot

* i forgot to move the file from /bin to /resources...

* delete radstorm locale (#34630)

* display the current version in the changelog window (#34556)

* just works first try

* introduce more magic numbers into the codebase

* idiot doesnt know the difference between AND/OR

* Update Credits (#34644)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* New solar sprites, new solar panel upgrades, and some solar panel fixes. (#29224)

* New solar sprites, new solar panel upgrades, and some solar panel fixes.

This adds and changes a few things for solar panels!

* New sprites for all solar panels and all related states.
* Move from xform.WorldRotation to _xformSystem.SetWorldRotation within
  the solar code.
* Few random fixes that Rider suggested as warnings.
* Solar Tracker Electronics was using what looks like to be the airlock
  controller electronics, so that's now updated to something a bit more
  realistic. It also uses the engineering circuit sprite instead of the
  generic
* New Solar Panels! Adds Plasma and Uranium Glass solar panels. These
  can be constructed by adding the respective glass to the panel. Plasma
  is a slight increase of power and health, and uranium is double the
  power and health of glass. Thus giving engineers something to update
  if they want to use solar panels and possibly giving small outposts
  a way to make a bit more power without a large and complex power
  setup.

* Add in solar sprites that were not in the meta file.

* Updated sprites based on feedback.

* Fix the rotation of the solar panel sprites.

* Automatic changelog update

* Added Unused HoS's Flask to HoS locker (#34658)

added hos flask to locker spawn

* Automatic changelog update

* Fland Fix (#34670)

Update fland.yml

* Reroute Meta station power, engineering cosmetic changes, minor fixes  (#34669)

* reroute meta power plus cosmetic fixes

* fix a lot of other things

* make changes from conflict

* Amber Station Changes (#34656)

* various changes

* Increased player limit

* slight modification

* Followed proper yaml formatting, increased lawyers

* Box Station Changes (#34655)

* Various changes

* Implemented a bunch of changes Emisse wanted, finished up all my atmos changes I wanted to make as well

* Added reporter to prototype, and fixed dirt

* Resolved outstanding issues

* Fixed a floating camera

* Added cameras to TEG, and some minor changes

* Fix mv cable crate typo (#34673)

fix mv cable crate typo

* Plasma station patch 1 (#34602)

* Plasma Station initial commit

* Map fixes 1

Expanded science's SMES array
Added advanced SMES
Redone stamped documents with custom stamps
Expanded atmospherics with more storage tanks
Added status displays
Add missing beacons to solars
Replaced the passive gates in science with valves
Removed protolathe in engineering
Added guitar to CE office
Replaced throngler plushie with weh cloak
Add a lattice tile outside the atmos burn chamber and storange tanks
Added atmos network monitor in bridge

* Add cargo and emergency shuttle

* Updated maps

* Add plasma to map testing list

* Map fixes 2

Reworked pipenets to not go under walls
Redid salvage and disposals
Reworked the bar to include a new bar extension facing the pool
Replaced arrivals cryo with an arcade
Replaced the toilets in the service plaza with cryo
Removed the cryo in dorms
Added more details to hallways
Redid tools room to include a front desk for the janitor closet
Reconnected sci to power roundstart
Removed some unideal spawns
Expanded the TEG airlock to be 2x3 instead of 1x3
Reduced the size of the SMES bank from 10 to 6
Disabled the plasma miners (downstreams or admins can re-enable them)
Replaced illegal maint items

* Fixes a 6 pack destroying the universe

Ok maybe cracking a cold one with the boys wasn't a great idea.

* Map fixes 3

* Quick research assistant fix

* Map fixes 4

* Map fixes 5

* webedit go brrrt

* Map fixes 6

* Map fixes 7

* Map fixes 8

* Fixes non-existent object

It's amazing this game runs at all

* Map fixes 9

* update pools

* Map fixes 10

* forgot to clear my multitool

I love mapping I love mapping I love mapping I love mapping I love mapping

* Tweaked player counts

* Update population caps

Removed population cap of 60 players to make plasma into a highpop map - it's that easy!

* Map fixes 11

* Map fixes 12

* Map fixes 13

* Map fixes 14

Now it's personal

* Map fixes 15

---------

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* Automatic changelog update

* add a chem dispenser to the nukie planet (#34674)

* add a chem dispenser to the nukie planet

* begone test fail

* Adds better description to pneumatic valve and build menu description (#32655)

* adds description to pneumatic valve and build menu description

* Change one atmosphere to kPa

* Automatic changelog update

* fixrotations - Modified Targetted Entities (#34638)

* Fix match box (#34632)

FixMatchBox

Now you can't put anything but matches in a box of matches.

Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>

* Automatic changelog update

* Hi-viz vest now actually hi-viz (#34087)

* 27-12-2024-light-hi-viz

* 28-12-2024-meta-fix

* Storage UI V2 (#33045)

* Automatic changelog update

* Added Pain Numbness Trait (#34538)

* added pain-numbness component and system

* added numb as a trait that pulls the pain numbness component

* removed new event as mob threshold event as already being fired

* checked for MobThresholdsComponent first before running VerifyThresholds

* refacted force say to using LocalizedDatasetPrototype and added numb messages

* added severity check alert

* added comment for BeforeForceSayEvent

* removed space formatting

* changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb

* changed prefix damage-force-say-numb to 5 (whoops)

* Automatic changelog update

* Update submodule to 241.0.0 (#34678)

* Add puddle drawdepth (#32369)

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

* Automatic changelog update

* Revert "Fix match box" (#34681)

Revert "Fix match box (#34632)"

This reverts commit 88456a4a8c.

* update .editorconfig (#34677)

* Make crew monitor update blips at consistent rates (#32555)

* Added the ability for pAIs and station maps to be stored in engineering belts (#33048)

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>

* Automatic changelog update

* Engineering guidebook megaupdate v2 (#33062)

Significantly updates the Engineering guidebook (more explicitly the Atmos section) to have a lot more relevant and useful information.

Right now engineering has been getting update after update with no real change to the relevant guidebook entry. This has lead to a lot of out of date information and bad practices being prevalent in the guidebook, something that pains me to read.

* Automatic changelog update

* Omega: fix cryo pipe (#34663)

fixed the freezer pipe in cryo room

* Add more escape pods on Packed (#34628)

* add escape pods north and south of station

* move south escape pod a bit to the east

* Storage sidebar fix (#34680)

* Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626)

* Automatic changelog update

* Amber Station Stuff (#34686)

* Removed salv upper docking airlock, gave south west solars some uranium glass.

* Routed HV wire through maints more, gave disposal blast doors a lever, added beacons and signs to escape pods

* Fake mindshield componentry and Implanter (#34079)

* Fake Mindshield (With some bad sprites)

- Add FakeMindshield System and Component

- Add FakeMindsheildImplantSystem and Component

- modify ShowMindShieldIconsSystem to check for FakeMindshields

- add all supporting yaml for the Implants, action and uplink

- add loc file stuff

- add unfinished sprites

* Cleanup, add to thief toolbox, remove metagame

- Move Implant sameness check to AFTER the implant DoAfter
to prevent instant identification of Deception Implants

- cleanup the systems and components

- add the fake mindshield to the Thief toolbox

* part 1 of fixing the folder problem

* Make the fakemindshield sprite folder lowercase

* CR - Move ImplantCheck into shared, cleanup

- Moved ImplantCheck and eventsubscription into Shared

- Remove Client/Server extensions of FakeMindshieldImplantSystem and
FakeMindShieldSystem and make shared Sealed

- make OnToggleMindshield Private, use the event!

* CR - Cleanup extra lines, fix some Prototype

- cleaned up extra liens in ImplanterSystem and
SharedFakeMindshieldSystem from when i was developing

- Uplink catalog no longer lists the implant in 2 spots,
only implants now, also uses the On state action icon

- added a comment about why it's reraising the action event
rather than directly interacting with the FakeMindshield Component

* Fake Mindshield CR:

- Added a comment about IsEnabled

- moved OnFakeMindShieldToggle to Entity<> from Uid, Comp

- fixed some formatting in uplink_catalog

* CR - Add a bit more comment

* Automatic changelog update

* reworking the chunked telecomms salv ruin (#34529)

* aaa

* bbb

* ccc

* ddd

* switched to grid

* pain

---------

Co-authored-by: TytosB <duanlaintytos@yahoo.com>

* loop update (#34688)

loop loot gone

* bagel update (#34690)

* bagel update

* fixe

* move tesla gen

* Fix airsensors not having a nitrogen threshold (#34689)

* Buff frezon to acceptable values, pending a frezon rework (#34049)

buff frezon

* Automatic changelog update

* Stun baton precise attack thrust animation (#34693)

use weaponarcthrust instead of wide swing on single attack

* Automatic changelog update

* Add disposal units to marathon chapelroid (#34709)

add disposal units to marathon chapelroid

* Oasis: add some emergency O2/N2 lockers (#34715)

Added O2, N2, and Fire lockers to Oasis station as per discussions in the issue thread

Co-authored-by: Orange-Winds <sebastian.pelka@hotmail.com>

* Removes radioactive suppermatter from Plasma Station (#34726)

Removes radioactive suppermatter

Literally 1984 can't have shit on SS14 e.t.c. e.t.c.

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>

* New salvage ruin: the ruined prison ship (#34651)

* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>

* Buff savlage vault-medium-1's loot (#34732)

* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

* aaa

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>

* drozd visual update (#34574)

* drozd visual update

* fix wielded sprotes

* update sprotes

* Automatic changelog update

* Nuke Timer MinimumTime (#34734)

* Implemented the thing

* Made requested changes

* Automatic changelog update

* Fix thrust animation rotation (#34713)

* Fix thrust animation rotation

* directly update sprite instead

* Automatic changelog update

* Fix vulture spawning additional salvage debris (#34593)

fix vulture spawning additional salvage debris

* Nukie briefing fix (#34737)

payloadpayloadpayloadpayloadpayloadpayload

* Sentient medibot now can inject (#32110)

medibot player injection

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

* Criminal Records Computer Better UX + Filtering (#32352)

* First pass at new Criminal Records Computer

need buttons to highlight.

* Filter status tabs/buttons now activate correctly via UpdateState

* Removed unneeded Directives

* Fix typo + undo VSCode changes

* Implement Emo Feedback

Loc NA and use inject deps
Cannot use inject deps on sprite system.

* try to undo vscode launch.json change

* Added requests + Filter dropdown list + jobs

Fixed maintainer fix requests,
Added Job to announcement channel output
Removed toggle buttons in-place of a dropdown list

* Fixed missed merge conflict

+ fixed an bug with filterstatus not showing on re-open ui

* Update criminal-records.ftl

Fixed lint error. whoops.

* Update Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs

typo

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* impliment chromiumboy feedback

hopefully this will do it....

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Added some more borg names (#32502)

added a handful of new names

* Automatic changelog update

* Update ScalingViewport for Engine PR (#28786)

* Update submodule to 242.0.0 (#34739)

* fix stop bleeding popup (#34729)

* fix stop bleeding popup

* add identity

* Fix RoleTimeRequirement localization (#34735)

* fix job restriction localization

* Update Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs

* Update Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs

---------

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

* reworking chem and adding psychology to loop (#34749)

* aaa

* little tweaks

* changed to grid and added to protos

* ccc

* we dont talk about it

* ddd

* aaa

* psychology real

---------

Co-authored-by: TytosB <dunalintytos@yahoo.com>

* Fix shuttle console angular velocity (#34748)

* Syndicate and CentComm Radio Implanters (#33533)

* Add Syndicate Radio Implant

* Fix description grammar

* remove unused var

* Update - Small fixes

* Un mess with imports

* Remove unused tag

* Correction

* Clear lists instead of remove

* Update 0 check

* Add Centcomm implant

* Correct centcom channel

* Correct params

* No more crying

* Update Content.Shared/Implants/Components/RadioImplantComponent.cs

* Update Content.Server/Implants/RadioImplantSystem.cs

* Update Content.Server/Implants/RadioImplantSystem.cs

---------

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

* Automatic changelog update

* New Highpop map: Convex recreational complex (#33346)

* start ig

* command work +AI

* finished bridge, added signs to departments

* engi partly done

* finish engi + atmos except for cams

* added med yippie

* carGODO

* nerd department finished

* se(x)c finish

* courtroom + service power

* man im tweaking out

* service propa done

* hallways

* added cams everywhere and named all the doors :pain:

* arrivals maints + exterior catwalk

* more maints

* voxob

* draft done

* holopadpilled + gaspipesensor based

* added convex name everywhere it needed to be

* nvm i guess we dont do oxford comma

* redid ALL THE HGOLOPADS FAAAAAAAAAAAAAAAAAAAAA

* Fix conflicts?

* ok let me try something

* this works right?

* atmos updated + jani lights

* uniform hallway tiles +roundstart TEG

* fixed some hidden atmos stuff

* Update map_attributions.txt

* :finnadie: no map review ...

* the fog is coming

* maints theater redone

* light dirt and the murder of most trims

* 💔

* decal based and tileoverlay pilled

* updated arrivals/library

* bungus

* yvgh

* 6 hours later...

* finished for real?

* Automatic changelog update

* Update cigarette.yml (#34756)

simple change to one of Dan's Smokes that fixes a typo.

* Seperate EMAG into EMAG and Authentication Disruptor (#34337)

* Automatic changelog update

* Astro Asteroid Sand (#34463)

* Added astro asteroid sand

* fixed the stack name

* adjusted tile sprites for asteroid and ice

* Adjusted meta.json

* Realized the other tile sprites all have solid lines on their perimeters

* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml

that works

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update tiles.yml

* Update Resources/Locale/en-US/tiles/tiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* adjusted the snow sprite

* Update meta.json

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Automatic changelog update

* The Goliath Hardsuit (#34721)

* Entities for hardsuit and helmet, graph and crafting recipe; modifies goliath hide drop rate

* Added hardsuit sprites, corrected some crafting YAML

* fixed crafting recipe, adjusted resource requirements

* Added durathread material req

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>

* Automatic changelog update

* make RefreshOverlay default to the player session (#32354)

* Loop station minor tweaks (#34758)

* small fixes

* eee

* Juice that makes you go boom (#34730)

* Juice that makes you go boom

* moved explosive juice to fun yml - fixed ExplosionReactionEffect.cs not having TileBreakScale parameter - made Drazil plushie major contraband (they are evil!!!!!)

* removed JASON!!!! JASOOON!!! JASON!!!

* don't do commits at 1am

* Update fun.yml

fix ident

* no more bullying the server (only 1 explosion)

* Automatic changelog update

* Adjust inventory size of ginormous scrap (#33454)

Adjusts the size of ginormous scrap to fit in bags of holding

* Automatic changelog update

* After getting banned, you now have to re-read the rules! (#33270)

* first commit

* opps

* Reset cooldown instead

* Added ccvar

* Not replicated!

* More robust Particle Accelerator menu (retry) (#34037)

Particle Acceleratir fixed

Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>

* Serializable emag flags (#34766)

* serializable idk

* guh

* Fix Double Muzzle Flash (#33981)

* Pass user to effects to properly fix double muzzle flash.

* Use gun when user is null.

* Update MuzzleFlashEvent.cs

* Update MuzzleFlashEvent.cs

* Update GunSystem.cs

* Update SharedGunSystem.cs

* Update MuzzleFlashEvent.cs

* Update SharedGunSystem.cs

* Update SharedGunSystem.cs

* Update Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

---------

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

* Automatic changelog update

* fix BankClientComponent never updating (#33123)

* fix

* oh right

* Add history tab to bounty console (#33932)

* Add struct for holding historical data on cargo bounties

* Add localisation strings for bounty history

* Add new XAML entry for display bounty history

* Expand cargo bounty menu to include tabs

* Ensure station databases hold historical bounty data

* Add to the bounty history when removing one from active

* Feed bounty history into cargo's bounty system

* Move tab title setting to constructor

* Remove redundant access specifications

* Remove un-needed override

* Fixup BountyHistoryEntry backing code

* Fix formatting in CargoBountyMenu

* Reformat BountyHistoryData

* Rework TryRemoveBounty to use new Entity type

* Add Enum for showing bounty results

* Rework look and feel of History tab

* Add visible text when no bounties have been completed yet

* Remove control

* Swap default to null

* Reverse ordering of bounties so last entry comes first

* Remove redundant Visible

* Move enum docs into the enum

* Automatic changelog update

* Minor shotgun changes and comments for future changes (#33512)

* kammerer ammo, firerate and comment

* bulldog description

* enforcer description and comment

* DB and sawn-off firerate parity, sawn-off comment

* description changes

* reduce kammerer firerate again

* Automatic changelog update

* Fixed: Ore now correctly drops the right amount of ore (#34557)

Fixed bug

* Automatic changelog update

* Implement mrp rule changes pursuant to community votes (#34772)

* #34771 Fix door system assuming all door layer states are in single RSIs (#34775)

* #34771 Fix door system assuming all door layer states are in single RSIs

* Delta confirmed monarch of sloggery

* Do a dirty, rotten web edit

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

---------

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

* HOTFIX update staging submodule to 242.0.1 (#34833)

* HOTFIX revert lecter visual update #34589 (#34826)

* Allowed windows to be properly clicked on (#34751)

* Fix hitting through directional windows (and more!) (#34793)

* Revert "Add taped logo back for 10th anniversary" (#34831)

* Hristov & .60 changes - Hristov Rework, Part 2 (#31662)

* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH

* revert engine

* Revert "Storage sidebar fix (#34680)"

This reverts commit 3e091c4dfa.

* Revert "Storage UI V2 (#33045)"

This reverts commit fd25dac720.

* Revert "Update ScalingViewport for Engine PR (#28786)"

This reverts commit 3ad83378bb.

* Update physical.yml

* Update CP14SharpeningSystem.cs

---------

Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: c4llv07e <igor@c4llv07e.xyz>
Co-authored-by: PursuitInAshes <91865152+PursuitInAshes@users.noreply.github.com>
Co-authored-by: TakoDragon <69509841+BackeTako@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: Mono <182929384+Monotheonist@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: Nox <nebulousnox38@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: War Pigeon <54217755+minus1over12@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Alfred Baumann <93665570+CheesePlated@users.noreply.github.com>
Co-authored-by: Tezzaide <ewankayne@hotmail.co.uk>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: compilatron <40789662+Compilatron144@users.noreply.github.com>
Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
Co-authored-by: John <35928781+sporkyz@users.noreply.github.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Fildrance <fildrance@gmail.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: JustinWinningham <justinmwinningham@gmail.com>
Co-authored-by: NathanielJ14 <nathanielalbert1202@gmail.com>
Co-authored-by: Velken <8467292+Velken@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com>
Co-authored-by: Coolsurf6 <coolsurf24@yahoo.com.au>
Co-authored-by: SlimSlam <73899110+SlimmSlamm@users.noreply.github.com>
Co-authored-by: Dinner <180707738+DinnerCalzone@users.noreply.github.com>
Co-authored-by: Helm4142 <158806576+Helm4142@users.noreply.github.com>
Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: August Sun <45527070+august-sun@users.noreply.github.com>
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Zachary Higgs <compgeek223@gmail.com>
Co-authored-by: TytosB <duanlaintytos@yahoo.com>
Co-authored-by: Orange-Winds <orange.wind@outlook.com>
Co-authored-by: Orange-Winds <sebastian.pelka@hotmail.com>
Co-authored-by: TytosB <dunalintytos@yahoo.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: godisdeadLOL <169250097+godisdeadLOL@users.noreply.github.com>
Co-authored-by: YourUsername <you@example.com>
Co-authored-by: James Simonson <jamessimo89@gmail.com>
Co-authored-by: darkdan <145926356+Starbuckss14@users.noreply.github.com>
Co-authored-by: Preston Smith <92108534+thetolbean@users.noreply.github.com>
Co-authored-by: DR-DOCTOR-EVIL-EVIL <hudsonirwin11@icloud.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: SpaceRox1244 <138547931+SpaceRox1244@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: pubbi <63283968+impubbi@users.noreply.github.com>
2025-02-06 13:57:14 +03:00
metalgearsloth
59b09383ca Capacitor Crafting Change (#31966) 2024-11-20 18:18:37 +11:00
TakoDragon
542817807d Red circuit floor (#32557)
* red circuit added

* index colour begone
2024-10-01 23:35:48 -06:00
TheWaffleJesus
1f22dfda7b changed from tag to material and added icon for capacitor 2024-09-08 09:34:08 +01:00
Nemanja
0a05ee9a27 add space carp and sharkminnow teeth (#31070) 2024-08-18 21:04:59 -06:00
Goldminermac
864956c66b Pancakes Fix (#31123)
* Edited blueberry pancake textures to seem more blueberry-stained

* Added new blueberry pancake sprites to allow stacking up to 9

* Added more sprites for chocolate pancakes so they can stack up to 9

* Fixed up the blueberry pancake sprites to be more consistent

* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.

* Updates the stack size in the consumable stacks yaml file.

* Added the new pancake sprites to the sprite meta json file.

* Removed an unnecessary space from the baked food YAML file

* Updated branch and fully resolved merge conflict

* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive

* Diversified the textures some more for good measure.

* Fixed some missing rims around the pancakes because I'm bored
2024-08-18 20:42:58 -06:00
Nemanja
a540b8840e Goliath mob (#30839)
* Goliath mob

* Update asteroid.yml

* mcfuck yourself

* add cloak

* fixes

* Update materials.yml
2024-08-18 12:22:36 -04:00
Ko4ergaPunk
27f3bea46d Cutter machine & steel mozaic item tiles (#30431)
* no texture machine

* done

* delete wip

* bug fixes

* oops

* CutterMachineCircuitboard
Glass: 500
2024-08-01 13:26:32 +03:00
lzk
e1e2d26969 Fix pancakes stacks (#30270)
Fix pancakes
2024-07-28 13:49:06 +10:00
Ed
1b0c434a9f Shiny Diamonds (#25750)
* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
2024-07-13 15:15:57 +03:00
lzk
325ab97a7d Prying reinforced tile now will give you back metal rod (#29084)
* Reinforced tile can we welded back into metal rod

* more changes

* weh

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-23 01:47:02 +10:00
Nemanja
729e67af7f Machine-code cleanup (#28489) 2024-06-05 16:23:23 -04:00
AJCM-git
09256cfaa5 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-01 13:49:28 -04:00
potato1234_x
cd90c05ce5 Rainbow Weed (#25759)
* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents
2024-04-28 21:06:27 -07:00
Ubaser
008935f6ec New plant mutation: Pyrotton (#27200)
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent
2024-04-28 13:07:36 +02:00
IProduceWidgets
89235b9e1b Add astro-jungle/mowed grass and astro-snow (#26381) 2024-03-24 18:14:04 -07:00
Mr. 27
3cb1c585c5 Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-14 15:27:08 +11:00
MACMAN2003
f0e8695a91 Clockwork structures and furniture (#24673)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml
2024-03-06 03:25:59 +03:00
Zadeon
133bd0353a Adds minable salt "ore" (#25324)
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
2024-02-26 16:34:15 -07:00
Ed
84cbcb93ca Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
2024-02-26 16:11:20 -07:00
Ps3Moira
83cd1089fe Add Large Wood Floors (#25462)
Large Wood Floors
2024-02-22 14:59:41 +03:00
Flareguy
a93466ac24 Shuttle floor resprite (#25127)
* resprites shuttle tiles

* resprites shuttle floor tiles & adds grey/black shuttle tiles

* attributions.yml update
2024-02-11 13:53:56 -07:00
Nemanja
86c1e36cd5 Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming
2024-01-06 13:52:40 +11:00
Velcroboy
27308915f1 Adds coal (#22559)
* Adds coal

* Fix stack splitting spawn

* Convert size

* Ahhh, it's a reagent tooo....

* ore.rsi

* Adjust recipes, add reagent extraction

* solution name

* Adjust reagents to prevent reactions

* Adjust reagents for standard of 10u

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-18 14:38:11 -05:00
Kara
8399d0a9eb Faux astro-tiles for science & mappers (#22586)
* Faux astro-tiles for science

* didnt mean to commit dode
2023-12-16 01:20:57 -07:00
Flareguy
ae1a1b9e07 adds lime tiles (#22235) 2023-12-08 12:49:07 -06:00
NULL882
f268e626a7 Mining things (#21909)
* mining-doors

* mining-tiles

* mining-window

* Change copyright in meta.json

* Change license in attributions.yml
2023-11-27 14:25:15 -07:00
cOrigin
1c497db665 Artifact fragments can now stack. (#21232)
* it stacks now

* Fixed typo

* fixes random sprite

* fix
2023-11-05 19:21:07 -07:00
Tunguso4ka
ee54022832 Ash Walker`s spear and uniform (#20292)
* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
2023-09-24 15:57:10 -04:00
Nemanja
f4503864d5 Concrete and asphalt tiles (#19642)
* concrete and asphalt

* los decals
2023-08-29 17:50:11 -05:00
PixelTK
f189b73fe5 Arachnid rework (#18631)
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
2023-08-13 01:38:05 -06:00
Arendian
b4c251472f Adds Advanced ointment and bruisepack recipes (#17583)
* Adds Advanced ointment and bruisepack recipes

* Changes the sprites to the ones from /tg

* Changed names and sprites, slight tweaks

* Formatting

* Solve Conflict

* Formatting

* Fix issues found in check

* Fix Oopsie
2023-07-09 20:22:10 -06:00
Nemanja
5c60a27c7c Make item size scale with stack size (#17623)
* Make stack count affect item size

* and the test, too

* readd this check

* vwoom

* huh

* if you ever read this commit message ping me on discord in #contributors

* changerinos
2023-06-25 10:44:37 -05:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
AsikKEsel
b67cb04f19 Added uranium glass and uranium window (#15869)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-06 14:47:19 +10:00
brainfood1183
2fba2b18ab Adds Bananium (#14663) 2023-04-29 15:38:09 +10:00
Whisper
0e43f90bb8 The bleed update (#14814)
* Removed arbitrary modifier scaling. The bleed amount is now 1-1 in units.

* Added some comments to explain the blood and bleed code

* added some comments

* added some comments

* profusely bleeding message scales with max bleed rate

* Added some comments

* Added some comments (tm)

* Halved the speed bleed rate heals.

* Changed the wording of a comment to make the function of the values more clear

* Changed bleed rate values, made heat heal more bleed rate

* doubled crit chance, since damage types were reduced

* Made iron restore more blood, 2->4u per 1u

* Starting to add the blood pack

* add bloodlevel to healingcomponent

* Created code support in the healing system for restoring blood

* first test of blood pack prototype

* More pack testing, and defining the yml stack

* yml syntax fix

* adds bloodpack tag

* Successfully added the item, but the effect and deletion after using the item is not working yet.

* the blood regen worksgit add -A!

* blood pack is entirely functioning

* Removed bleed rate healing from brute pack

* Comment correction

* I tried

* Removed bleed stats from corrupted corgi, they inherit same stats from basemob

* Removed bleed stats from xeno, they inherit same stats from a base mob

* Removed bleed stats from diona, they inherit same stats from a base mob

* Removed bleed stats from slimes, they inherit same stats from a base mob

* All mobs now heal bloodloss damage at a rate of 1 instead of 0.25 when healthy

* The cautery now closes bleed wounds

* Nerf blood pack bleed rate heal

* Added 2 blood packs to medicine locker

* Added 2 blood packs to wall medicine locker

* Minor YML fix to chemistry locker, no changes in game

* Added tag to medical belt for blood pack, added 2 blood packs to medical belt

* Added 1 gauze to medical belt

* 5 blood packs addded to nanomed plus

* nanomed inventory change

* 2 blood packs added to medical supplies crate from cargo

* Moved 1 gauze from med kit to advanced med kit

* Moved 1 tricord pill from advanced med kit to basic med kit

* added 2 ointment to burn kit

* Moved ina syringe from burn treatment to oxygen kit

* Removed one gauze from brute kit

* Added one bloodpack to brute med kit

* Moved tranex acid syringe from advanced first aid to brute kit

* Poison medipen moved from advanced first aid kit to toxin kit

* Removed health analyzer from advanced first aid kit

* removed one brute pack from advanced aid kit

* added one ointment to advanced aid kit

* Added one blood pack to advanced aid kit

* Added 2 blood packs to combat med kit

* Starting with adding the license for the tg sprite

* Adds the blood pack sprite and meta.json code

* I forgor to actually code the sprite in

* Advanced med kit missing one blood pack

* Replaced tricord pill with emergency medipen in cobat kit

* Removed emergency pen from combat kit, there's no space for it

* Revert "I tried"

This reverts commit 94c2e28df3200993d3f09b72ecabc838ea5ae5c0.

* Trying to fix yml test fail

* Try again

* attempt number 3

* Restock crate price was too low

* fixing merge conflict without making a HUGE mess this time

* ???

* again

* again

* Can I add the newline now maybe???

* Revert "Can I add the newline now maybe???"

This reverts commit 22d26706a65a24633f7da1dea6315012e2d3ac6f.

* Adds the doafter fix code from Keron to the blood level healing

* minor typo fix

* Feedback from Emisse and sloth; Removed chance based feedback on cauterizing

* comment fix
2023-04-02 23:59:51 -06:00
MisterMecky
a7571ac45b Add cardboard material (#14701)
* add cardboard material

* missing stack visualizers

* add crafting recipes

* cardboard crate

* license thing

* rename various things
2023-03-27 19:04:24 -04:00
Nemanja
faca40b8d5 more component ref removal + combining server/client comps (#13178)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-25 05:28:21 +01:00
Pieter-Jan Briers
10a99617b8 Remove usages of texture: .rsi/*.png and such. (#12896) 2022-12-06 13:11:37 +11:00
Paul Ritter
da1f0ce8b1 hotfix (#12530) 2022-11-10 09:58:17 +01:00
Nemanja
9428d4b341 stack cleanup and mild refactoring (#11717)
* stack cleanup

* fix tests and ulong

* somehow did half a commit

* ulong got usmall. (it's ints now)

* sussy baka cleanup

* mirror's review

* make da tests pass again

* shadowcommander review

* sloth por favor

* Update StoreSystem.Ui.cs
2022-11-08 20:24:23 -06:00
Mervill
4dc6355622 delete duplicate entities (#12454) 2022-11-08 14:52:20 -06:00
brainfood1183
062d3c656e New Tiles (2 maintenance specific and 1 new wood). (#12193)
* new maint specific tiles

* merge

* merge

* merge

* merge

* Update Resources/Textures/Tiles/attributions.yml

Co-authored-by: Moony <moony@hellomouse.net>
2022-10-25 13:27:06 -05:00
Jacob Tong
68a17b3794 Add shuttle airlock construction (#10944) 2022-08-31 02:28:40 -05:00
Rane
f36d278499 Biomass (#10313)
* Material

* good prototype

* Fix material storage

* You can insert biomass into the cloner

* ok, basic biomass subtraction works

* amogus

* ok chance works

* Alright, the biomass and genetic stuff works

* feedback for cloning

* more reclaimer polish

* ship it

* starting biomass + fix lathes

* I changed my mind on rat mass and these guys are definitely getting ground up

* Doafter

* clean up, sync the two

* fix naming, fix mass

* technology + construction

* additional logging, stop unanchoring when active

* fix event / logs

* dont gib dead salvage

* auto eject

* fix deconstruction behavior

* make warning message better, temporarily disable cancer scanner

* fix biomass stacks

* add easy mode CVAR

* stack cleanup, make biomass 2x as fast

* bugfix

* new sprite from hyenh

* fix tests

* hello? :smilethink:

* :smilethink:

* medical scanner gets antirotting

* fix cloner and medical scanner

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-08-29 21:31:27 -05:00
Visne
906edc592d Fix/improve smokeables (#10497) 2022-08-13 22:20:31 -07:00
Linus Wacker
47a642cf22 fixes aloe cream splitting (#8949) 2022-06-19 04:13:11 -07:00
Peptide90
8d9b56fce6 Goon floor pack 1 (#8267)
* floors boxing, arcadeblue2 and carpet clown

* adds gym, metaldiamond and carpetoffice from goon

* adds variants for boxing and gym

* tile variants updated
2022-06-02 12:10:58 +10:00
Chris V
94a0bc92b7 Salvage mining, ore processing, and material clean-up (#7406)
* adding stuff cuz new computer

* removed unused materials

* remove unused materials and such, lathe things

* material volume no longer hardcoded

* fixed mining system

* add 5 stacks of materials, and add them to the ore processor

* fix copyright for ores and handdrill

* comma momma

* whyyyyy

* more fixes to make the yaml linter happy

* i should get my eyes checked

* silver proper

* more cleanup

* leftovers

* remove more references to material doors

* couldn't bear to be without bearhide

* added uranium, added more lathe recipes

* copyright fix, stack fix

* ore processor sprite and such

* ore processing some binches

* MaterialCotton removal

* 1 uranium ore means 1 sheet

* fix merge conflict? idk

* time to ketchup

* lathe recognizes material volume again

* yaml cleanup

* forgot to remove adamantine lol

* re-added diamond for now

* diamond stacks

* functional ore processor

* added ignoreColor to lathe visuals

* ore processor machine board

* add board to industrial tech and circuit printer

* provided lathes their whitelists

* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance

* re-added ore processor

* typos and cleanup

* Update Content.Client/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* revert mapchange

* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn

* actually null canceltoken

* remove five-stacks, ore processor produces full stacks or single sheets/ingots

* VV proper

* adjust ore chances

* readd Cotton

* Update Content.Server/Mining/MineableSystem.cs

* tweaks

* Material is now dict (material, volume)

* removed unused property

* Space crystal -> space quartz

* forgor asteroid space quartz

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-04-28 20:41:04 +10:00