]> git.smokeofanarchy.ru Git - space-station-14.git/log
space-station-14.git
2 years agoFix master (#15256)
metalgearsloth [Mon, 10 Apr 2023 05:47:51 +0000 (15:47 +1000)]
Fix master (#15256)

2 years agopirate content (#11799)
brainfood1183 [Mon, 10 Apr 2023 05:47:40 +0000 (06:47 +0100)]
pirate content (#11799)

* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2 years agoPuddles & spreader refactor (#15191)
metalgearsloth [Mon, 10 Apr 2023 05:37:03 +0000 (15:37 +1000)]
Puddles & spreader refactor (#15191)

2 years agoAutomatic changelog update
PJBot [Mon, 10 Apr 2023 04:39:24 +0000 (00:39 -0400)]
Automatic changelog update

2 years agoMaterial Reclaimer (#14969)
Nemanja [Mon, 10 Apr 2023 04:38:20 +0000 (00:38 -0400)]
Material Reclaimer (#14969)

* Material Reclaimer

* Fix this test

* autostack output, tweak volume, add upgrade examine

* whitelist AND blacklist support

why not

* trying so hard to get this fucking test to work

* EmoGarbage delves into MaterialArbitrageTest, never to return

* VV and restore cloth to glory

* make the system more robust

* even more stuff has composition; add blacklist for important items

* fix test fails

* convert recycling

* forgor :sadge:

* lol

* simply a modiCUM of doc commentary

2 years agoAutomatic changelog update
PJBot [Mon, 10 Apr 2023 04:34:27 +0000 (00:34 -0400)]
Automatic changelog update

2 years agoPredatory pet for HoS (#15237)
Nim [Mon, 10 Apr 2023 04:33:22 +0000 (07:33 +0300)]
Predatory pet for HoS (#15237)

2 years agoRemove PA component references (#15252)
DrSmugleaf [Mon, 10 Apr 2023 04:10:33 +0000 (21:10 -0700)]
Remove PA component references (#15252)

2 years agoAdded small text to Guidebook Security tab. (#15248)
TurboTrackerss14 [Sun, 9 Apr 2023 23:06:27 +0000 (00:06 +0100)]
Added small text to Guidebook Security tab. (#15248)

This file has existed for a good while with zero content as is the only dropdown in the guidebook without text.
Why not for a first commit eh?

2 years agoRemove cryo pod component references (#15247)
DrSmugleaf [Sun, 9 Apr 2023 22:28:19 +0000 (15:28 -0700)]
Remove cryo pod component references (#15247)

2 years agoRemove mech component references (#15246)
DrSmugleaf [Sun, 9 Apr 2023 22:20:55 +0000 (15:20 -0700)]
Remove mech component references (#15246)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 22:07:34 +0000 (18:07 -0400)]
Automatic changelog update

2 years ago[Cargo] Added MK58 crate (#15204)
lzk228 [Sun, 9 Apr 2023 22:06:30 +0000 (01:06 +0300)]
[Cargo] Added MK58 crate (#15204)

* Added crate with MK58 to request console

* fix price

* fix

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 22:01:26 +0000 (18:01 -0400)]
Automatic changelog update

2 years ago[Entity] Sustenance Vendor (#15119)
potato1234_x [Sun, 9 Apr 2023 22:00:23 +0000 (08:00 +1000)]
[Entity] Sustenance Vendor (#15119)

* sustenance vendor

* emaggedinventory

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 21:59:25 +0000 (17:59 -0400)]
Automatic changelog update

2 years ago[Fix] Chemical bottles (#15198)
Puro [Sun, 9 Apr 2023 21:58:22 +0000 (00:58 +0300)]
[Fix] Chemical bottles (#15198)

* [Fix] Chemical bottles

* Min 0

2 years ago[Spawn] Motobike Spawner (#15238)
Puro [Sun, 9 Apr 2023 21:57:40 +0000 (00:57 +0300)]
[Spawn] Motobike Spawner (#15238)

2 years agoFix path to boxes.rsi (#15242)
crazybrain23 [Sun, 9 Apr 2023 21:53:03 +0000 (22:53 +0100)]
Fix path to boxes.rsi (#15242)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 21:51:33 +0000 (17:51 -0400)]
Automatic changelog update

2 years ago[Spawner] Pirates icon (#15241)
Puro [Sun, 9 Apr 2023 21:50:28 +0000 (00:50 +0300)]
[Spawner] Pirates icon (#15241)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 21:45:28 +0000 (17:45 -0400)]
Automatic changelog update

2 years agoMake broken cuffs trash, fix color for broken makeshift cuffs (#15203)
Nemanja [Sun, 9 Apr 2023 21:44:24 +0000 (17:44 -0400)]
Make broken cuffs trash, fix color for broken makeshift cuffs (#15203)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 21:43:21 +0000 (17:43 -0400)]
Automatic changelog update

2 years ago[Sprites] Adds in hand sprites (#15244)
Puro [Sun, 9 Apr 2023 21:42:17 +0000 (00:42 +0300)]
[Sprites] Adds in hand sprites (#15244)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 02:36:11 +0000 (22:36 -0400)]
Automatic changelog update

2 years agoDiona CO2 Respiration (#15112)
Interrobang01 [Sun, 9 Apr 2023 02:35:07 +0000 (19:35 -0700)]
Diona CO2 Respiration (#15112)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 02:33:26 +0000 (22:33 -0400)]
Automatic changelog update

2 years agoAdds slight protection to HoS common clothes (#15213)
liltenhead [Sun, 9 Apr 2023 02:32:22 +0000 (19:32 -0700)]
Adds slight protection to HoS common clothes (#15213)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 02:26:42 +0000 (22:26 -0400)]
Automatic changelog update

2 years agoFixes air sensors not accessing gas mixture on construction + visual fixes (#15224)
Menshin [Sun, 9 Apr 2023 02:25:38 +0000 (04:25 +0200)]
Fixes air sensors not accessing gas mixture on construction + visual fixes (#15224)

2 years agoAdded clown satchel (#15225)
lzk228 [Sun, 9 Apr 2023 02:24:44 +0000 (05:24 +0300)]
Added clown satchel (#15225)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 02:20:35 +0000 (22:20 -0400)]
Automatic changelog update

2 years agoUI: Close window hotkeys (#15227)
Skye [Sun, 9 Apr 2023 02:19:32 +0000 (19:19 -0700)]
UI: Close window hotkeys (#15227)

2 years agoUpdate RobustToolbox to 0.96.6.0 (#15232)
DrSmugleaf [Sun, 9 Apr 2023 02:18:42 +0000 (19:18 -0700)]
Update RobustToolbox to 0.96.6.0 (#15232)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 02:00:45 +0000 (22:00 -0400)]
Automatic changelog update

2 years agoDon't sell non-dead mobs on cargo (#15228)
metalgearsloth [Sun, 9 Apr 2023 01:59:41 +0000 (11:59 +1000)]
Don't sell non-dead mobs on cargo (#15228)

2 years agoAutomatic changelog update
PJBot [Sun, 9 Apr 2023 01:35:32 +0000 (21:35 -0400)]
Automatic changelog update

2 years agoHide ugly float to string conversion results from players in the mixer UI (#15183)
Dawid Bla [Sun, 9 Apr 2023 01:34:27 +0000 (03:34 +0200)]
Hide ugly float to string conversion results from players in the mixer UI (#15183)

2 years agoRemove insane murder chems from ventclog event (#15214)
Emisse [Sun, 9 Apr 2023 00:35:49 +0000 (18:35 -0600)]
Remove insane murder chems from ventclog event (#15214)

2 years agoRemove kitchen spike component references (#15221)
DrSmugleaf [Sat, 8 Apr 2023 23:53:29 +0000 (16:53 -0700)]
Remove kitchen spike component references (#15221)

2 years agoRemove spawn point component references (#15222)
DrSmugleaf [Sat, 8 Apr 2023 23:52:52 +0000 (16:52 -0700)]
Remove spawn point component references (#15222)

2 years agoRemove combat mode component reference (#15206)
DrSmugleaf [Sat, 8 Apr 2023 20:16:48 +0000 (13:16 -0700)]
Remove combat mode component reference (#15206)

2 years agoRemove id card console component reference (#15205)
DrSmugleaf [Sat, 8 Apr 2023 20:15:52 +0000 (13:15 -0700)]
Remove id card console component reference (#15205)

2 years ago[map] Add faxes on dev map (#15218)
Morb [Sat, 8 Apr 2023 19:48:54 +0000 (12:48 -0700)]
[map] Add faxes on dev map (#15218)

2 years agoAdd pickup-drop test and fix hand state handling (#15212)
Leon Friedrich [Sat, 8 Apr 2023 17:53:25 +0000 (05:53 +1200)]
Add pickup-drop test and fix hand state handling (#15212)

2 years agoAutomatic changelog update
PJBot [Sat, 8 Apr 2023 00:55:32 +0000 (20:55 -0400)]
Automatic changelog update

2 years agoFix computer deconstruction (#15187)
Leon Friedrich [Sat, 8 Apr 2023 00:54:28 +0000 (12:54 +1200)]
Fix computer deconstruction (#15187)

2 years agoUse chat emotes for disease (#15134)
Morb [Fri, 7 Apr 2023 23:17:30 +0000 (16:17 -0700)]
Use chat emotes for disease (#15134)

* Use chat emote system for disease

* Use chat emotes in prototypes

* Fix sound path

* Fix prototype ids

* Update Content.Server/Disease/DiseaseSystem.cs

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
---------

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
2 years agoAutomatic changelog update
PJBot [Fri, 7 Apr 2023 20:11:58 +0000 (16:11 -0400)]
Automatic changelog update

2 years agoAdd sharp to shards and broken bottles (#15195)
liltenhead [Fri, 7 Apr 2023 20:10:54 +0000 (13:10 -0700)]
Add sharp to shards and broken bottles (#15195)

2 years agoAutomatic changelog update
PJBot [Fri, 7 Apr 2023 20:10:34 +0000 (16:10 -0400)]
Automatic changelog update

2 years agoJanimaid sprite fix (#15202)
JerryTheMouse [Fri, 7 Apr 2023 20:10:35 +0000 (02:10 +0600)]
Janimaid sprite fix (#15202)

There was some additional pixels, when you keep janimaid's jumpskirt in hands. I just changed the sprite a little

2 years agoDetective access fluent (#15209)
Vasilis The Pikachu [Fri, 7 Apr 2023 20:09:29 +0000 (22:09 +0200)]
Detective access fluent (#15209)

2 years agoRemove hands component reference (#15197)
DrSmugleaf [Fri, 7 Apr 2023 18:21:12 +0000 (11:21 -0700)]
Remove hands component reference (#15197)

2 years agoAutomatic changelog update
PJBot [Fri, 7 Apr 2023 10:55:24 +0000 (06:55 -0400)]
Automatic changelog update

2 years agoFix NPC arrival distance for nodes (#15193)
metalgearsloth [Fri, 7 Apr 2023 10:54:20 +0000 (20:54 +1000)]
Fix NPC arrival distance for nodes (#15193)

2 years agoRemove disposal tubes component references and ECS some of it (#15188)
DrSmugleaf [Fri, 7 Apr 2023 03:20:50 +0000 (20:20 -0700)]
Remove disposal tubes component references and ECS some of it (#15188)

2 years agoAutomatic changelog update
PJBot [Fri, 7 Apr 2023 02:07:56 +0000 (22:07 -0400)]
Automatic changelog update

2 years agoAdds the clown recorder (Clown fix) (#15074)
lapatison [Fri, 7 Apr 2023 02:06:52 +0000 (05:06 +0300)]
Adds the clown recorder (Clown fix) (#15074)

2 years agoAutomatic changelog update
PJBot [Thu, 6 Apr 2023 22:50:30 +0000 (18:50 -0400)]
Automatic changelog update

2 years agoAdd Alt-click insertion to ItemSlots (#15094)
ShadowCommander [Thu, 6 Apr 2023 22:49:27 +0000 (15:49 -0700)]
Add Alt-click insertion to ItemSlots (#15094)

2 years agoAutomatic changelog update
PJBot [Thu, 6 Apr 2023 22:48:57 +0000 (18:48 -0400)]
Automatic changelog update

2 years ago[Fix] Fixed base showcase robot (#15044)
Puro [Thu, 6 Apr 2023 22:47:53 +0000 (01:47 +0300)]
[Fix] Fixed base showcase robot (#15044)

2 years agoAutomatic changelog update
PJBot [Thu, 6 Apr 2023 21:21:53 +0000 (17:21 -0400)]
Automatic changelog update

2 years agoReagent interactivity (pt. 1) (#15130)
Kara [Thu, 6 Apr 2023 21:20:48 +0000 (14:20 -0700)]
Reagent interactivity (pt. 1) (#15130)

* Puddle slippy

* spillable melee

* splash spilling!

* splat melee sound

* p

2 years agoUpdate submodule to v0.96.5.0. (#15177)
Moony [Thu, 6 Apr 2023 17:39:35 +0000 (12:39 -0500)]
Update submodule to v0.96.5.0. (#15177)

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2 years agoContent PR for auto-componentstate sourcegen (#14845)
Kara [Thu, 6 Apr 2023 17:33:40 +0000 (10:33 -0700)]
Content PR for auto-componentstate sourcegen (#14845)

* Content PR for auto-componentstate sourcegen

# Conflicts:
# Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
# Content.Shared/Content.Shared.csproj
# SpaceStation14.sln

* shared file too

* afterautohandlestate example

* oops

* anudda

* access fixed

* smart

2 years agoAutomatic changelog update
PJBot [Thu, 6 Apr 2023 05:27:18 +0000 (01:27 -0400)]
Automatic changelog update

2 years agoFix RCD checks (#15167)
Leon Friedrich [Thu, 6 Apr 2023 05:26:14 +0000 (17:26 +1200)]
Fix RCD checks (#15167)

2 years agoAutomatic changelog update
PJBot [Thu, 6 Apr 2023 02:49:08 +0000 (22:49 -0400)]
Automatic changelog update

2 years ago[Access] Detective personal access (#15109)
Puro [Thu, 6 Apr 2023 02:48:04 +0000 (05:48 +0300)]
[Access] Detective personal access (#15109)

* [Access] Detective personal access

* [Add] technical airlock with detective access.

* vendind and locker change access

* Detective access on ID card console

2 years agoMultiple uses on Food/Drink won't cancel the do-after anymore (#15163)
keronshb [Thu, 6 Apr 2023 02:47:20 +0000 (22:47 -0400)]
Multiple uses on Food/Drink won't cancel the do-after anymore (#15163)

* stops do-afters from cancelling if food/drink is used twice

* Update DrinkSystem.cs

2 years agoUpdate submodule to v0.96.4.0. (#15164)
Moony [Thu, 6 Apr 2023 02:27:01 +0000 (21:27 -0500)]
Update submodule to v0.96.4.0. (#15164)

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2 years agoAutomatic changelog update
PJBot [Thu, 6 Apr 2023 00:54:44 +0000 (20:54 -0400)]
Automatic changelog update

2 years ago[Issue Solution] Dwarf Desc (#15152)
Puro [Thu, 6 Apr 2023 00:53:40 +0000 (03:53 +0300)]
[Issue Solution] Dwarf Desc (#15152)

2 years agoAutomatic changelog update
PJBot [Thu, 6 Apr 2023 00:49:05 +0000 (20:49 -0400)]
Automatic changelog update

2 years agoNo ghost role pet suicide (#15117)
crazybrain23 [Thu, 6 Apr 2023 00:48:02 +0000 (01:48 +0100)]
No ghost role pet suicide (#15117)

Balance

2 years agoImplicit gas tile & decal states (#15146)
Leon Friedrich [Wed, 5 Apr 2023 23:43:12 +0000 (11:43 +1200)]
Implicit gas tile & decal states (#15146)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 23:42:15 +0000 (19:42 -0400)]
Automatic changelog update

2 years agoSkin color validation (#15140)
Flipp Syder [Wed, 5 Apr 2023 23:41:11 +0000 (16:41 -0700)]
Skin color validation (#15140)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 23:38:09 +0000 (19:38 -0400)]
Automatic changelog update

2 years agoFix weapon cooldown serialization while mapping (#15123)
Leon Friedrich [Wed, 5 Apr 2023 23:37:50 +0000 (11:37 +1200)]
Fix weapon cooldown serialization while mapping (#15123)

2 years agoAdds uploadfolder command (#15102)
Zoldorf [Wed, 5 Apr 2023 23:37:05 +0000 (17:37 -0600)]
Adds uploadfolder command (#15102)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 22:56:17 +0000 (18:56 -0400)]
Automatic changelog update

2 years agouichange Chemmaster (#14237)
DEATHB4DEFEAT [Wed, 5 Apr 2023 22:55:14 +0000 (15:55 -0700)]
uichange Chemmaster (#14237)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 22:48:06 +0000 (18:48 -0400)]
Automatic changelog update

2 years agoBarratry:Evac+SkullUpdate (#15161)
Scribbles0 [Wed, 5 Apr 2023 22:47:27 +0000 (15:47 -0700)]
Barratry:Evac+SkullUpdate (#15161)

2 years agoAdd instant destruction thresholds to everything (#14886)
metalgearsloth [Wed, 5 Apr 2023 22:47:02 +0000 (08:47 +1000)]
Add instant destruction thresholds to everything (#14886)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 22:45:30 +0000 (18:45 -0400)]
Automatic changelog update

2 years agoRemoves clown abuse (#15145)
keronshb [Wed, 5 Apr 2023 22:44:26 +0000 (18:44 -0400)]
Removes clown abuse (#15145)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 22:37:23 +0000 (18:37 -0400)]
Automatic changelog update

2 years agoDo not anchor the bell, do not pass go, do not take 200 zorkmids. (#15143)
Moony [Wed, 5 Apr 2023 22:36:19 +0000 (17:36 -0500)]
Do not anchor the bell, do not pass go, do not take 200 zorkmids. (#15143)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 22:35:56 +0000 (18:35 -0400)]
Automatic changelog update

2 years agomade security's deployable barriers easier to move (#15157)
Interrobang01 [Wed, 5 Apr 2023 22:34:51 +0000 (15:34 -0700)]
made security's deployable barriers easier to move (#15157)

2 years agoDisable Space Wind (#15151)
Emisse [Wed, 5 Apr 2023 19:43:05 +0000 (13:43 -0600)]
Disable Space Wind (#15151)

2 years agotrust me bro (#15149)
Emisse [Wed, 5 Apr 2023 08:23:07 +0000 (02:23 -0600)]
trust me bro (#15149)

2 years agotroooo (#15150)
Emisse [Wed, 5 Apr 2023 06:10:30 +0000 (00:10 -0600)]
troooo (#15150)

2 years agoAutomatic changelog update
PJBot [Wed, 5 Apr 2023 05:06:29 +0000 (01:06 -0400)]
Automatic changelog update

2 years agoMore Musical Cargo (#15107)
EnDecc [Wed, 5 Apr 2023 05:05:24 +0000 (01:05 -0400)]
More Musical Cargo (#15107)

* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

im sure i'll get used to this