Conversation
(cherry picked from commit 3439b77023f2308154ee1e51e1c8b046a6f33a49)
* No more Ai Spacing * Move guard into earlier guard statement (cherry picked from commit cfb23174ed06403389fb2f4ccc37c2d9a788e38f)
(cherry picked from commit 458d3ffccb0c9e3791c7010c8f680d244a0b8b72)
Arachnid stomach yaml fix Arachnids had their stomach `updateInterval` set to 1.5, 50% slower than normal. But this doesn't actually slow down the speed that the stomach digests things, only the rate at which it updates to check if enough time has passed. (See https://github.com/space-wizards/space-station-14/blob/23f0b304f284d2600cb2c6b4c9d36fdca7f99ec4/Content.Server/Body/Systems/StomachSystem.cs#L57 ) This PR changes arachnid stomachs to have a `digestionDelay` of 30 (20 is default) to achive the desired effect. Stasis beds are also bugged in a similar manner. They are intended to slow down the digestion speed, but similarly all they do is change the update rate. But fixing that requires actual code changes and is out of scope for this commit. (cherry picked from commit 2fcfc824b4199643a9511ad498b4c0ae1d9ff9e4)
(cherry picked from commit d5ce3e85fb58ef5564201768002551fe7a7e6966)
(cherry picked from commit afd5ce39ed49344eeb3f9ee8760d3a2aa65d116c)
(cherry picked from commit 6be4fba7929c634597e99c00d591a7c6a95ffe1f)
(cherry picked from commit 1c315ba033d03bab518469389379bfb83a1e5541)
(cherry picked from commit 3da354304d79ce21e0ea0ff4406fc695f3d92051)
* mindcomponent namespace * wip MindRole stuff * admin player tab * mindroletype comment * mindRolePrototype redesign * broken param * wip RoleType implementation * basic role type switching for antags * traitor fix * fix AdminPanel update * the renameningTM * cleanup * feature uncreeping * roletypes on mind roles * update MindComponent.RoleType when MindRoles change * ghostrole configuration * ghostrole config improvements * live update of roleType on the character window * logging stuff and notes * remove thing no one asked for * weh * Mind Role Entities wip * headrev count fix * silicon stuff, cleanup * exclusive antag config, cleanup * jobroleadd overwerite * logging stuff * MindHasRole cleanup, admin log stuff * last second cleanup * ocd * move roletypeprototype to its own file, minor note stuff * remove Roletype.Created * log stuff * roletype setup for ghostroles and autotraitor reinforcements * ghostrole type configs * adjustable admin overlay * cleanup * fix this in its own PR * silicon antagonist * borg stuff * mmi roletype handling * spawnable borg roletype handling * weh * ghost role cleanup * weh * RoleEvent update * polish * log stuff * admin overlay config * ghostrolecomponent cleanup * weh * admin overlay code cleanup * minor cleanup * Obsolete MindRoleAddedEvent * comment * minor code cleanup * MindOnDoGreeting fix * Role update message * fix duplicate job greeting for cyborgs * fix emag job message dupe * nicer-looking role type update * crew aligned * syndicate assault borg role fix * fix test fail * fix a merge mistake * fix LoneOp role type * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Roles/SharedRoleSystem.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * comment formatting Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * change logging category Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fix a space Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * use MindAddRoles Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * get MindComponent from TryGetMind Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * move var declaration outside loop * remove TryComp * take RoleEnum behind the barn * don't use ensurecomp unnecessarily * cvar comments * toggleableghostrolecomponent documentation * skrek * use EntProtoId * mindrole config * merge baserolecomponent into basemindrolecomponent * ai and borg silicon role tweaks * formatting Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * I will end you (the color) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * use LocId type for a locale id * update RoleEvent documentation * update RoleEvent documentation * remove obsolete MindRoleAddedEvent * refine MindRolesUpdate() * use dependency Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * inject dependency Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * roleType.Name no longer required * reformatted draw code logic * GhostRoleMarkerRoleComponent comment * minor SharedRoleSystem cleanup * StartingMindRoleComponent, unhardcode roundstart silicon * Update Content.Shared/Roles/SharedRoleSystem.cs * remove a whitespace --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 46d58bf22a071f57efaeb7ad50396c8d86d578e6)
(cherry picked from commit e271a5a59805a1546b7802560596f356ce930688)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> (cherry picked from commit ea0b04a663185d01f730474113e33edb1e2c44c3)
* updates decals * more decal work, more dinginess in certain areas * added decals under doors (cherry picked from commit d9e4ed205679eaddfc7288be73c4e829fd74f52b)
(cherry picked from commit 924f64e979596b4c59b633671d3e6649143d56e3)
… (#34198) air alarm default settings modified for anaerobic crew (cherry picked from commit 8f4c49a41a4c4519b3dc8ad00faf5f918a6c4471)
(cherry picked from commit 83ce982f04835e7889386cd9dac87175ea9b1599)
(cherry picked from commit 7b8d51ceb48adbd2d6d9ad5dcfa84486e8cb492c)
change return to continue Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit ccff52a72f06b369f8c4545dd54e343fd47af23b)
(cherry picked from commit f85f80e0938ecac63a6393014664e945815cc7ec)
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com> (cherry picked from commit 96d913b147f13fb7f7226a65d24c7da6dedf469a)
(cherry picked from commit 9cc76d93bf2f609244ef791eb2a354cf464a58a6)
changed the command checkpoint to a reporters room. (cherry picked from commit 72ddc50142a7a1812d21cc6783e4b593ffd72c50)
(cherry picked from commit 8bc4c35aae39dbdee981542132e40ec035e4a385)
* Darkened Service job interface icons for better contrast * Fixed Botanist job interface icon dark handle hole * Change to new, darker, service color in all resource yml files * Revert Map file service color changes * Use new darker service color on id cards * Revert Service color change in mapping_actions.yml * Revert salvage difficulties service color * Redo service ID and job colors to match advanced palette * Revert all service color yml file changes * Switch icons to use existing service pallete colors from advanced pallete * Update meta.json for darkened service icons --------- Co-authored-by: Erskin Cherry <frobnic8@gmail.com> (cherry picked from commit 91bc1f8cac8b9361ee0f9ae6c0465342ac9796e8)
* Added insuls spawner, time to test * adjusted whitespace since that was causing issues * Update Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit b00bf40e6407da085e4f4a5bbcb9eb73dac3990c)
* resprited manual valves to be colourblind friendly * Update Resources/Textures/Structures/Piping/Atmospherics/pump.rsi/meta.json Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> --------- Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> (cherry picked from commit ac0a8d1f6056ca7dba28979bd0c57bf78a3a6e12)
(cherry picked from commit f2cd615512bebdf8471d392c55f893e08af0f869)
… to match monkey. (#34409) kobold ops have 100 health (cherry picked from commit 182f0c0bcee5c5116a7499f11d20471b87a77ea2)
* Wood wall is now built from barricade congraph and on top of a barricade instead of using rods * APE dragging exploit fix (cherry picked from commit 423e48a9f2eeb1ce3e84d22e734b647026334def)
… (#34045) * Changed SharedDoorSystem.GetColliding() to allow non-LowImpassible mask entities to stay in the door while it closes * Update Content.Shared/Doors/Systems/SharedDoorSystem.cs Clarifies comment of how the mask is used Co-authored-by: Centronias <charlie.t.santos@gmail.com> --------- Co-authored-by: Centronias <charlie.t.santos@gmail.com> (cherry picked from commit 25a01b00b6a58e84de528025207ed4c6f11646e8)
(cherry picked from commit 4a015d133d5f3d28c9f56cd170123de988f2807a)
* Removed highcap from seclite * Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to. * Gave cyborgs back their medcap * Rounded seclite wattage down to 0.5 (cherry picked from commit 993b5c46b5b13349538d89187f3e01025674a761)
(cherry picked from commit 428fcd65a796f6d3fafb49b04cdfe550ed5817ad)
* new empty.ogg * source to tg commit (cherry picked from commit 2f8f536601a48dfa743ea0a012b3784202369d81)
(cherry picked from commit a2df7719b17b1852c38d591d536928abb62c07a8)
* Bandage fix denied animations playing on devices without them * CentComm blast door prototype * CentComm button * CentComm window shutters * CC Updates * Save as grid * Remove an extra detective figurine I like them better in the interrogation room * Remove paramed locker, let pumps shut off * Fix wrong HOP locker prototype (cherry picked from commit b471c1094dbf0eb5aa1a3eb245d1224a30071b21)
(cherry picked from commit 5fb8ebbe61333c280064578efdfee9dc0d6d3d80)
* 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 * decals and maints * aaa * bbb * ccc * cog power setup was bad * made it artsy --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> (cherry picked from commit c917bcc2a90d3b7fada9a6a1ab5c09ab728d01f5)
* Add kitchen access to Bar-Cafeteria airlocks on Cog * Fix merge conflict * Remove mapping changes * Add Glass and Maints versions (cherry picked from commit bf59371656f6584de903df13e6db7d608aadd871)
Update coats.yml (cherry picked from commit a83fd7b916773b72364354a2022e8d0cfb746148)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> (cherry picked from commit 2894f49c4c8e6c9da6142bed49fa53ddf067bcee)
* Make storage implant drop items on gib/removal * Better way * Fix error * Forgotten trash * Cleanup * Unused var * Update Content.Server/Implants/ImplantedSystem.cs Co-authored-by: 0x6273 <0x40@keemail.me> --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> Co-authored-by: 0x6273 <0x40@keemail.me> (cherry picked from commit b09cd1ca8c9cea6710905b58ada9a8e3b40750d2)
(cherry picked from commit c0fcf4b93bba180809879c0759b02d80007f7ff5)
github-actions
bot
added
S: Needs Review
size/M
Contributor
|
RSI Diff Bot; head commit dfcee6e merging into 42cd61a Resources/Textures/Clothing/Neck/Misc/pins.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/ace.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/aro.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/bi.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/gay.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/inter.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/lesbian.rsi
Resources/Textures/Clothing/Neck/Scarfs/PrideScarfs/non.rsi
|
* Added warm lights, placed them around the map, also fixed an issue with the MV wire in the cafeteria * Fixed lv wiring in caf, and adjusted a couple things * Empty commit to force checks to rerun (cherry picked from commit e0b2d000ef86e7169487248cf5cbcb5998a1c7b8)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
1 day late
forgor