]> git.smokeofanarchy.ru Git - space-station-14.git/log
space-station-14.git
2 years agosaltern 4.21 (#19908)
deltanedas [Fri, 8 Sep 2023 19:22:11 +0000 (20:22 +0100)]
saltern 4.21 (#19908)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agono more f toast (#19905)
potato1234_x [Fri, 8 Sep 2023 06:37:52 +0000 (16:37 +1000)]
no more f toast (#19905)

2 years agoAutomatic changelog update
PJBot [Fri, 8 Sep 2023 02:26:08 +0000 (22:26 -0400)]
Automatic changelog update

2 years agomove advanced laser gun into t3 lasers tech (#19875)
deltanedas [Fri, 8 Sep 2023 02:25:04 +0000 (03:25 +0100)]
move advanced laser gun into t3 lasers tech (#19875)

* move advanced laser gun into t2 lasers tech

* t3 and troll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoAutomatic changelog update
PJBot [Fri, 8 Sep 2023 02:17:23 +0000 (22:17 -0400)]
Automatic changelog update

2 years agoSwitch security techfab to produce magazines (#19769)
Kevin Zheng [Fri, 8 Sep 2023 02:16:19 +0000 (18:16 -0800)]
Switch security techfab to produce magazines (#19769)

* Switch security techfab to produce magazines

* Add back ammo boxes

2 years agoshow non-sheet material units in lathe (#19896)
deltanedas [Fri, 8 Sep 2023 02:11:10 +0000 (03:11 +0100)]
show non-sheet material units in lathe (#19896)

* locale for material units

* use material units in lathe ui

* give units to non-sheet materials

* :trollface:

* use volume properly

* :trollface:

* review

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoSyndie airlocks (#19264)
Doru991 [Thu, 7 Sep 2023 23:19:56 +0000 (02:19 +0300)]
Syndie airlocks (#19264)

* Add regular syndie access level

* Localize that

* Syndie airlock textures

* Yaml work

* guh

* Real

* Eated a word

* Just one more commit

* The game didn't complain about that one

* Make agent id have working agent access

* Change color scheme and palette

* Glass too because why not

* Nukie agent ID workaround

2 years agoAutomatic changelog update
PJBot [Thu, 7 Sep 2023 22:00:12 +0000 (18:00 -0400)]
Automatic changelog update

2 years agoScale radiation intensity with stack size (#19869)
deltanedas [Thu, 7 Sep 2023 21:59:08 +0000 (22:59 +0100)]
Scale radiation intensity with stack size (#19869)

2 years agoAdjust file namespace scope (#19824)
chromiumboy [Thu, 7 Sep 2023 18:49:55 +0000 (13:49 -0500)]
Adjust file namespace scope (#19824)

2 years agoIncrease hardhat light radius (#19867)
liltenhead [Thu, 7 Sep 2023 18:38:57 +0000 (11:38 -0700)]
Increase hardhat light radius (#19867)

2 years agoAutomatic changelog update
PJBot [Thu, 7 Sep 2023 16:50:08 +0000 (12:50 -0400)]
Automatic changelog update

2 years agoHypo can inject solutions back into beakers (#19877)
Vasilis [Thu, 7 Sep 2023 16:49:02 +0000 (18:49 +0200)]
Hypo can inject solutions back into beakers (#19877)

* Inject to beakers

* Stop fighting in my pr

* Review

2 years agoAdd pressure limit to gas tanks (#19879)
Errant [Thu, 7 Sep 2023 05:37:23 +0000 (07:37 +0200)]
Add pressure limit to gas tanks (#19879)

2 years agoUse full file path for temp replays (#19002)
Morb [Thu, 7 Sep 2023 03:56:33 +0000 (06:56 +0300)]
Use full file path for temp replays (#19002)

2 years agoAutomatic changelog update
PJBot [Thu, 7 Sep 2023 02:14:35 +0000 (22:14 -0400)]
Automatic changelog update

2 years agoFTL on a spaced tile yeets instead of gibs (#19883)
Varen [Thu, 7 Sep 2023 02:13:31 +0000 (04:13 +0200)]
FTL on a spaced tile yeets instead of gibs (#19883)

* -Changes gibbing on FTL when on a spaced tile to yeeting on FTL if you're not buckled and on a space tile.

* -Throw relative to local shuttle position instead, fine for most cases and more performant
-Use throw code to throw.

* Blanks removal

woops

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

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2 years agoAutomatic changelog update
PJBot [Thu, 7 Sep 2023 01:22:18 +0000 (21:22 -0400)]
Automatic changelog update

2 years agoAdds Ganja Brownies (#19222)
Velcroboy [Thu, 7 Sep 2023 01:21:14 +0000 (20:21 -0500)]
Adds Ganja Brownies (#19222)

2 years agoRefinement of inventory of Disсond Dena (#19514)
Jackal298 [Thu, 7 Sep 2023 01:15:02 +0000 (04:15 +0300)]
Refinement of inventory of Disсond Dena (#19514)

2 years agoAutomatic changelog update
PJBot [Thu, 7 Sep 2023 00:33:27 +0000 (20:33 -0400)]
Automatic changelog update

2 years agogrooog (#19870)
lzk [Thu, 7 Sep 2023 00:32:23 +0000 (02:32 +0200)]
grooog (#19870)

2 years agoAutomatic changelog update
PJBot [Thu, 7 Sep 2023 00:26:28 +0000 (20:26 -0400)]
Automatic changelog update

2 years agoCraftable steel secure crate (#19881)
EnDecc [Thu, 7 Sep 2023 00:25:25 +0000 (20:25 -0400)]
Craftable steel secure crate (#19881)

* recipe

* i cast retest spell

2 years agoAutomatic changelog update
PJBot [Wed, 6 Sep 2023 21:42:57 +0000 (17:42 -0400)]
Automatic changelog update

2 years agoSemi revert glass tile resprite (#19266)
potato1234_x [Wed, 6 Sep 2023 21:41:53 +0000 (07:41 +1000)]
Semi revert glass tile resprite (#19266)

2 years agoAutomatic changelog update
PJBot [Wed, 6 Sep 2023 18:19:18 +0000 (14:19 -0400)]
Automatic changelog update

2 years agofix weldable (#19878)
deltanedas [Wed, 6 Sep 2023 18:18:11 +0000 (19:18 +0100)]
fix weldable (#19878)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoAssign a default value to ClickDamageModifier (#19871)
Arimah Greene [Wed, 6 Sep 2023 11:06:09 +0000 (13:06 +0200)]
Assign a default value to ClickDamageModifier (#19871)

2 years agoAutomatic changelog update
PJBot [Wed, 6 Sep 2023 08:31:28 +0000 (04:31 -0400)]
Automatic changelog update

2 years agoRevert click damage mod (#19860)
metalgearsloth [Wed, 6 Sep 2023 08:30:23 +0000 (18:30 +1000)]
Revert click damage mod (#19860)

Maybe swings should be default and we make the animation not shit and the prediction slightly better.

2 years agoClean up APCs (#19841)
deltanedas [Tue, 5 Sep 2023 21:19:43 +0000 (22:19 +0100)]
Clean up APCs (#19841)

While here, fix an issue where APCs don't update the UI state after a load change.

2 years agoAdjust red glow stick glow duration (#19857)
lzk [Tue, 5 Sep 2023 20:16:54 +0000 (22:16 +0200)]
Adjust red glow stick glow duration (#19857)

2 years agoAutomatic changelog update
PJBot [Tue, 5 Sep 2023 20:16:10 +0000 (16:16 -0400)]
Automatic changelog update

2 years agoMake constructed hydro trays start empty (#19620)
deltanedas [Tue, 5 Sep 2023 20:15:06 +0000 (21:15 +0100)]
Make constructed hydro trays start empty (#19620)

2 years agoAdd atmos door to spray painter (#19852)
daerSeebaer [Tue, 5 Sep 2023 17:46:30 +0000 (19:46 +0200)]
Add atmos door to spray painter (#19852)

2 years agoAutomatic changelog update
PJBot [Tue, 5 Sep 2023 17:21:09 +0000 (13:21 -0400)]
Automatic changelog update

2 years agoAdd gas tank valve (#19830)
Slava0135 [Tue, 5 Sep 2023 17:20:05 +0000 (20:20 +0300)]
Add gas tank valve (#19830)

2 years agoAutomatic changelog update
PJBot [Tue, 5 Sep 2023 16:21:58 +0000 (12:21 -0400)]
Automatic changelog update

2 years agoprevent magnet deconstruction when active (#19849)
deltanedas [Tue, 5 Sep 2023 16:20:54 +0000 (17:20 +0100)]
prevent magnet deconstruction when active (#19849)

* raise ToolUseAttemptEvent on target as well as tool

* prevent using tools on magnet when active

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoSpaceStation14.sln as default solution in VSCode (#19844)
Slava0135 [Tue, 5 Sep 2023 08:30:24 +0000 (11:30 +0300)]
SpaceStation14.sln as default solution in VSCode (#19844)

2 years agoAutomatic changelog update
PJBot [Tue, 5 Sep 2023 03:43:13 +0000 (23:43 -0400)]
Automatic changelog update

2 years agoThe Quartermaster Hardsuit (#19738)
EnDecc [Tue, 5 Sep 2023 03:42:09 +0000 (23:42 -0400)]
The Quartermaster Hardsuit (#19738)

* added Quartermaster hardsuit, and cargo order for it

* always some pocket lint

* DNM comments to relevant spots

* renames

* more renames, also pirate crate because gold luxury something something

* plus one id

2 years agoFix copy/paste error (#19836)
Kevin Zheng [Tue, 5 Sep 2023 00:29:43 +0000 (16:29 -0800)]
Fix copy/paste error (#19836)

2 years agoUpdate CODEOWNERS (#19835)
Kevin Zheng [Tue, 5 Sep 2023 00:29:24 +0000 (16:29 -0800)]
Update CODEOWNERS (#19835)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 22:34:50 +0000 (18:34 -0400)]
Automatic changelog update

2 years agoFix barriers not working (#19774)
DrSmugleaf [Mon, 4 Sep 2023 22:33:40 +0000 (15:33 -0700)]
Fix barriers not working (#19774)

2 years agoAllow solutions to store extra reagent data (#19323)
Leon Friedrich [Mon, 4 Sep 2023 21:55:10 +0000 (09:55 +1200)]
Allow solutions to store extra reagent data (#19323)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 20:19:09 +0000 (16:19 -0400)]
Automatic changelog update

2 years agoAdd moth plushie (#19828)
Fromoriss [Mon, 4 Sep 2023 20:18:03 +0000 (23:18 +0300)]
Add moth plushie (#19828)

* Add moth plushie

Moth plushie. It's cute, don't mind, merge it.

* Update toys.yml

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 20:12:46 +0000 (16:12 -0400)]
Automatic changelog update

2 years agoAdd plant phalanximine, fix slippery fruits (#19820)
Doru991 [Mon, 4 Sep 2023 20:11:40 +0000 (23:11 +0300)]
Add plant phalanximine, fix slippery fruits (#19820)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 20:03:58 +0000 (16:03 -0400)]
Automatic changelog update

2 years agoArachnid RE-REWORK (#19138)
PixelTK [Mon, 4 Sep 2023 20:02:54 +0000 (21:02 +0100)]
Arachnid RE-REWORK (#19138)

* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 19:34:51 +0000 (15:34 -0400)]
Automatic changelog update

2 years agoFix thrusters, add new max velocity calculation (#19688)
router [Mon, 4 Sep 2023 19:33:47 +0000 (22:33 +0300)]
Fix thrusters, add new max velocity calculation (#19688)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 16:25:43 +0000 (12:25 -0400)]
Automatic changelog update

2 years agoMutate plant chemical and gas production (#19455)
drteaspoon420 [Mon, 4 Sep 2023 16:24:39 +0000 (19:24 +0300)]
Mutate plant chemical and gas production (#19455)

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 14:23:00 +0000 (10:23 -0400)]
Automatic changelog update

2 years agoNPC/silicon.yml cleaning (#19731)
lzk [Mon, 4 Sep 2023 14:21:52 +0000 (16:21 +0200)]
NPC/silicon.yml cleaning (#19731)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 14:17:14 +0000 (10:17 -0400)]
Automatic changelog update

2 years agogib hitchhikers on ftl (#19793)
deltanedas [Mon, 4 Sep 2023 14:16:10 +0000 (15:16 +0100)]
gib hitchhikers on ftl (#19793)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoUpdate submodule to 154.1.0 (#19818)
metalgearsloth [Mon, 4 Sep 2023 14:15:44 +0000 (00:15 +1000)]
Update submodule to 154.1.0 (#19818)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 14:15:14 +0000 (10:15 -0400)]
Automatic changelog update

2 years agonuke lights code change (#19315)
deltanedas [Mon, 4 Sep 2023 14:14:10 +0000 (15:14 +0100)]
nuke lights code change (#19315)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 14:12:41 +0000 (10:12 -0400)]
Automatic changelog update

2 years agodisposal emag fix and refactoring (#19790)
deltanedas [Mon, 4 Sep 2023 14:11:34 +0000 (15:11 +0100)]
disposal emag fix and refactoring (#19790)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoWeldable cleanup (#19809)
metalgearsloth [Mon, 4 Sep 2023 14:07:01 +0000 (00:07 +1000)]
Weldable cleanup (#19809)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 13:13:02 +0000 (09:13 -0400)]
Automatic changelog update

2 years agoPlasma fueled radiation collectors (#19598)
chromiumboy [Mon, 4 Sep 2023 13:11:57 +0000 (08:11 -0500)]
Plasma fueled radiation collectors (#19598)

* Fixes issue with solution regenerators

* Update Solution.cs

Removed excess whitespace

* Undid file scoping to make this easier to review

* Initial prototype

* Adjusted coefficients

* Removed unintentional changes from another PR

* Undid unintentional change

* Undid unintentional change

* Added temperature modifier to power production

* Guidebook entry and radiation collector low pressure warning

* Reviewer requested changes

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 12:58:58 +0000 (08:58 -0400)]
Automatic changelog update

2 years agoRebalance Ore Conversions (#19814)
liltenhead [Mon, 4 Sep 2023 12:57:51 +0000 (05:57 -0700)]
Rebalance Ore Conversions (#19814)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 12:54:18 +0000 (08:54 -0400)]
Automatic changelog update

2 years agoAllow drag-and-drop insertion of reagents into the ChemMaster (#19796)
TNE [Mon, 4 Sep 2023 12:53:13 +0000 (14:53 +0200)]
Allow drag-and-drop insertion of reagents into the ChemMaster (#19796)

* Add DumpableSolutionComponent

Separates out the component from "DrainComponent" that allows one to drag a bucket/any reagent container onto a drain/sink/toilet to empty it and allows other reagent containers to reuse the code effortlessly.

* Give the ChemMaster 4000 the DumpableSolution Component

Allows drag and dropping solutions into the ChemMaster much like you used to be able to do exclusively with drains. This also allows dumping jugs into them.

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 12:24:53 +0000 (08:24 -0400)]
Automatic changelog update

2 years agoHot Fix of Gravity Grenades (#19414)
AlexMorgan3817 [Mon, 4 Sep 2023 12:23:48 +0000 (19:23 +0700)]
Hot Fix of Gravity Grenades (#19414)

* Supermatter grenade fix

* taking out the trash

* Removing debug Console.Log() in twostage

* More fixes

* Better to put LoadComponents on Update, else it will modify list of other untriggered components

2 years agolight refactoring/rework (#19314)
deltanedas [Mon, 4 Sep 2023 05:31:10 +0000 (06:31 +0100)]
light refactoring/rework (#19314)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 05:17:40 +0000 (01:17 -0400)]
Automatic changelog update

2 years agocarpsuit and iansuit revival (#19728)
deltanedas [Mon, 4 Sep 2023 05:16:36 +0000 (06:16 +0100)]
carpsuit and iansuit revival (#19728)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agodecouple objectives round end text from traitor (#19687)
deltanedas [Mon, 4 Sep 2023 04:55:34 +0000 (05:55 +0100)]
decouple objectives round end text from traitor (#19687)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 04:53:15 +0000 (00:53 -0400)]
Automatic changelog update

2 years agoprevent pulse throw from throwing observers (#19704)
qwerltaz [Mon, 4 Sep 2023 04:52:11 +0000 (06:52 +0200)]
prevent pulse throw from throwing observers (#19704)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 04:50:53 +0000 (00:50 -0400)]
Automatic changelog update

2 years agomagazine fill repeating doafter (#19780)
deltanedas [Mon, 4 Sep 2023 04:49:49 +0000 (05:49 +0100)]
magazine fill repeating doafter (#19780)

Co-authored-by: deltanedas <@deltanedas:kde.org>
2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 04:49:04 +0000 (00:49 -0400)]
Automatic changelog update

2 years ago[Fix] Steel stack sprite (#19785)
lzk [Mon, 4 Sep 2023 04:48:00 +0000 (06:48 +0200)]
[Fix] Steel stack sprite (#19785)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 04:35:24 +0000 (00:35 -0400)]
Automatic changelog update

2 years agoFix NPC juke stuttering (#19805)
metalgearsloth [Mon, 4 Sep 2023 04:34:20 +0000 (14:34 +1000)]
Fix NPC juke stuttering (#19805)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 04:25:36 +0000 (00:25 -0400)]
Automatic changelog update

2 years agoFix crusher showing popup on swing (#19791)
metalgearsloth [Mon, 4 Sep 2023 04:24:31 +0000 (14:24 +1000)]
Fix crusher showing popup on swing (#19791)

2 years agoAdd vent welding (#19759)
qwerltaz [Mon, 4 Sep 2023 04:23:38 +0000 (06:23 +0200)]
Add vent welding (#19759)

2 years agoAutomatic changelog update
PJBot [Mon, 4 Sep 2023 03:39:27 +0000 (23:39 -0400)]
Automatic changelog update

2 years agoBlindy changes a bunch of event spawnrates in hopes that it does something. (#19803)
Flareguy [Mon, 4 Sep 2023 03:38:22 +0000 (22:38 -0500)]
Blindy changes a bunch of event spawnrates in hopes that it does something. (#19803)

* blindly changes some event rates in hopes it does something cool

* emergent game play

2 years agoargocytes (#19801)
Nemanja [Mon, 4 Sep 2023 02:02:00 +0000 (22:02 -0400)]
argocytes (#19801)

2 years agoAutomatic changelog update
PJBot [Sun, 3 Sep 2023 21:28:23 +0000 (17:28 -0400)]
Automatic changelog update

2 years agoBartender aprons! (#19794)
FinnishPaladin [Sun, 3 Sep 2023 21:27:19 +0000 (00:27 +0300)]
Bartender aprons! (#19794)

* Adds a new apron to the bar clothing vendor.

* quick fix

* quick edits to the sprites

* another sprite edit.

* more tweaks...

* darkened sprites a bit, moved the apron's location in the bardrobe

* improved the item suffix

2 years agoAutomatic changelog update
PJBot [Sun, 3 Sep 2023 18:39:33 +0000 (14:39 -0400)]
Automatic changelog update

2 years agoChief Engineer's Turtleneck (#19737)
KingFroozy [Sun, 3 Sep 2023 18:38:28 +0000 (21:38 +0300)]
Chief Engineer's Turtleneck (#19737)

* Add chief engineer's turtleneck

* Printable now

2 years agoAutomatic changelog update
PJBot [Sun, 3 Sep 2023 18:33:44 +0000 (14:33 -0400)]
Automatic changelog update