]> git.smokeofanarchy.ru Git - space-station-14.git/log
space-station-14.git
8 months agoFix head markings under some helmets (#36074)
Pgriha [Sun, 20 Apr 2025 11:52:31 +0000 (14:52 +0300)]
Fix head markings under some helmets (#36074)

* 1

* 2

8 months agoDescriptions for .35 auto (#36085)
Nox [Sun, 20 Apr 2025 11:51:27 +0000 (04:51 -0700)]
Descriptions for .35 auto (#36085)

* Initial commit.

* added SMG descriptions

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Updated descriptions to incorporate Roomba's feedback.

* Slightly changed Viper description

* Minor formatting change

* Updated Atreides description

* Fixed a minor convention mistake in magazines

* Slightly changed the Viper's description to not reveal its manufacturer.

* Updated Drozd description.

* Rerun test

* Updated descriptions in accordance with Roomba's suggestions!

* Updated Viper description!

* Shit I forgot to remove the cartridge length, did it now!

* More smart changes by Roomba

* Tests gaslighting me

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Updated WT550 description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
8 months agoFix some SMG magazines fitting 35 rounds (#34782)
Nox [Sun, 20 Apr 2025 11:33:31 +0000 (04:33 -0700)]
Fix some SMG magazines fitting 35 rounds (#34782)

All SMG magazines are now 30 round, rather than half being 35 round.

8 months agoAutomatic changelog update
PJBot [Sun, 20 Apr 2025 09:33:09 +0000 (09:33 +0000)]
Automatic changelog update

8 months agoFix soup (#34633)
Helm [Sun, 20 Apr 2025 09:32:02 +0000 (15:32 +0600)]
Fix soup (#34633)

Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
8 months agoSmall ruin fixes (#36763)
Spessmann [Sun, 20 Apr 2025 08:54:01 +0000 (01:54 -0700)]
Small ruin fixes (#36763)

8 months agoAutomatic changelog update
PJBot [Sun, 20 Apr 2025 07:01:40 +0000 (07:01 +0000)]
Automatic changelog update

8 months agoPlurality pin addition (now not on master branch) (#36744)
Cass [Sun, 20 Apr 2025 07:00:33 +0000 (02:00 -0500)]
Plurality pin addition (now not on master branch) (#36744)

8 months agoAutomatic changelog update
PJBot [Sun, 20 Apr 2025 06:02:34 +0000 (06:02 +0000)]
Automatic changelog update

8 months agokill filing cabinet heisentests (#36757)
ArtisticRoomba [Sun, 20 Apr 2025 06:01:28 +0000 (23:01 -0700)]
kill filing cabinet heisentests (#36757)

8 months agoAutomatic changelog update
PJBot [Sun, 20 Apr 2025 05:59:48 +0000 (05:59 +0000)]
Automatic changelog update

8 months agoBugfix to sync emergency broadcast cooldowns on holopad UIs (#34115)
chromiumboy [Sun, 20 Apr 2025 05:58:41 +0000 (00:58 -0500)]
Bugfix to sync emergency broadcast cooldowns on holopad UIs (#34115)

* Initial commit

* Bug fix

* Included check for gaining power

* Addressed reviews

8 months agoAutomatic changelog update
PJBot [Sun, 20 Apr 2025 05:58:08 +0000 (05:58 +0000)]
Automatic changelog update

8 months agoAquatic tail and back fin markings for lizards (#33219)
Alzore [Sun, 20 Apr 2025 05:57:01 +0000 (00:57 -0500)]
Aquatic tail and back fin markings for lizards (#33219)

* shark tail and back fin for lizards

* credit me

8 months agoloop lairlock lattice fix (#36758)
TytosB [Sun, 20 Apr 2025 05:51:13 +0000 (00:51 -0500)]
loop lairlock lattice fix (#36758)

* sinful

* funeralofdeadbutterflies

* butterfly

* lattice fix

8 months agoNew salv ruin- butterfly funeral (#36755)
TytosB [Sun, 20 Apr 2025 05:22:04 +0000 (00:22 -0500)]
New salv ruin- butterfly funeral (#36755)

8 months agoSalvage ruins- the deadly sins (#36754)
TytosB [Sun, 20 Apr 2025 04:32:19 +0000 (23:32 -0500)]
Salvage ruins- the deadly sins (#36754)

8 months agoAdd More Ruins (#36752)
Spessmann [Sun, 20 Apr 2025 04:27:20 +0000 (21:27 -0700)]
Add More Ruins  (#36752)

8 months agoConvert `NameIdentifier` to use `NameModifierSystem` (#36736)
Tayrtahn [Sun, 20 Apr 2025 04:16:59 +0000 (00:16 -0400)]
Convert `NameIdentifier` to use `NameModifierSystem` (#36736)

Convert NameIdentifier to use NameModifierSystem

8 months agoreplace obsolete IsGrid calls with HasComp<MapGridComponent> (#36729)
Kyle Tyo [Sun, 20 Apr 2025 04:14:58 +0000 (00:14 -0400)]
replace obsolete IsGrid calls with HasComp<MapGridComponent> (#36729)

* replace obsolete IsGrid calls with HasComp<MapGridComponent>

* remove IMapManager dependency

* well would you look at that

* just look at it

8 months agoTerrarium ruin (#36739)
Emisse [Sun, 20 Apr 2025 03:03:34 +0000 (21:03 -0600)]
Terrarium ruin (#36739)

8 months agoAutomatic changelog update
PJBot [Sun, 20 Apr 2025 02:42:30 +0000 (02:42 +0000)]
Automatic changelog update

8 months agoFix spray nozzle not cleaning reagents properly (#35950)
ArtisticRoomba [Sun, 20 Apr 2025 02:41:24 +0000 (19:41 -0700)]
Fix spray nozzle not cleaning reagents properly (#35950)

* init, god help us all

* further refining

* final round of bugfixes

* whoopsies

* To file scoped namespace

* first review

* oopsie

* oopsie woopsie

* pie is on my face

* persistence

* datafieldn't

* make PreviousTileRef nullable

* change component to file scoped namespace

* Minor tweaks:

- We clamp the reaction amount to a minimum value because when working with percentages and dividing, we approach numbers like 0.01 and never actually properly delete the entity (because we check for zero). This allows us to react with a minimum amount and cleans things up nicely.
- Minor clarification to comments.
- Rebalancing of the spray nozzle projectile.

* the scug lies!!!!

* undo file scoped namespace in system

* kid named warning

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
8 months agoAdd one word to the dragon summon announcement (#36749)
shibe [Sun, 20 Apr 2025 02:26:10 +0000 (22:26 -0400)]
Add one word to the dragon summon announcement (#36749)

terror!!!!

8 months agoFix artifact spawns parenting to players (#36745)
Nemanja [Sun, 20 Apr 2025 01:00:49 +0000 (21:00 -0400)]
Fix artifact spawns parenting to players (#36745)

8 months agoFix ore silo clients showing up when out of range (#36741)
Nemanja [Sun, 20 Apr 2025 01:00:23 +0000 (21:00 -0400)]
Fix ore silo clients showing up when out of range (#36741)

8 months agoUpdate Credits (#36748)
github-actions[bot] [Sun, 20 Apr 2025 00:41:15 +0000 (20:41 -0400)]
Update Credits (#36748)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
8 months agoAutomatic changelog update
PJBot [Sun, 20 Apr 2025 00:18:47 +0000 (00:18 +0000)]
Automatic changelog update

8 months agoScarf Resprite (#35446)
SeamLesss [Sun, 20 Apr 2025 00:17:38 +0000 (17:17 -0700)]
Scarf Resprite (#35446)

* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* all of em

* better scarfs

8 months agofixgridatmos
TytosB [Sat, 19 Apr 2025 21:19:08 +0000 (16:19 -0500)]
fixgridatmos

8 months agoSmuggler follow up (#36456)
Velcroboy [Sat, 19 Apr 2025 21:07:49 +0000 (16:07 -0500)]
Smuggler follow up (#36456)

* Fix Overfilling satchels

* Add notes

* Clearer

* remove line :/

* Reduce by 1 cigars/booze

* fix typo

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
8 months agoterrarium
TytosB [Sat, 19 Apr 2025 20:42:59 +0000 (15:42 -0500)]
terrarium

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 20:35:01 +0000 (20:35 +0000)]
Automatic changelog update

8 months agoGive salvage borgs a tool module. (#33336)
ScarKy0 [Sat, 19 Apr 2025 20:33:54 +0000 (22:33 +0200)]
Give salvage borgs a tool module. (#33336)

Init

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 20:33:24 +0000 (20:33 +0000)]
Automatic changelog update

8 months ago[#30096 Fix] Dumping a RefillableSolution into a DumpableSolution now requires `CanCo...
MilenVolf [Sat, 19 Apr 2025 20:32:17 +0000 (23:32 +0300)]
[#30096 Fix] Dumping a RefillableSolution into a DumpableSolution now requires `CanComplexInteract` (#33350)

* dumping containers now require having at least one hand

* Cleanup

* Better

* Apply suggested changes

* Cleanup

---------

Co-authored-by: Luiz Costa <luiz@mavromati.com>
8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 20:21:41 +0000 (20:21 +0000)]
Automatic changelog update

8 months agoBetter PowerCharge menu wrapping (retry) (#34036)
c4llv07e [Sat, 19 Apr 2025 20:20:32 +0000 (23:20 +0300)]
Better PowerCharge menu wrapping (retry) (#34036)

* fixed

* Move wattage to the power button

---------

Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
8 months agoPlasma ore silos and department eco (#36715)
Emisse [Sat, 19 Apr 2025 18:56:46 +0000 (12:56 -0600)]
Plasma ore silos and department eco (#36715)

8 months agoElkridge - Silo (#36716)
Emisse [Sat, 19 Apr 2025 18:56:21 +0000 (12:56 -0600)]
Elkridge - Silo (#36716)

8 months agoFland Silo (#36724)
Emisse [Sat, 19 Apr 2025 18:56:11 +0000 (12:56 -0600)]
Fland Silo (#36724)

8 months agoPacked Silo (#36722)
Emisse [Sat, 19 Apr 2025 18:31:39 +0000 (12:31 -0600)]
Packed Silo (#36722)

8 months agoOmega Silo (#36718)
Emisse [Sat, 19 Apr 2025 18:31:28 +0000 (12:31 -0600)]
Omega Silo (#36718)

8 months agoOasis Silo (#36720)
Emisse [Sat, 19 Apr 2025 18:31:12 +0000 (12:31 -0600)]
Oasis Silo (#36720)

8 months agoConvex Silo (#36734)
Emisse [Sat, 19 Apr 2025 18:21:39 +0000 (12:21 -0600)]
Convex Silo (#36734)

8 months agoLoop Silo (#36733)
Emisse [Sat, 19 Apr 2025 18:21:28 +0000 (12:21 -0600)]
Loop Silo (#36733)

8 months agoMarathon Silo (#36732)
Emisse [Sat, 19 Apr 2025 18:21:15 +0000 (12:21 -0600)]
Marathon Silo (#36732)

8 months agoBox Silo (#36723)
Emisse [Sat, 19 Apr 2025 18:21:01 +0000 (12:21 -0600)]
Box Silo (#36723)

8 months agoBagel Silo (#36721)
Emisse [Sat, 19 Apr 2025 18:19:05 +0000 (12:19 -0600)]
Bagel Silo (#36721)

8 months agoFix silo rotation (#36737)
ScarKy0 [Sat, 19 Apr 2025 18:00:31 +0000 (20:00 +0200)]
Fix silo rotation (#36737)

Update silo.yml

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 17:28:25 +0000 (19:28 +0200)]
init

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 17:18:22 +0000 (19:18 +0200)]
init

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 17:11:17 +0000 (19:11 +0200)]
init

8 months agocleanup RingerSystem (#36731)
slarticodefast [Sat, 19 Apr 2025 17:11:08 +0000 (19:11 +0200)]
cleanup RingerSystem (#36731)

cleanup ringersystem

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 17:08:30 +0000 (17:08 +0000)]
Automatic changelog update

8 months agofixing spessman getting teleported inside artifact (#36719)
Fildrance [Sat, 19 Apr 2025 17:07:23 +0000 (20:07 +0300)]
fixing spessman getting teleported inside artifact (#36719)

* fixing spessman getting teleported inside artifact

* refactor: move XAEPortal comp to server

* refactor: replace Spawn and coord logic with with TrySpawnNextTo

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
8 months agoMinor dependency and variable cleanup. (#36730)
Kyle Tyo [Sat, 19 Apr 2025 16:11:34 +0000 (12:11 -0400)]
Minor dependency and variable cleanup. (#36730)

removal of misc unused or extra dependency definitions.

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 15:32:44 +0000 (15:32 +0000)]
Automatic changelog update

8 months agoRebalance and reduce playtime requirements for most roles. (#36666)
Minemoder5000 [Sat, 19 Apr 2025 15:31:38 +0000 (09:31 -0600)]
Rebalance and reduce playtime requirements for most roles. (#36666)

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 14:42:41 +0000 (14:42 +0000)]
Automatic changelog update

8 months agoRemoved Interior Shuttle Walls (#34261)
Ps3Moira [Sat, 19 Apr 2025 14:41:35 +0000 (07:41 -0700)]
Removed Interior Shuttle Walls (#34261)

* Removed Interior Shuttle Walls

* Update migration.yml

* Update walls.yml

* Update girder.yml

* Fix Migration

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
8 months agoMake two inventories not dance around as much when opening/closing them (#35041)
pathetic meowmeow [Sat, 19 Apr 2025 14:40:49 +0000 (10:40 -0400)]
Make two inventories not dance around as much when opening/closing them (#35041)

* Make two inventories not dance around as much when opening/closing them

* Use .Any

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 14:38:51 +0000 (14:38 +0000)]
Automatic changelog update

8 months agoFix detailed examine mispredicts (#33814)
metalgearsloth [Sat, 19 Apr 2025 14:37:45 +0000 (00:37 +1000)]
Fix detailed examine mispredicts (#33814)

So:
- Shared examine like armour, adds the button incorrectly and mispredicts it.
- Server-only like damage, doesn't add it (correct) and no mispredict.

We'll just prune any verbs if the server sends them in unless the verb is client-only and it should fix it unless there's client-side code not flagging it as clientexclusive.

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 14:30:43 +0000 (14:30 +0000)]
Automatic changelog update

8 months agoRemoved collision from wall mounted lights and security cameras (#35908)
claustro305 [Sat, 19 Apr 2025 14:29:36 +0000 (02:29 +1200)]
Removed collision from wall mounted lights and security cameras (#35908)

* Removed collision from wall mounted lights and security cameras

* Updated because I'm dumb and didn't realise the collision groups were case sensitive

8 months agoCleanup: Superbonk cleanup (#35104)
Winkarst [Sat, 19 Apr 2025 14:26:56 +0000 (17:26 +0300)]
Cleanup: Superbonk cleanup (#35104)

* SuperBonk cleanup

* Update

* Comment changes

* Update

* Changes

* EnsureComp

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 14:26:15 +0000 (14:26 +0000)]
Automatic changelog update

8 months agoGave Bartender Pineapple Juice Cartons (#34769)
GrownSamoyedDog [Sat, 19 Apr 2025 14:25:09 +0000 (07:25 -0700)]
Gave Bartender Pineapple Juice Cartons (#34769)

pineapple juice core pina colada maxxed

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 14:13:01 +0000 (14:13 +0000)]
Automatic changelog update

8 months agoDetGadget hat fixes (#35658)
ArtisticRoomba [Sat, 19 Apr 2025 14:11:55 +0000 (07:11 -0700)]
DetGadget hat fixes (#35658)

* """Refactors""" extraction code, fixes bug with labeled items

* second line of fixes

* Enhance label handling and add label retrieval method (its more preformant I swear)

* Cleanup

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
8 months agoERT Janitor Weapon - Hydra (#34416)
Southbridge [Sat, 19 Apr 2025 14:03:05 +0000 (10:03 -0400)]
ERT Janitor Weapon - Hydra (#34416)

* checkpointing work

* Got this fully working and all sprites done

* Exchanged my sprites with the ones made by AugustSun

* Changed the name to Hydra Launcher, and adjusted it to function like a revolver instead.

* Modified the hydra to be a revolver

* fixed container issue

* Swapped in even newer sprites

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
8 months agoPredict and cleanup RingerComponent (#35907)
Milon [Sat, 19 Apr 2025 13:55:05 +0000 (15:55 +0200)]
Predict and cleanup RingerComponent (#35907)

* clean up most stuff

* move to shared

* works

* shuffle shit around

* oops! access

* fixes

* todo: everything

* SUFFERING

* curse you

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 13:44:12 +0000 (13:44 +0000)]
Automatic changelog update

8 months agoFix Long Produce Time After De-aging A Plant with cryoxadone. (#34668)
Benjamin Velliquette [Sat, 19 Apr 2025 13:43:05 +0000 (09:43 -0400)]
Fix Long Produce Time After De-aging A Plant with cryoxadone. (#34668)

Update LastProduce when deaging plant from cryoxadone

8 months agoFlippo Engraved Lighter is now in detective locker (#35165)
Zokkie [Sat, 19 Apr 2025 13:28:30 +0000 (15:28 +0200)]
Flippo Engraved Lighter is now in detective locker (#35165)

Makes the Flipp Engraved Lighter from the detective less obscure to find.

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 13:11:49 +0000 (13:11 +0000)]
Automatic changelog update

8 months agoReduces handheld security radios range for picking people's messages up. (#34878)
Boaz1111 [Sat, 19 Apr 2025 13:10:43 +0000 (15:10 +0200)]
Reduces handheld security radios range for picking people's messages up. (#34878)

weh

8 months agoFix a minor warning in BatterySystem.cs (#36726)
Kyle Tyo [Sat, 19 Apr 2025 12:37:10 +0000 (08:37 -0400)]
Fix a minor warning in BatterySystem.cs (#36726)

change timing from protected to private, rename, and adjust references.

8 months agoTry fix RestartTest (#36725)
Leon Friedrich [Sat, 19 Apr 2025 12:17:03 +0000 (22:17 +1000)]
Try fix RestartTest (#36725)

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 11:30:30 +0000 (13:30 +0200)]
init

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 11:21:07 +0000 (13:21 +0200)]
init

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 11:13:05 +0000 (13:13 +0200)]
init

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 10:48:50 +0000 (12:48 +0200)]
init

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 10:17:09 +0000 (12:17 +0200)]
init

8 months agoinit
ScarKy0 [Sat, 19 Apr 2025 10:07:50 +0000 (12:07 +0200)]
init

8 months agoadded silo, moved service request console
Deerstop [Sat, 19 Apr 2025 08:54:29 +0000 (18:54 +1000)]
added silo, moved service request console

8 months agoOre silos and department eco
jbox1 [Sat, 19 Apr 2025 08:51:53 +0000 (18:51 +1000)]
Ore silos and department eco

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 08:50:09 +0000 (08:50 +0000)]
Automatic changelog update

8 months agoFix charges (#36714)
metalgearsloth [Sat, 19 Apr 2025 08:49:02 +0000 (18:49 +1000)]
Fix charges (#36714)

We have the absolute value so use that.

8 months agoPredicted multihanded component (#36712)
metalgearsloth [Sat, 19 Apr 2025 08:05:20 +0000 (18:05 +1000)]
Predicted multihanded component (#36712)

* Predicted multihanded component

* Refview

* reh

8 months agoUpdate submodule to 254.1.0 (#36711)
metalgearsloth [Sat, 19 Apr 2025 07:29:32 +0000 (17:29 +1000)]
Update submodule to 254.1.0 (#36711)

* Update submodule to 254.1.0

* API update

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 06:52:19 +0000 (06:52 +0000)]
Automatic changelog update

8 months agoPredict virtual hands and co (#36617)
metalgearsloth [Sat, 19 Apr 2025 06:51:12 +0000 (16:51 +1000)]
Predict virtual hands and co (#36617)

These are the easy ones anything else gets slightly spicier.

8 months agoPredict dumping (#32394)
metalgearsloth [Sat, 19 Apr 2025 06:20:40 +0000 (16:20 +1000)]
Predict dumping (#32394)

* Predict dumping

- This got soaped really fucking hard.
- Dumping is predicted, this required disposals to be predicte.d
- Disposals required mailing (because it's tightly coupled), and a smidge of other content systems.
- I also had to fix a compnetworkgenerator issue at the same time so it wouldn't mispredict.

* Fix a bunch of stuff

* nasty merge

* Some reviews

* Some more reviews while I stash

* Fix merge

* Fix merge

* Half of review

* Review

* re(h)f

* lizards

* feexes

* feex

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 05:15:57 +0000 (05:15 +0000)]
Automatic changelog update

8 months agoAdd new color turtlenecks in WinterDrobe (#32920)
Ko4ergaPunk [Sat, 19 Apr 2025 05:14:50 +0000 (08:14 +0300)]
Add new color turtlenecks in WinterDrobe (#32920)

8 months agoAutomatic changelog update
PJBot [Sat, 19 Apr 2025 05:13:17 +0000 (05:13 +0000)]
Automatic changelog update

8 months agoNew Drinks (#36287)
SharkSnake98 [Sat, 19 Apr 2025 05:12:10 +0000 (01:12 -0400)]
New Drinks (#36287)

Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
8 months agoFix import (#36706)
metalgearsloth [Sat, 19 Apr 2025 02:31:21 +0000 (12:31 +1000)]
Fix import (#36706)