Merged
Conversation
Save `emergency_elkridge` as a grid (cherry picked from commit ef50219455f19f3139bebfe3ba233658b83cc096)
* fixes some mobs not being able to honk/weh * addresss review (cherry picked from commit ed44f3263f3d070608afe3a42cf41caba9222d61)
(cherry picked from commit 9485cb6eb81f1745e1adfde60f09a3f9414b794f)
welding mask removable (cherry picked from commit 6ed60fecde586439fd9b8735b39e5935326e30d0)
(cherry picked from commit a84b67a68620a9243cfae5a1f1be3bde433368e6)
(cherry picked from commit 6b6dc1366431c5a91d5c08d00849fdf525f59635)
did the dirt thing (cherry picked from commit 6361a121d52a75b0dae737e4839479fd0b4810de)
update job info on spawn (cherry picked from commit 671ab10be219a7f02ca60600b22e9ec7299b3c7c)
* Plasma Station initial commit * Map fixes 1 Expanded science's SMES array Added advanced SMES Redone stamped documents with custom stamps Expanded atmospherics with more storage tanks Added status displays Add missing beacons to solars Replaced the passive gates in science with valves Removed protolathe in engineering Added guitar to CE office Replaced throngler plushie with weh cloak Add a lattice tile outside the atmos burn chamber and storange tanks Added atmos network monitor in bridge * Add cargo and emergency shuttle * Updated maps * Add plasma to map testing list * Map fixes 2 Reworked pipenets to not go under walls Redid salvage and disposals Reworked the bar to include a new bar extension facing the pool Replaced arrivals cryo with an arcade Replaced the toilets in the service plaza with cryo Removed the cryo in dorms Added more details to hallways Redid tools room to include a front desk for the janitor closet Reconnected sci to power roundstart Removed some unideal spawns Expanded the TEG airlock to be 2x3 instead of 1x3 Reduced the size of the SMES bank from 10 to 6 Disabled the plasma miners (downstreams or admins can re-enable them) Replaced illegal maint items * Fixes a 6 pack destroying the universe Ok maybe cracking a cold one with the boys wasn't a great idea. * Map fixes 3 * Quick research assistant fix * Map fixes 4 * Map fixes 5 * webedit go brrrt * Map fixes 6 * Map fixes 7 * Map fixes 8 * Fixes non-existent object It's amazing this game runs at all * Map fixes 9 * update pools * Map fixes 10 * forgot to clear my multitool I love mapping I love mapping I love mapping I love mapping I love mapping * Tweaked player counts * Update population caps Removed population cap of 60 players to make plasma into a highpop map - it's that easy! --------- Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> (cherry picked from commit 04c081719a3d54c2824e2c4dcceff9ce5097958e)
(cherry picked from commit f092ddcb4393240c61921ee8cb68e38a8555d0a9)
* contraband system rework to allow restriction by job, not just department * Fixing detective trenchcoat inheritance * removing unnecessary using declarations * trying to fix testing error by re-adding diagnostics using declaration * removing unecessary dependency, making allowedJobs nullable * Adding all of slarti's requested changes except for the hacky job icon method fix * removing accidental whitespace * choosing to use the non-localized version because we're comparing the string against the AllowedJobs field, and the contraband classes that fill that field are written in english * removing unneeded using dec, fixing nesting logic problem * didn't remove the old nesting, doing that now * using localized job title and localizing the allowed jobs string, removing usages of JobTitle field. Also networked the _jobTitle field instead. * rewrite some stuff * fixes * fix energy pen --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 796f59917283682a9671dcd68fc975f4245afb56)
(cherry picked from commit 1f6e041e05886fdc7f2fe15a079a5a86d1836ef2)
…ty notes in 14 days (#34532) * fix mrp whitelist auto denying people with warning * make headmin requested changes * godo (cherry picked from commit 9950648bbad7e6a7287e0f890e5af55dfc07bba4)
…hout access or when electrified (#34502) * new tips to open doors (throwing PDA/ID, dragging body) * electrified door sprite for players * tooltip to reset AI electrified doors * windoor electrified sprite * highsec electrified visual * increase tip dataset to 138 * corrected square bracket convention in this commit * removed door corpse tip from prior commit (cherry picked from commit 24219cb97b243e96fd5155a155f2819729e2a470)
(cherry picked from commit 14aff1c49d0adfcda7d5fc48229b7203e1f2f5e8)
* blueprint * NitrogenTank * description (cherry picked from commit 0da6a9995aeb7bb7c48ce43074aa5c5e02f11c87)
(cherry picked from commit 1031d2a6c17f160caf7105aac719a67838e66f0f)
fix IdentityChangedEvent subscription (cherry picked from commit ae213066b1adb0bc68742b740b39d7d135e6e679)
…. (#34563) (cherry picked from commit 71c9dfc9ea5ec53333fccf566523dee7556f9e48)
(cherry picked from commit ef24e4b070ab5a4e5a35b77fec3046dcf685d5bb)
(cherry picked from commit ee7f98a1a74946265d3c37a31502d82b26c52766)
…den servers (#34584) (cherry picked from commit 741514968d1f969b5ae98fd5a56f384bc66be2d6)
* Give the chef access to fiber bags * Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> (cherry picked from commit 85da2351c811f794709e89b9b3947b095f353d03)
(cherry picked from commit b4fa49af558ae6aa7afb68e55393d5b69e74243e)
(cherry picked from commit 7db3595fbccf4af0e78dbbcf4fb8722521efe34e)
* pluralize the job name in the contra description * pluralization specific to contraband descriptions (cherry picked from commit 39c17379029488f7639f9179f359fff6c25ae5ce)
(cherry picked from commit f186838544c051d7549edf157a909be491574c60)
* it works! kinda * so it works now * minor cleanup * central button now is useful too * more cleanup * minor cleanup * more cleanup * refactor: migrated code from toolbox (as it was rejected as too specific) * feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame * refactor: major reworks! * renamed DrawBagleSector to DrawAnnulusSector * Remove strange indexing * Regularize math * refactor: re-orienting segment elements to be Y-mirrored * refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button * refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius. * refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters * refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly * fix: enabled any functional keys pressed when pushing radial menu buttons * fix: radial menu sector now scales with UIScale * fix: accept only one event when clicking on radial menu ContextualButton * fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> (cherry picked from commit 68b0dfbc026a07aad2bf3f07d1052f92f899ea31)
(cherry picked from commit 713d4515d689b9984640e5fbab944c0a730b4c6a)
* added missing allow job to the base restricted severity * no need to make a list * no more linq in ContrabandTest * less nesting in ContrabandTest (cherry picked from commit 033f8444baa9719b8f48f62b3516aea8adc4ebc3)
* worn bomb * Update meta.json * Update meta.json (cherry picked from commit f7928371e9c76c41dee8933ef211c946437e4d9a)
(cherry picked from commit 04021498015b093040433a4e165b3ea9885fd7cf)
* Make radioactive material radioactive * Increase the slopes of item uranium No free power for engineering * Glowing uranium * Revert "Increase the slopes of item uranium" This reverts commit 2acbda26 * Nerf Wall Rocks (cherry picked from commit 7168de6a20f30b6293ea425c0d252199fa08bdb0)
(cherry picked from commit 7f02efc858a5fc41f10e8f5f627a27027fa95947)
replace all instances of "department-{id}" with department.name"
(cherry picked from commit 371b1f80125857669f43e2e9f6842dd5513bee6b)
* Renamed sexy clown and mime mask and removed lusty xenomorph poster. * removing odd file changes. not sure why these were edited at all. * gaaaahhh * removed some of the old templates * Renaming sexy mime and clown instances. * removed unwanted gitignore edit * Renaming sexy clown and sexy mime mask and Removing lusty exomorph poster. * Remove lusty xenomorph poster. * reverted changes to maps files, actually. Other contrib is learning, appologies for excessive commits * requested changes * lusty migration removal * dirty hanging whitespace * correct date format comment --------- Co-authored-by: NathanielJ14 <nathanielalbert1202@gmail.com> (cherry picked from commit 2580a21471809584f7e7571e59016673c8f53c4e)
(cherry picked from commit 05ed43fcfce82609b36f5ad8da78f3fb1d25e180)
… (#34612) Moved Cyborg Recharging Cirbuit Board from Lathe to Circuit Imprinter (cherry picked from commit 613e710c76e938cce84adebea0eccb3b3b026e73)
(cherry picked from commit cc2416452020fc6d01d4cd5abac4c46a7f402a56)
THE FLESH IS WEAK (cherry picked from commit 052be81f2ee565cf0712b9041dd96158ebd5fdd2)
(cherry picked from commit 0707ee5fa36602e475fff90449df91e0c64244b3)
* fixed grav gen room, gave atmos room to branch off, replaced AME controller crate with AME controller * added rust to maints, expanded atmos, expanded bar, expanded cap bedroom, fixed some tiles under doors, removed some gamer loot * removed interrogator lamp and some more gamer loot * fixed some more tiles under doors, replaced intercomall with intercomcommand in bridge and vault * added clothing drobes to arrivals, added bin to HoP, more stuff i forgot * i forgot to move the file from /bin to /resources... (cherry picked from commit e1291d035fa551c9ec8aab7af365cbf1839f5438)
(cherry picked from commit d41072849b562b80c0296d0185c48085fe8cffde)
* just works first try * introduce more magic numbers into the codebase * idiot doesnt know the difference between AND/OR (cherry picked from commit ff27555b475af9214b9a5dbccbfd05f22db23d96)
github-actions
bot
added
S: Needs Review
Changes: YML
Contributor
|
RSI Diff Bot; head commit 40d5126 merging into 2d5d118 Resources/Textures/Objects/Consumable/Food/ingredients.rsi
Resources/Textures/Objects/Weapons/Bombs/c4.rsi
Resources/Textures/Objects/Weapons/Bombs/c4gift.rsi
|
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
notable exclusions:
i'll probably take the new drozd sprite and make it a new rifle then add burst/full auto to drozd as a squad support weapon