Commit Graph

9967 Commits

Author SHA1 Message Date
Hitlinemoss
83f15bfada Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo 2025-07-07 18:09:10 -04:00
slarticodefast
46ec3b402a New science unlock: the H.A.R.M.P.A.C.K (#38824) 2025-07-07 23:43:33 +02:00
Голубь
114ec579f5 JumpBoots Attempt №2 (#36862)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: unknown <wainzor1337@gmail.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-07 21:19:28 +02:00
Smugman
f1902ad0e2 Branded lighters addition (#35514)
* newlighters

* port complete

* donk pocket box addition

* should fix test fail, proper credit

* captalisation issue

* fixed

* typo corrected

* removed accidental change to combat bakery

* fixed lock message, made NT flippo start fueled.

* Requested changes

* fixed discount dan

* moved matchbox

* requested changes, discount dan more broken than ever (somehow)

* unbungle

* uhhhhh

* maybe fixes?

* changed inheritance

* fixed enum?

* nevermind

* finally fixed

* breaking changes

* inheritance unbungled
2025-07-07 14:53:17 -04:00
Winkarst-cpu
ae3b3b6173 Cleanup: Remove `TelephoneComponent.RequiresPower` (#38823)
* Cleanup

* Forgot about yml
2025-07-07 17:55:09 +02:00
slarticodefast
b1fb01fed5 Stable merge (#38822) 2025-07-07 14:39:12 +02:00
AsnDen
021551ede3 Golden pai (#38549)
* Golden pai

* Make golden PAI public and rare

* Golden PAI = legendary salvage
2025-07-07 01:07:52 -04:00
Andrew Malcolm O'Neill
c183458056 Reducing the amount of space in the gogo hat (#38808)
Reducing the amount of space in the hat from 7*4 to 4*3 to make a bit more sense with the fact it is only a hat.

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-07-07 01:50:11 +02:00
Hannah Giovanna Dawson
5f7db3b151 Scurret displacement map fixes (#38775) 2025-07-07 00:42:13 +02:00
Hannah Giovanna Dawson
f5fd2dcb76 Scurret naming fixes (#38776)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-07 00:30:44 +02:00
Vasilis The Pikachu
87b8f1c7df Revert "Readds the Hypereutactic Blade for traitors, adds Hypereutatic blade for Nukies (#37182)"
This reverts commit c03afeb29c.

Please check the maintainer meeting for details
2025-07-07 00:02:16 +02:00
Vasilis The Pikachu
b650d3298e Revert "HoP's beret (#38601)"
This reverts commit e9c90fe66d.

Please check the maintainer meeting for details
2025-07-07 00:01:55 +02:00
slarticodefast
22e3d533d3 Catchable items, playable basketball (#37702)
* catching

* fix

* improve

* fix linter

* cleanup

* fix prediction

* do the same here

* fix comment
2025-07-06 09:54:20 -07:00
slarticodefast
cb21b72600 merge staging into master (#38799) 2025-07-06 15:21:26 +02:00
lzk
81a4429189 fix centcom pda (#38796) 2025-07-06 15:20:57 +02:00
Hannah Giovanna Dawson
654a459351 Scurrets get emergency EVA suit access (#38778)
* Scurrets - spacing protection via adorable outfits

* ALPHABETIZATION!!
2025-07-06 15:08:56 +02:00
poklj
8f381157b3 Move moth movement modifiers to the Base (#38795) 2025-07-06 14:07:55 +02:00
Nemanja
ab201b6e82 Stasis bed cleanup and bugfixes. (#38762)
* Stasis bed sent to shed

* Code Review

* Code Review 2
2025-07-06 02:59:31 +02:00
Andrew Malcolm O'Neill
7aaccb5b98 Fixing incorrect headset being given to QM visitor (#38785) 2025-07-06 02:57:31 +02:00
slarticodefast
5ec8f86541 merge staging into master (#38779) 2025-07-05 22:34:16 +02:00
Hannah Giovanna Dawson
3540e2e44a Scurret PDA slot fix (#38777) 2025-07-05 22:15:54 +02:00
Perry Fraser
6cefc412a3 fix: spellbooks can have infinite charges (#38376)
* fix: spellbooks can have infinite charges

* refactor: indicate infinite spellbook charges with null

Not sure if I like this much better...
2025-07-04 23:28:56 -07:00
Mora
edbde7b7b9 Vox scars (#38592)
* Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl

* Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl"

This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15.

* locale key fix

* Changed top surgery scar names to be more generalized

* Adjusted face scars

* Formatting fixes

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-07-04 19:06:55 -04:00
Arthur Fiorese de Andrade
c3267c6db0 Fix Hristov description - remove inaccurate technical specs (#38746)
- Removes inaccurate 'armor piercing 14.5mm shells' reference
- Replaces it with a more funny description, matching the style of the other snipers and guns
- Keeps ammunition type '.60 anti-materiel ammo' specification
- Fixes issue #38590

Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br>
2025-07-04 22:41:49 +02:00
Velken
e82064916a [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664)
* fixed

* clean up

* orks fix smart

* review fix 1

* more requested changes

* less cursed

* more descriptive description

* better wording
2025-07-03 22:08:45 -07:00
Tiniest Shark
71d839fec4 Janitor Tool: Wire Brush (#38667)
* Wow! It's -brush-

* spacing.

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

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

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

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

* fixed changes

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-03 19:02:35 -07:00
SlamBamActionman
44617ae841 Exo - Minor balance changes and fixes (#38689) 2025-07-03 11:51:40 -07:00
Pieter-Jan Briers
e99fc501a6 Revert biome rework (#38724)
* Revert "Fix world generation (#38713)"

This reverts commit 10fa6ff4af.

* Revert "Biome rework (#37735)"

This reverts commit fe7b96147c.
2025-07-03 20:48:04 +02:00
ArtisticRoomba
f874459092 Pressure Relief Valve (#36708)
* initial system (this math is probably WRONG)

* General code cleanup and OnExamined support
(holy moly this code sucks)

* UICode and related events foundation
TODO:
- Actually write the XAML UI and the underlying system
- Un-shitcode the entire thing
- Actually test everything...

* Working UI code
TODO: Make predicted, as this certainly isn't predicted. Even though I said it was. It isn't.

* Remove one TODO for unshitcoding the examine code

* Add reminder
yea

* Make predicted (defenitely isn't)
(also defenitely isn't a copypaste from pressure pump code)

* It's predicted!
TODO:
- Give it snazzy predicted visuals!
- Have a different field for pressure entry, lest it gets bulldozed every UI update.

* Improve gas pressure relief valve UI
TODO: Reminder to reduce amount of dirties using deltafields

* Implement DirtyField prediction

* Entity<T> cleanup
A lot of Entity<T> conversions and lukewarm cleanup.

Also got caught copy pasting code in 4K UHD but it's not like you couldn't tell.

* More cleanup and comments

* Remove TODO comment on bulldozing window title

* """refactoring"""
- Move appearance out of shared and finally fix it. Pointless to predict appearance in this instance.
- More Entity<T> conversions because I like them.
- Move UI creation handling over entirely to the ActivatableUI system.
- Fix a hardcoded locale string (why????).

* Add visuals

* Revert debugging variable replacememt
yea

* Revert skissue

* Remove unused using directives and remove TODO

* Localize, cleanup, document

* Fix adminlogging discrepancy

* Add ability to construct, add guidebook entry

* Clear up comment

* Add guidebook tooltip to valve

* Convert GasPressureReliefValveBoundUserInterface declaration into primary constructor

* Adds more input handling and adds autofill on open

* Un-deepfry input validator shitcode
Genuinely what was I smoking

* improve visuals logic

* Refactor again
- Update math to the correct implementation
- Moved code that could be re-used in the future into a helper method under AtmosphereSystem.Gases.cs

* I'm sorry but I hate warnings

* Remove unused using directive in AtmosphereSystem.Gases.cs

* Review and cleanup

* Lukewarm UI glossup

* Maintainer for the upstream project btw

* Remove redundant state sets and messy logic

* Unduplicate valve updater code

* Redo UI (im sorry Slarti)

* run tests

* Test refactored UI messaging

* Second round of UI improvements
- God please find a way to improve this system. Feels bad.

* Update loop implementation

* Further predict UI

* Clear up SetToCurrentThreshold

* cleanup

* Update to master + pipe layers and bug fixes
want to run tests

* fixes

* Deploy rename pipebomb

* Documentation and requested changes

* Rename the method that wiggled away

* Undo rounding changes

* Fix comment

* Rename and cleanup

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-03 18:00:34 +02:00
Hannah Giovanna Dawson
1bc3d37d40 Scurrets - Audio Improvements (#38482)
* Scurret audio tuning

* Add new sfx

* Update sneezing sfx

* YAML support

* Rename a folder
2025-07-03 17:28:44 +02:00
metalgearsloth
fe7b96147c Biome rework (#37735)
* DungeonData rework

Back to fields, serializes better, just make new layers dumby.

* wawawewa

* Fix this

* Fixes

* Port the work over

* wawawewa

* zoom

* Kinda workin

* Adjust wawa

* Unloading work

* Ore + entitytable fixes

Iterate every dungeon not just last.

* Big shot

* wawawewa

* Fixes

* true

* Fixes

# Conflicts:
#	Content.Server/Procedural/DungeonJob/DungeonJob.cs

* wawawewa

* Fixes

* Fix

* Lot of work

* wawawewa

* Fixing

* eh?

* a

* Fix a heap of stuff

* Better ignored check

* Reserve tile changes

* biome

* changes

* wawawewa

* Fixes & snow

* Shadow fixes

* wawawewa

* smol

* Add layer API

* More work

* wawawewa

* Preloads and running again

* wawawewa

* Modified

* Replacements and command

* Runtime support

* werk

* Fix expeds + dungeon alltiles

* reh

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-07-03 00:36:06 -04:00
Alzore
aded799ae5 Reduce most salvage mob health, reduce most salvage weapon damage. (#38131) 2025-07-02 17:54:02 -07:00
slarticodefast
38232d2255 Predict healing and bloodstream (#38690)
* initial commit

* reapply 38126

* fix rootable

* someone missed an important minus sign here

* try this

* fix

* fix

* reenable crit hits

* cleanup

* fix status time dirtying

* fix

* camelCase
2025-07-02 19:20:31 -04:00
imatsoup
9a87d3fce2 Monochromacy typo fix (#38686)
* fixes the typo

* Fixed cloning looking for the trait, not the component, RE https://github.com/space-wizards/space-station-14/pull/38686#issuecomment-3025093504

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-07-01 20:49:15 +02:00
Nox
cd2ce56aef Added directional beacons (#38284)
* Added directional beacons

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed names

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2025-06-30 00:14:12 +02:00
BramvanZijp
7951db15ca Allow the Command & Super door remotes to use the access of their user. (Re-creation of PR due to changes to game balance) (#35536) 2025-06-29 18:21:14 +02:00
Hitlinemoss
ab7a64e3b3 Updated PDA description 2025-06-28 15:52:44 -04:00
Hitlinemoss
917b001cb4 removed cargo beret entirely 2025-06-28 15:41:28 -04:00
Hitlinemoss
cb9e2d9323 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo
Merged master into branch
2025-06-28 15:25:23 -04:00
Boaz1111
0f74bac415 Various Headphones Fixes and Tweaks (#38479)
* sprites, wearables

* neck

* icon-on sprite
2025-06-28 16:01:28 +02:00
96flo
e9c90fe66d HoP's beret (#38601)
* added HoP beret

* added beret to loadout

* added craft to machine

* added beret to hop ddresser

* Updated the authorship

* Change on request

* added 4-spaced

* Hot fix of dresser
2025-06-27 18:28:38 -04:00
Red
bb116e3219 Refactor SeeingRainbows to new status effect system (#38620) 2025-06-27 21:19:04 +03:00
Andrew Malcolm O'Neill
d70589b36f Thief Guidebook Refresh (#38586) 2025-06-26 19:03:23 -07:00
Tiniest Shark
a1cf490360 Toy/Plushie Inhands and Wearables (#38514) 2025-06-26 18:07:29 -07:00
Qerd
18d9a03ef6 Bladed flatcaps are minor contraband (#38597) 2025-06-26 15:57:46 -07:00
Hitlinemoss
787b3b3ffd Quartermaster's PDA has AstroNav preinstalled (#38445)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-26 15:09:36 -07:00
Red
283d0863a0 New Status Effects system: Relay events (#38579) 2025-06-26 23:05:58 +03:00
Hitlinemoss
69a426c630 Updated hat descriptions (#38156)
* Updated hat descriptions

* final touches

* typo fix

* final touchups

* Quote fixes
2025-06-25 22:27:27 +02:00
poklj
1c58b6efc7 Fixup Sericulture to be clonable (#38516)
* Add CloningEvent and an action entity prototype

* Remove redundant action prototype from Yaml

* Add a field that might be changed

* CR

* CR - guard statement and Dirty
2025-06-25 21:50:47 +02:00
rumaks
e3580f076a Added a ConfirmableAction component to ActionRevertPolymorph (#38570)
* Added a ConfirmableAction component to ActionRevertPolymorph

* Update Resources/Locale/en-US/actions/actions/polymorph.ftl

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-25 20:52:32 +03:00