]>
git.smokeofanarchy.ru Git - space-station-14.git/log
lzk [Sun, 29 Dec 2024 03:28:58 +0000 (04:28 +0100)]
fix interdimensional teleporter desc (#34108)
Update hand_teleporter.yml
PJBot [Sun, 29 Dec 2024 03:26:46 +0000 (03:26 +0000)]
Automatic changelog update
Velcroboy [Sun, 29 Dec 2024 03:25:39 +0000 (21:25 -0600)]
Rolling joints no longer requires a filter (#34106)
* Remove filters from joint crafting
* err
* hmmm
* guhhh
* yyyy
* whitespace
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
PJBot [Sun, 29 Dec 2024 02:03:31 +0000 (02:03 +0000)]
Automatic changelog update
ArtisticRoomba [Sun, 29 Dec 2024 02:02:24 +0000 (18:02 -0800)]
New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508)
* A looooooooot of new cotton foods for the moffs
* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)
* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png
* update requested sprites
* change requested sprites
* address part of sloth's review, awaiting response
* address second half of review, fix magical food nutriment mitosis bug
Booblesnoot42 [Sun, 29 Dec 2024 01:56:23 +0000 (20:56 -0500)]
Corrected Cotton Dough Recipe (#33988)
PJBot [Sun, 29 Dec 2024 01:51:56 +0000 (01:51 +0000)]
Automatic changelog update
SolStar [Sun, 29 Dec 2024 01:50:49 +0000 (20:50 -0500)]
Add a guaranteed cotton pizza to pizza crates (#33997)
* add guaranteed cotton pizza to pizza crates
* saner parenting
* Use clearer suffix on cotton pizza box
PJBot [Sun, 29 Dec 2024 01:50:11 +0000 (01:50 +0000)]
Automatic changelog update
zHonys [Sun, 29 Dec 2024 01:49:05 +0000 (22:49 -0300)]
Added support so that smile can use hats (#33924)
* Added support so that smile can use hats
Changed Prototypes/Entities/Mobs/NPCs/pets.yml
Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates
Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi
Added smile_displacement.rsi/meta.json
Added smile_displacement.rsi/head.png
* Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi
Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1
Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/
Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi
* Minor fixes: removing comments and change naming
Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi
* Removed smile_inventory_template.yml and used head_inventory_template.yml instead
github-actions[bot] [Sun, 29 Dec 2024 00:39:04 +0000 (01:39 +0100)]
Update Credits (#34109)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
PJBot [Sat, 28 Dec 2024 23:34:22 +0000 (23:34 +0000)]
Automatic changelog update
chromiumboy [Sat, 28 Dec 2024 23:33:15 +0000 (17:33 -0600)]
UI improvements for holopads (#34055)
* Initial commit
* Minor update
PursuitInAshes [Sat, 28 Dec 2024 16:52:27 +0000 (08:52 -0800)]
Removes weh.txt from Textures/Parallaxes (#34097)
Removes Unneeded File
PJBot [Sat, 28 Dec 2024 14:50:11 +0000 (14:50 +0000)]
Automatic changelog update
psykana [Sat, 28 Dec 2024 14:49:03 +0000 (15:49 +0100)]
Traitor can no longer get multiple objectives to save/help/kill the same person (#33704)
* Deduplicate traitor objectives
* Remove redundant check
PJBot [Sat, 28 Dec 2024 10:14:21 +0000 (10:14 +0000)]
Automatic changelog update
Alpaccalypse [Sat, 28 Dec 2024 10:13:13 +0000 (10:13 +0000)]
Removed Power Monitoring Computer boards from research and lathe recipes. Added default engineering sprites for atmos computer boards. (#34078)
* Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them.
* Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
* Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
lzk [Sat, 28 Dec 2024 10:00:12 +0000 (11:00 +0100)]
Fix wagging action name and desc (#34089)
Leon Friedrich [Sat, 28 Dec 2024 00:54:32 +0000 (11:54 +1100)]
Ignore audio entities in SpawnAndDeleteEntityCountTest (#34021)
PJBot [Fri, 27 Dec 2024 13:35:38 +0000 (13:35 +0000)]
Automatic changelog update
Plykiya [Fri, 27 Dec 2024 13:34:32 +0000 (05:34 -0800)]
Fix popup on handcuffing for person being handcuffed (#33639)
* Fix popup on handcuffing for person being handcuffed
* wrap onto newlines to appease the style gods
PJBot [Fri, 27 Dec 2024 12:35:38 +0000 (12:35 +0000)]
Automatic changelog update
crazybrain23 [Fri, 27 Dec 2024 12:34:30 +0000 (12:34 +0000)]
Arrivals blacklist for bluespace lockers and QSIs (#34072)
* Ensure Arrivals Blacklist in Bluespace Locker rule
* While I'm at it, stop the QSI too
* fix thing I broke somehow
* Every bluespace locker arrivals blacklisted
* Add ArrivalsBlacklist to the prototypes too
PJBot [Thu, 26 Dec 2024 22:48:31 +0000 (22:48 +0000)]
Automatic changelog update
ArtisticRoomba [Thu, 26 Dec 2024 22:47:22 +0000 (14:47 -0800)]
Reinforced tables require welding to construct/deconstruct (#33992)
Emisse [Thu, 26 Dec 2024 07:06:48 +0000 (00:06 -0700)]
bagel update (#34073)
Southbridge [Thu, 26 Dec 2024 02:43:53 +0000 (21:43 -0500)]
Amber Station - Fixed evac shuttle screens (#34071)
Added Devicenetwork component to ensure the screens work
TytosB [Wed, 25 Dec 2024 19:16:58 +0000 (13:16 -0600)]
Loop Station update and fixes (#34067)
* 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
---------
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Emisse [Wed, 25 Dec 2024 07:08:35 +0000 (00:08 -0700)]
bagel update (#34062)
* bagel update
* fixgridatmos
* fdsafds
War Pigeon [Wed, 25 Dec 2024 06:21:39 +0000 (00:21 -0600)]
Link Core cargo shuttle atmos devices (#34061)
* Link Core cargo shuttle atmos devices
* Remove configurator lines
This matches what the DeviceNetworks in core.yml look like now. Hopefully it works?
PJBot [Tue, 24 Dec 2024 02:26:10 +0000 (02:26 +0000)]
Automatic changelog update
lzk [Tue, 24 Dec 2024 02:25:03 +0000 (03:25 +0100)]
Allow to paint multiple airlocks (#34001)
* Allow to paint multiple airlocks
* oh right
github-actions[bot] [Tue, 24 Dec 2024 02:15:26 +0000 (03:15 +0100)]
Update Credits (#33998)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
crazybrain23 [Tue, 24 Dec 2024 02:14:42 +0000 (02:14 +0000)]
Add crazybrain23 to CODEOWNERS (#34038)
Add myself to CODEOWNERS
Basically just added myself where Nik was since I am also doing headmin things.
PJBot [Tue, 24 Dec 2024 00:25:26 +0000 (00:25 +0000)]
Automatic changelog update
Ed [Tue, 24 Dec 2024 00:24:19 +0000 (03:24 +0300)]
Multiple items in loadouts (#33193)
* loadouts update
* Update loadout_groups.yml
* darts to candles
* Update Resources/Prototypes/Loadouts/dummy_entities.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
August Sun [Tue, 24 Dec 2024 00:22:37 +0000 (18:22 -0600)]
Adds more air alarms and sensors throughout Oasis, linked unlinked air devices (#34046)
Adds more air alarms and sensors throughout Oasis
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Pieter-Jan Briers [Tue, 24 Dec 2024 00:18:31 +0000 (01:18 +0100)]
Fix race condition causing disconnected admins to appear in adminwho (#34033)
August Sun [Mon, 23 Dec 2024 23:34:01 +0000 (17:34 -0600)]
Increases Marathon cryosleep size, added meteor shielding to Marathon chapelroid (#34044)
Increases Marathon cryosleep size, added meteor shielding to chapelroid
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
PJBot [Mon, 23 Dec 2024 23:26:02 +0000 (23:26 +0000)]
Automatic changelog update
Booblesnoot42 [Mon, 23 Dec 2024 23:24:54 +0000 (18:24 -0500)]
Removed protolathe from cargo on Amber (#34027)
Booblesnoot42 [Mon, 23 Dec 2024 23:24:47 +0000 (18:24 -0500)]
Remove cog cargo protolathe (#34026)
* Removed protolathe from cargo on Amber
* Removed protolathe from cargo on Cog
* Revert "Removed protolathe from cargo on Amber"
This reverts commit
422db6e34a54c9256e3e1aad2098b64ff4cf0f96 .
revert commit that should have been done on another branch
PJBot [Mon, 23 Dec 2024 19:55:25 +0000 (19:55 +0000)]
Automatic changelog update
amatwiedle [Mon, 23 Dec 2024 19:54:18 +0000 (13:54 -0600)]
Fix borgs being able to drink from buckets and spray bottles. (#32964)
* Added a check for if the entity trying to drink is a borg.
* Fixed missing namespace issue.
* Improved code conciseness.
* Removed borg chassis check, added stomach check.
* Removed unused namespace
---------
Co-authored-by: dankeaj <andrewjdanke@gmail.com>
Pieter-Jan Briers [Mon, 23 Dec 2024 19:23:03 +0000 (20:23 +0100)]
Fix the sensor monitoring console (#34035)
Still isn't really suitable to just map but at least it doesn't outright NRE anymore.
Alternative to #34032
slarticodefast [Mon, 23 Dec 2024 18:25:03 +0000 (19:25 +0100)]
minor fix to "silent footsteps for ninja" (#34040)
minor fix
PJBot [Mon, 23 Dec 2024 14:25:20 +0000 (14:25 +0000)]
Automatic changelog update
mubururu_ [Mon, 23 Dec 2024 14:24:09 +0000 (08:24 -0600)]
silent footsteps for ninja (#33280)
* waow
* nice suggestion
* nullable sound
* fix stuff
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
slarticodefast [Sun, 22 Dec 2024 20:41:35 +0000 (21:41 +0100)]
Train: fix problematic atmos setup (#34018)
fix atmos setup
ScarKy0 [Sun, 22 Dec 2024 19:56:30 +0000 (20:56 +0100)]
Localized holopads for Box (#34011)
I love holopads
Pieter-Jan Briers [Sun, 22 Dec 2024 16:12:37 +0000 (17:12 +0100)]
Specify privacy policy for Wizard's Den (#34013)
slarticodefast [Sun, 22 Dec 2024 13:38:39 +0000 (14:38 +0100)]
Merge stable into master (#34008)
Errant [Sun, 22 Dec 2024 08:21:53 +0000 (09:21 +0100)]
2024-12-20 Release "HoLoopad Holiday" (#34007)
Errant [Sun, 22 Dec 2024 08:02:55 +0000 (09:02 +0100)]
adjust eshotgun recharge delay (#33996)
PJBot [Sat, 21 Dec 2024 07:03:11 +0000 (07:03 +0000)]
Automatic changelog update
Leon Friedrich [Sat, 21 Dec 2024 07:02:04 +0000 (18:02 +1100)]
Update engine to v238.0.0 (#33980)
PJBot [Sat, 21 Dec 2024 06:46:54 +0000 (06:46 +0000)]
Automatic changelog update
Leon Friedrich [Sat, 21 Dec 2024 06:45:48 +0000 (17:45 +1100)]
Toolshed refactor (#33598)
* Content changes for engine toolshed PR
* add contains command
* more permissive commands
metalgearsloth [Sat, 21 Dec 2024 05:08:39 +0000 (16:08 +1100)]
Update submodule to 237.4.0 (#33976)
metalgearsloth [Sat, 21 Dec 2024 04:54:11 +0000 (15:54 +1100)]
Implement some field-level deltas (#28242)
* Update GasTileOverlayState
* Update DecalGridState
* Update NavMapState
* poke
* poke2
* poke3
* Implement field deltas for guns
* Content done
* Update
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
PJBot [Sat, 21 Dec 2024 03:29:53 +0000 (03:29 +0000)]
Automatic changelog update
JustinWinningham [Sat, 21 Dec 2024 03:28:46 +0000 (19:28 -0800)]
Wood walls from barricades (#33902)
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods
* Fixed construction instructions for wooden wall
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods
* Fixed construction instructions for wooden wall
* fixed linter error
* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml
Reasonable suggestion
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml
spelling error
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* removed ability to build wall from 'junk' wood barrier'
* fixed ability to pry overlay barricades and not allow them to extend to full wood walls
* renamed incorrectly named entity
* fixed default entity graph so as to not complain for unit tests
* corrected my incorrect assumptions and fixed destroy cost
---------
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
PJBot [Sat, 21 Dec 2024 02:15:15 +0000 (02:15 +0000)]
Automatic changelog update
ScarKy0 [Sat, 21 Dec 2024 02:14:08 +0000 (03:14 +0100)]
Increase syndicate uplink discount amount to 6. (#33950)
* Increase uplink discounts from 3 to 7
* nevermind, 6
PJBot [Fri, 20 Dec 2024 22:35:50 +0000 (22:35 +0000)]
Automatic changelog update
pocl v [Fri, 20 Dec 2024 22:34:44 +0000 (17:34 -0500)]
Diona chirping & Nymph vocals (#32511)
* Adds chirping to adult diona
* Added vocals for diona nymph
* Nymphs now have a speechsound
PJBot [Fri, 20 Dec 2024 22:16:46 +0000 (22:16 +0000)]
Automatic changelog update
lzk [Fri, 20 Dec 2024 22:15:40 +0000 (23:15 +0100)]
Add description of tool qualities to entity (#32436)
* Add description of tool qualities to entity
* LMAO I FORGOT FUCKING FTL FILE
* minor cleanup
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
PJBot [Fri, 20 Dec 2024 21:39:33 +0000 (21:39 +0000)]
Automatic changelog update
AverageNotDoingAnythingEnjoyer [Fri, 20 Dec 2024 21:38:27 +0000 (00:38 +0300)]
Nanotrasen, Syndicate factions are now hostile to Dragons and Carps (#32515)
* Weh
Weh
* Now hostiles too!
Added Dragon to hostile factions for Hostiles
* Nah
Better not do this, I think
PJBot [Fri, 20 Dec 2024 21:28:04 +0000 (21:28 +0000)]
Automatic changelog update
beck-thompson [Fri, 20 Dec 2024 21:26:56 +0000 (13:26 -0800)]
Add clearer defib cooldowns! (#31251)
* First commit
* Fix silly test
* Swiched stuff up
* Update Content.Shared/Medical/DefibrillatorComponent.cs
* remove unneeded visuals
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
PJBot [Fri, 20 Dec 2024 20:36:01 +0000 (20:36 +0000)]
Automatic changelog update
CaptainMaru [Fri, 20 Dec 2024 20:34:53 +0000 (01:34 +0500)]
All hostile turret (#33970)
* All hostile turret
* Other factions are now hostile against "all hostile" too
Errant [Fri, 20 Dec 2024 18:51:03 +0000 (19:51 +0100)]
combine licence files for StationEvents audio (#33972)
* merge licence files
* actual commit
* whoops
PJBot [Fri, 20 Dec 2024 16:18:20 +0000 (16:18 +0000)]
Automatic changelog update
VideoKompany [Fri, 20 Dec 2024 16:17:13 +0000 (20:17 +0400)]
Fix communication console menu (#33655)
fix Communication console
PJBot [Fri, 20 Dec 2024 14:37:03 +0000 (14:37 +0000)]
Automatic changelog update
Piras314 [Fri, 20 Dec 2024 14:35:54 +0000 (09:35 -0500)]
Remove Clearly Nuclear on Author's Request (#33971)
Revert "New Nukie Song (#25765)"
This reverts commit
806c0d162fffa41b47596f1a4d8c03e72c2ff7a9 .
metalgearsloth [Fri, 20 Dec 2024 11:51:17 +0000 (22:51 +1100)]
Add MovementSound (#31313)
Mainly useful for medicalborg so you can get a looping sound and not footsteps playing over and over.
Didn't actually update medborg because footsteps need updating.
Not needed for AI.
IProduceWidgets [Fri, 20 Dec 2024 11:36:23 +0000 (06:36 -0500)]
add man-o-war shuttle (#32105)
manowar
chromiumboy [Fri, 20 Dec 2024 10:51:00 +0000 (04:51 -0600)]
Minor fixes for the holopad (#33969)
Initial commit
github-actions[bot] [Thu, 19 Dec 2024 21:51:28 +0000 (22:51 +0100)]
Update Credits (#33865)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
August Sun [Thu, 19 Dec 2024 20:02:35 +0000 (14:02 -0600)]
Fixes/removes borg spawnpoint from Oasis Engineering, added one to Robotics (#33960)
removed borg spawnpoint from engineering, added one to robotics
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
ArtisticRoomba [Thu, 19 Dec 2024 19:55:41 +0000 (11:55 -0800)]
Update Fland for holopads (#33962)
* update fland for holopads
* fix duplicate holopad name
TytosB [Thu, 19 Dec 2024 19:26:14 +0000 (13:26 -0600)]
Loopstation hotfix (#33958)
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
PJBot [Thu, 19 Dec 2024 17:22:37 +0000 (17:22 +0000)]
Automatic changelog update
Plykiya [Thu, 19 Dec 2024 17:21:27 +0000 (09:21 -0800)]
Fix: Update armor crate description (#33414)
Update armor crate
chromiumboy [Thu, 19 Dec 2024 17:20:20 +0000 (11:20 -0600)]
Tweaks for the holopad (#33928)
* Initial commit
* AIs get a warning when trying to answer long distance calls
* Better handling of ending telephone calls
* Fixed issue with duplicated holopad window when an AI answers a summons
* Changed how ranges are handled, added the bluespace holopad
* Bug fixes
* More bug fixes
* More bug fixes
* Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Prototypes/Entities/Structures/Machines/holopad.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
LevitatingTree [Thu, 19 Dec 2024 16:44:48 +0000 (20:44 +0400)]
Remove plushie_lizard_mirrored.png (#33855)
* Remove plushie_lizard_mirrored.png
* Remove from meta.json
* Replace mirrored state from yml
---------
Co-authored-by: LevitatingTree <None>
PJBot [Thu, 19 Dec 2024 11:32:19 +0000 (11:32 +0000)]
Automatic changelog update
Centronias [Thu, 19 Dec 2024 11:31:13 +0000 (03:31 -0800)]
Logic Gate Compatibility with Non-Logic Signals bugfix (#33792)
:)
SpaceLizard [Thu, 19 Dec 2024 10:15:48 +0000 (05:15 -0500)]
Food Container Size Increase (#33842)
* Stuff
* hehe
* moar.
PJBot [Thu, 19 Dec 2024 09:39:31 +0000 (09:39 +0000)]
Automatic changelog update
TytosB [Thu, 19 Dec 2024 09:38:22 +0000 (03:38 -0600)]
New mid pop station: Loop (#33697)
* 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
---------
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
ArtisticRoomba [Thu, 19 Dec 2024 05:13:01 +0000 (21:13 -0800)]
Omega Power Rebalance (#33956)
* fix packed power
* Revert "fix packed power"
This reverts commit
4f44d0673e0a597bea39c594f5b7ace3069433ea .
* fic the entire thing again
ArtisticRoomba [Thu, 19 Dec 2024 03:48:14 +0000 (19:48 -0800)]
Packed Power Rebalance + Gas Sensors Adjustments (#33955)
* fix packed power
* fix that
* fix that as well
* even more fixes
* fix power, again
ArtisticRoomba [Thu, 19 Dec 2024 01:05:06 +0000 (17:05 -0800)]
Meta Power Rebalance + Gas Pipe Sensors, Holopads (#33949)
power fixes, sensors, dim lights
Southbridge [Thu, 19 Dec 2024 00:52:46 +0000 (19:52 -0500)]
Amber Statio - Localized Holopads and Balance Updates (#33948)
* Added loc versions of holopads to Amber, and made some adjustments given Acorn's feedback
* fixed the name of the gameroom
* Fixed it in the map file