0a603f4b4d2e3974330f0f4cc4c4cd09c8185fac
72 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Red
|
7298e14de7 |
Upstream stable sync (#1558)
* Adjust uplink buy button to be under item icon (#38596) * Adjusted uplink buy button to be under item icon * Put the discount subtext under the icon * Indent fixes, added margin --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Automatic changelog update * More guidebook fixes (#38699) * First commit - Resolving a few different pages, fixing typos and updating spellings and phrasing to be more coherent. * More slight changes * Reverting slightly the salvage page change * Fixing Science wording inconsistency * Few other small guidebook fixes - Updating NukeOps page to properly refer to "Corpsman" rather than "Agent". - Typo and slight wording change in Traitors.xml. - Updating small typos in Antagonists.xml and Zombies.xml pages. * Automatic changelog update * Fixes missing underwear FTLs (#38720) * Validate `ShaderPrototype` IDs (#38728) * Convert all shader prototype string literals to protoids in overlays * Convert more shader prototype literal strings to protoids * Convert ValidatePrototypeId to ProtoId * Later * Janitor Tool: Wire Brush (#38667) * Wow! It's -brush- * spacing. * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fixed changes --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664) * fixed * clean up * orks fix smart * review fix 1 * more requested changes * less cursed * more descriptive description * better wording * Automatic changelog update * Tiny Tiny Cleanup of the EyeClosingSystem. (#38734) Update EyeClosingSystem.cs * Typofixes for figurine dialogue (#38737) * Typofixes for figurine dialogue * Forgot two * fix: Use PredictedQueueDel for gib spell (#38729) * Fix human skin tone distribution (#38701) * fix: don't default to uncharged sprite state for cells (#38730) * Fix Hristov description - remove inaccurate technical specs (#38746) - Removes inaccurate 'armor piercing 14.5mm shells' reference - Replaces it with a more funny description, matching the style of the other snipers and guns - Keeps ammunition type '.60 anti-materiel ammo' specification - Fixes issue #38590 Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br> * Validate `ProtoId`s in tests (#38745) * Convert string literals to protoids in Content.Tests * Convert string literals to protoids or consts in Content.IntegrationTests * Fix linter failures Tricksy static using misled me * Validate remaining `ProtoId` strings (#38747) Validate remaining ProtoId strings * feat: allow mopping evaporating puddles (#38743) * Automatic changelog update * Cleanup warning in StomachSystem (#38748) you did not see this * Vox scars (#38592) * Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl * Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl" This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15. * locale key fix * Changed top surgery scar names to be more generalized * Adjusted face scars * Formatting fixes --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Automatic changelog update * UnlockNode command to LEC. (#38751) * commit * Update UnlockNodeCommand.cs * commit * move command locale to its own file. * Update Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fix: spellbooks can have infinite charges (#38376) * fix: spellbooks can have infinite charges * refactor: indicate infinite spellbook charges with null Not sure if I like this much better... * Automatic changelog update * Minor escape menu UX improvements (#38650) * Automatic changelog update * Meta.json cleanup - pins.rsi (#38781) cleanup * Log an error when adding an admin log containing a null char (#38782) * Log an error when adding an admin log containing a null char * Also log LogType and LogImpact * Remove them * Fix incorrect conditions on black pepper's forced cough (#38783) no one to blame but myself Co-authored-by: iaada <iaada@users.noreply.github.com> * Update Credits (#38786) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Fixing incorrect headset being given to QM visitor (#38785) * Stasis bed cleanup and bugfixes. (#38762) * Stasis bed sent to shed * Code Review * Code Review 2 * Automatic changelog update * Cleanup warnings: CS0414 (#38793) Cleanup * Move moth movement modifiers to the Base (#38795) * fix centcom pda (#38796) * Catchable items, playable basketball (#37702) * catching * fix * improve * fix linter * cleanup * fix prediction * do the same here * fix comment * Automatic changelog update * Fix storage voice control bug after handssystem refactor (#38810) * Automatic changelog update * Reducing the amount of space in the gogo hat (#38808) Reducing the amount of space in the hat from 7*4 to 4*3 to make a bit more sense with the fact it is only a hat. Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Automatic changelog update * Golden pai (#38549) * Golden pai * Make golden PAI public and rare * Golden PAI = legendary salvage * Automatic changelog update * Cleanup: Remove ``TelephoneComponent.RequiresPower`` (#38823) * Cleanup * Forgot about yml * Branded lighters addition (#35514) * newlighters * port complete * donk pocket box addition * should fix test fail, proper credit * captalisation issue * fixed * typo corrected * removed accidental change to combat bakery * fixed lock message, made NT flippo start fueled. * Requested changes * fixed discount dan * moved matchbox * requested changes, discount dan more broken than ever (somehow) * unbungle * uhhhhh * maybe fixes? * changed inheritance * fixed enum? * nevermind * finally fixed * breaking changes * inheritance unbungled * Automatic changelog update * Cleanup: Remove ``TryInsert`` method from the ``DisposableSystem`` and use event subscriptions instead (#38819) Cleanup * JumpBoots Attempt №2 (#36862) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: unknown <wainzor1337@gmail.com> Co-authored-by: ScarKy0 <scarky0@onet.eu> * Automatic changelog update * Replace `ValidatePrototypeId` uses with `ProtoId` or `EntProtoId` (#38814) * The easy ones * For certain values of easy * Easy test * Hair * Fix sandbox violations * Sort usings * Fix SSD sleep misprediction (#38831) init * New science unlock: the H.A.R.M.P.A.C.K (#38824) * Automatic changelog update * Fix: Add cluwne translation in ftl (#38835) Fix * Artifact glue reagent (#38670) * a * Revert "a" This reverts commit 2b9ba4ea67a9395d30b7ab37c8065f627f1a961a. * f * dev it * a? * ad * forgor * Revert "f" This reverts commit 39228c7cbe4d28ba43b73580b55e01c3979eb869. * derandomisation! * reviv * flavor * fixe * dwwasdwasdwa * dwasdwasdwas * fuck you * Automatic changelog update * Contraband category fixes (#38698) * Adding contraband to some items missing it - This includes updating contraband to follow more consistently where items are expected to be used - Fixing the spacing in arrays to be more consistent with other files * Updating PPD to be Eng contra * Automatic changelog update * Added Vox Heterochromia (#38595) * Added Vox Heterochromia * Forgot to change moth to vox * minor formatting fix --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Automatic changelog update * Make mopping predicted (and some other stuff) (#38749) * refactor: move puddle evaporation + absorbents to shared * refactor: move SolutionRegeneration to shared * refactor: make AbsorbentSystem visuals clientside * style: general formatting/cleanup on touched files - Few logical simplifications - Add field for hard-coded sparkle effect ent - Switch stuff to Entity<T> No actual prediction fixes in this commit (though in retrospect I should've done this commit last). * fix: use predicted variants for predicted code * fix: average out evaporation rates in mixtures * refactor: move SolutionPurge to shared * style: Basic SolutionPurgeComponent field cleanup * fix: general prediction + timing + networking fixes - Moves client side visuals back to shared because other players exist - Don't accumulate CurTime in Purge/RegenerationSystem - Network the next update field in Purge/RegenerationSystem to deal with UI mispredictions??? * fix: add udder bug workaround Not needed for SolutionPurgeSystem which doesn't resolve solutions (probably fine that SolutionPurgeSystem doesn't cache since it's much rarer, though it probably should), and likely not needed for AbsorbentSystem since it only resolves against puddles which, I don't think can be in containers. * fix: don't divide by zero for evaporation speed = 0. * refactor: revert evaporation changes Will cherry-pick these out in another PR. Also reverting the evaporation speed bugfix since it's easier to revert all at once. :) * fix: component cleanup; autopause fields, use ProtoID * fix: remove unused AbsorbentComponentState * fix: ProtoId is not string * refactor: move PuddleSystem.UpdateAppearance to shared * style: general PuddleSystem.UpdateAppearance tweaks - Switch to Entity<T> - Use ProtoIds - Minor simplifications * fix: add udderly silly PVS workaround * cleanup * fix --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fix: Register OnRequestMovePulledObject under the right system (#38484) * fix: Register OnRequestMovePulledObject under the right system * nukeops test flake * fix: correct ToggleableVisuals for toy sword and pirate helm (#38867) * Fix lingering ghost roles (and expand tests to catch it) (#38788) * Improve and expand `TakeRoleAndReturn` to fail on bug #38292 * fix #38292 and expanded test cases * use validated EntProtoIds for tests remove unusued using declarations * use const strings that match the TestPrototypes * Automatic changelog update * Fix non-humanoid mobs being destroyed on devour (#38087) * Allow non-preference living things to be added to a devourer's stomach * Fix ordering of devour logic * Minor refactor for whitelist on storage and food preference * Fix linter issue * Coerce workflow to run again; also fix bad indenting error * Code review changes * Automatic changelog update * Prefer file-scoped namespaces in `.editorconfig` (#38879) Prefer file-scoped namespaces in .editorconfig * Parroting Parrots part 1: Help maints! SQUAWK! Maints! (#38243) * parrots have ears. add poly * high tech parrot functionality * adjust times * add accent to radio message * don't spam everything all at once probably * learn about the existence of prob(float) * actually use Prob(float) correctly * newline * add pet spawner for poly * move chance to talk on radio to component * missing comment * minor edits and doc additions * the reviewerrrrrrr * parrot can't learn when crit or dead * increase default memory * rename poly to polly * crude way to ignore whispers. chatcode please * This is Polly. It is set to broadcast over the engineering frequency * add missing initialize * add displacement map for parrot ears * review comments - Errant * minor things * large rework * fix attempting to talk when entity has no channels * use list of active radios again to track channels * fix bad return, some comments * fix long learn cooldown * minor adjustments * use FromMinutes * the voices told me to make these changes * remove default reassignment * Review changes * remove polly's accent * decouple radio stuff from parrotsystem * minor stuff * split vocalization and parroting * minor review work * re-add missing check * add admin verb for clearing parrot messages * minor action icon update * oops * increase icon number text size * Admin erase parrot messages associated with players * part 1 beck review * add whitelist and blacklist for parrots * Downgrade missing component error to warning * Add comment * add some missing comments * Remove active radio entity tracking, use all inventory slots * Minor changes * small review stuff * review radio stuff * swap ears displacement to invisible death displacement * remove syncsprite * vscode why do yo have to hurt my feelings * review changes * use checkboth * Automatic changelog update * Predict RepairableSystem (#38886) * commit * Update SharedRepairableSystem.cs * compo * final touches. * Update RepairableComponent.cs * Update RepairableSystem.cs * Update Content.Shared/Repairable/RepairableSystem.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out (#37959) * Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out * Missed one * Missed another * Fix data field ids * Fix yaml linter and misc errors (#37444) * Fix yaml linter * Revert "fix cluwne pda pen slot (#35611)" This reverts commit |
||
|
Red
|
5020be8ec6 |
Add supports for different skillpoints types (#1581)
* Refactor skill points to support multiple types Reworked the skill point system to support multiple types (e.g., Memory, Blood) instead of a single experience cap. Added CP14SkillPointPrototype, updated skill storage and UI to handle per-type points, and adjusted related logic and prototypes. Updated localization and assets to reflect these changes. * oopsie * Update human.yml * Update CP14SkillUIController.cs * Refactor skill storage to use skillPoints config Replaced 'experienceMaxCap: 0' with 'skillPoints: Memory: max: 0' in Skeletons T1, T2, and undead mob prototypes. This change standardizes skill storage configuration and improves clarity. |
||
|
Ed
|
36d3ba35d1 |
Replace SharedStatusEffectsSystem with StatusEffectsSystem
Updated references from SharedStatusEffectsSystem to StatusEffectsSystem in spell and magic weakness systems to use the correct status effects system implementation. |
||
|
Deserty0
|
edb6560cae |
fix client spam from magic (#1547)
* fix * 123 |
||
|
Red
|
5b4440d18d |
Merge pull request #1516 from crystallpunk-14/ed-08-07-2025-shader-sea
Status effect spells |
||
|
Ed
|
3f7bb1f5c6 | ADAPTATION | ||
|
Red
|
af0a502dab |
Alchemy furnace integration (#1489)
* furnace integration + fix gates * fix * d |
||
|
Red
|
777c5f9a29 |
Electromancy magic branch (#1485)
* basic electromancy tree * electric strike * Update CP14SpellProjectile.cs * fix throwing |
||
|
Red
|
ecadfb3ea5 |
Big content update (#1484)
* Add investigator's cloak entity and sprites Introduced a new investigator's cloak for senior investigators, including its entity definition and associated sprites. Also updated helmet sprites for the guard role. * Add Investigator job to CP14 roles and assets Introduces the Investigator job, including English and Russian localization, job prototype, loadout, play time tracker, and status icon. Updates department and role loadout configurations to include the new job. Enables setPreference for Guard and Guard Commander jobs. Adds Investigator job icon and updates related metadata. * Rebalance mana splitting spell parameters Reduced mana cost from 15 to 10, adjusted mana change effect, and updated spell event to use a toggleable action with new cast time and distance threshold. Also changed visual effect colors for the spell impact. * job spawner * remove mana splitting from mana glove * Update tools.yml * reduce memory points to 0.5 for tier magics * Add CP14 spell to create beams and extend beam system Introduces CP14SpellCreateBeam, a new spell effect for creating beams using the shared beam system. Adds a virtual TryCreateBeam method to SharedBeamSystem and overrides it in BeamSystem to support shared spell functionality. * athletic branch refactor * second wind skill * minor fixes * remove skeletons specific spells * small magic splitting * Update migration.yml * clear references * guidebook species update, -0.5 people memory, innate athletic to carcat, nerf night vision * disable guards again |
||
|
Red
|
36d0692bf8 | fix dash (#1482) | ||
|
Red
|
81e044758f |
Magical vision skill (#1467)
* fix firewave error spamming * basic magic traces entities * Add magical vision system and mana trace entities Introduces the magical vision mechanic, including the CP14MagicVisionComponent, marker entities, and related systems for tracking and displaying magical traces. Adds new actions, skill integration, localization strings, and icons for magical vision and trace markers. Magic traces are now spawned on spell use and mob state changes, with directional pointers and localized descriptions. * Show time passed for magic vision markers Adds a display of the time elapsed since a magic vision marker was spawned, using a localized string. Updates English and Russian locale files with the new 'cp14-magic-vision-timed-past' entry. * aura imprints * Update critical and death messages for inclusivity Revised the 'critical' and 'dead' messages in both English and Russian locale files to use more inclusive language, replacing references to 'magical creature' with 'someone'. * Move magic vision spawn on mob state change to server Transferred the logic for spawning magic vision markers on mob state changes (Critical/Dead) from CP14SharedMagicVisionSystem to CP14AuraImprintSystem. This centralizes the event handling on the server side. Also increased the duration of magic vision markers for spell usage from 20 to 50 seconds. * Integrate magic vision with visibility mask system Added a CP14MagicVision flag to VisibilityFlags and updated the magic vision and religion systems to use the visibility mask system. Magic vision markers now use the Visibility component, and visibility is refreshed when relevant components are added or removed. Removed client-side toggling logic in favor of server-driven visibility. * drowsiness overlay * noir shader * sfx design |
||
|
Red
|
44ba300a91 | serverization??? (#1457) | ||
|
Ed
|
63a1d60c6a |
Add dash range limit to dash spell and system
Introduces a maximum dash range to the dash system and spell effect, clamping the dash target if it exceeds the allowed distance. Updates configuration fields and prototype YAML to support the new range parameter. |
||
|
Red
|
8d984b7670 |
Dash (#1445)
* dash basic logic + predict spell casts * dash * Update kick.yml * Update CP14SharedMagicSystem.Checks.cs |
||
|
Ed
|
f0e0339c68 | boilerfix | ||
|
Ed
|
93966e37d4 | actions refactor apply | ||
|
Ed
|
ed1d9aca25 | Update CP14SharedMagicSystem.InstantActions.cs | ||
|
Ed
|
62cd6bfe9b | Merge branch 'master' into ed-10-06-2025-upstream-sync | ||
|
Red
|
b24ec5bc80 |
Bugfixes (#1432)
* fix #1428 * CodTenAlt review * fix map tests * real this time * fix #1429 * add wheat and cotton into victorian gardens trade faction * Update PostMapInitTest.cs |
||
|
Red
|
04f6627e16 |
Lumera patron (#1427)
* mind upgrade works only on followers * wrath of lumera, removing memory points * enable lumera for players * add lumera to maps * job desc update * guidebook |
||
|
Red
|
7760e8f628 |
God part 4 (#1422)
* projectile spell improve * mind improve |
||
|
Red
|
fc0beb5ccf |
Gods part 3 (#1421)
* apprice action, dead notice * fix refollowing * mist lumera action |
||
|
Red
|
422a0c5e10 |
Gods and religions (#1405)
* basic religion vision * block god interactions * skill tree mob specify * silvania setup?? * clustering shader optimization * gods department & job * random gods jobs * Luxian god * Update Nature.png * Update sphere_of_light.yml * god chat * Update ChatSystem.cs * OBSERVATION * public observation and basic follower api * shader tweaks * improve shaders * spawning and praying on altars * altars ppvs override * move pvs overridiation from altars to observers * shader coloration * spectral z mover * god magic radius restricted * guide how to believe in god * sends messages to god when smoeone wanna become follower * follower doAfter * goodbye luxian, welcome lumera * goodbye silvania, welcome merkas * som polish and renamings * gods fast travel * Update altar.ftl * some lumera sfx * renouncing patrons! * renounce followers * followewr percentage calculation * remove from player-facing * fix * Update sphere_of_light.yml * Update base.yml |
||
|
Ed
|
c0f4098ca9 | spell fixes | ||
|
Red
|
581ca2f5ef | OP Ballades (#1372) | ||
|
Red
|
71527bb4eb |
Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web
Spider content update |
||
|
Ignaz "Ian" Kraft
|
33bb537f81 |
make heat and freeze work on reagents (#1314)
* make heat and freeze work on reagents * has to run before AdjustTemperature * implement suggested changes * almost missed this edge case * 0k is the limit * cleanup |
||
|
Red
|
40246e9b13 | Merge branch 'master' into ed-12-05-2025-upstream | ||
|
Ed
|
132d1db37b | search of life spell (#1273) | ||
|
Ed
|
1551f2fb6d | Update CP14SharedMagicSystem.cs | ||
|
Tornado Tech
|
ad2fc18356 |
Dimensional (#1140)
* add: Temporamancy tree with new shadow swap spell * feat: Increased tempo loadout to 2 * feat: Remove most popups from swap spell * fix: Swap with no mob entities * feat: Add CanCast to spell effect * fix: Handeling cancaled event & swap state * feat: Add UseCustomCastConditions * feat: Add swap to magic shadow staff * feat: Add tempo essence & magic type * feat: Add Tempo type to all dimension spells * fix: Magic shadow staff tempo manacost modify * fix: Spell type local * feat: Add touhou lore * fix: Review * feat: Add target dead block component * feat: Remove checking access * feat: Add RequireCanInteract * feat: Remove essence * fix: Review * fuck * fuck part 2 * Update Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs * Update dimension.png * minor nitpick * fix --------- Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Ed <edwardxperia2000@gmail.com> |
||
|
Ed
|
cff9dc6fcf |
Wendigo renamed to Lurker (#1213)
* Добавлены изменения для создания пулл реквеста * Update Step.yml * rename! * fix * interrupting toggleable spells |
||
|
Ed
|
e968c7a9b8 | wendigo tweak | ||
|
Ed
|
517bc5418b |
Wendigo demiplane antag (#1174)
* wendigo * ritual3 * Update sky_lightning.yml |
||
|
Ed
|
eaf9c009c1 |
Slimes mob (#1049)
* import sprites * pipia * 3 slime types * Delete generic_magic_effects.yml * Update scrolls.yml * demiplane integration * Update fire.yml * Update crystals.yml * local * Update fire.yml * fix AI stuck * Update base.yml * loot * Update mobs.yml |
||
|
Ed
|
c06323374f | fix sun inside storage | ||
|
Ed
|
0b5712ce97 |
Vampire antag (#988)
* new blood types * vampire systems setup * death under sun * vampire blood nutrition * alerts * autolearn skills * base bite actions * suck blood spell * polish * Update blood.yml * unshitcode * vampire hunger visual * nerf speed * hypnosis + map update * darkness demiplane warning |
||
|
Ed
|
9a787bc7b8 |
Thaumaturgic alchemy refactor WIP (#955)
* essences thaumaturgy refactor * migrate structure crystals * shard migrate * bruh * fix migration * fixes * 1 combining * Create essence_brewing.yml * Update magic.yml * stack essence support * FUCK THIIA ALL, DELETE ALL * redesign counter spell * Update precurser.yml * magic splitting solution * precurser splitting * Praecantatio * Update cleaner.yml * add potions recipe * fuck alchemy guidebook * guidebook update * fixes * energia fix * Update migration.yml * fixes * Update Alchemy.xml * fix * medium vial * fixes? * Update essence_combining.yml * Update target_effect_creation_water.yml * alchemist Comoss update * Update closets.yml * mana opertion glove * Update migration.yml * Update vials.yml * Update GuideReagentReaction.xaml * try to fix * manual migration * Update comoss_d.yml * fix * manual migration 2 * precursor admixture * Update heater.yml |
||
|
Ed
|
aed7e0994a | pax bard (#943) | ||
|
Ed
|
ba901d5e0e |
Crystals Update (#925)
* portal frame * resprited sharpening stone * portal frame entity * darkness -> dimension magic type * thaumaturgy platforms, some refactor * magic energy refactor * Update AirlockPryingTest.cs * transfering tweaks * fixed magic manipulation |
||
|
Ed
|
3e26334c53 | healing bard spell (#938) | ||
|
Ed
|
7d6d02c523 | throw spells now detach embeddables | ||
|
Ed
|
a2fa880820 | bugg ice shards and add it to loadouts (#899) | ||
|
Ed
|
909dc36158 |
Spells content (#897)
* modifiers * counter spell, and 2 new spell scrolls * Update magical_acceleration.yml * Update T0_counter_spell.yml |
||
|
Ed
|
88c1569266 |
Unique artifacts (#859)
* unique artifacts * Update demiplane_keys.yml * shadow staff * fixes * rename solution * Update CP14UniqueLootSystem.cs * try fix * Update CP14UniqueLootSystem.cs |
||
|
Ed
|
558c199a29 |
Fix spells (#853)
* fix kick * fix some spells * Update ice_ghost.yml |
||
|
Ed
|
b5eb3a3dc1 |
Kick stamina spell (#844)
* kick spell * kick fix |
||
|
Ed
|
35303d7d80 |
Guildmaster 2 spells (#842)
* merge movement and gate magic types into darkness new * demiplane infiltration spell * Update CP14SharedDemiplanSytem.cs * finish * locale |
||
|
Ed
|
403344fd46 |
Ice spectre mob + jobs playtime requirement increase (#806)
* increase roles playtime requirements * ice spectre |
||
|
Ed
|
f298396fe4 |
Upstream sync (#786)
* Box Station - Dechristmassified (#34135)
* dechrismassified
* removed camera from shower
* Marathon Station - Dechristmassified (#34136)
* dechristmassified
* further dechristmassified
* Loop Station Decal and maints additions (#34103)
* 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
---------
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
* Rename cryobed yml file (#34134)
renamed cryopod.yml to cryogenic_sleep_unit.yml
* Cog update (not very merry) (#34144)
removed christmas merry
* bagel update (#34145)
* Add hair pulato (#34117)
* add sprite pulato
* update
* add pulato hair
* add pulato hair
* add pulato hair
* update meta "pulato"
* Automatic changelog update
* Holopad UI tweak for incoming calls (#34137)
* Initial commit
* Update
* Comment correction
* Minor margin increase
* Holopads no longer log broadcasted speech and emotes in the chat (#34114)
Initial commit
* Automatic changelog update
* Fixes borgs not being able to check their laws in crit (#34133)
* fix
* fix2
* Add contraband parent to laser gun safe (#34132)
* Automatic changelog update
* Add Holopad Circuit Board to A/V Communication Technology (#34150)
Added the holopad circuit board to the AV Communication technology and circuit imprinter lathe.
* Automatic changelog update
* Fix disposal signal routers sprites (#34139)
* Fix disposal signal routers sprites
* Remove old shitcode
* Automatic changelog update
* Meta station overhaul (#33506)
* added mail, moved some things around, and fixed a lot of APCs
* fixed my mistakes
* Fixed a few mistakes and AI camera names
* Redid south medbay and more wiring
* Finished sci overhaul, and fixed all issues that I could find.
* rebuilt botany, removed vox box, fixed all known issues.
* Overhauled security
* Minor commit as I prepare to update my copy
* Rebalanced role counts
* Final changes, ready for review!
* Emisse and other people fixed issues with the station
* Finalized changes (for real this time)!
* Standardize shotgun ammo in storagefills (#34156)
shotgun ammo changes
* Automatic changelog update
* meta update (#34158)
* Amber Station Adjustments (#34126)
* Made a couple fixes to various decals, cleaned up some entities, gave the clown their bag and the bartender a handlabeler
* Several changes, more cameras, lighting fixes, adjusted hydro a bit, gave sec a bunch of shutters
* Added new random spawners for science and added them to Amber
* fixed the science spawners and modified amber slightly
* Fixed the random instrument entry
* Fix friendly vent spiders (#34153)
Swapped order of parents for MobGiantSpiderAngry
* Removed UseDelay component from RCD (#34149)
* Automatic changelog update
* Decrease hp for rusted walls (#34043)
* Automatic changelog update
* FIX: Thief beacon doubled steal targets (#33750)
* Automatic changelog update
* remove nukemass song (#34066)
* Automatic changelog update
* Corrected all ghost role names to title case. (#34155)
* Corrected all ghost role names to title case.
* Removes full stop from Hamlet's title.
* Updated ghost role names not in the main ghost roles .ftl
* Two capitals corrections
* Packed Update (Remove Christmas & New Evac) (#34168)
* Packed update (remove christmas, new shuttle)
* Fix invalid
* the voices
* Omega Update (Remove Christmas) (#34174)
omega soap
* Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.
* Fixing some missed references
* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).
* Corrected description back to "Irish Cream"
* Removed non-entities from migration.yml
* Automatic changelog update
* Bugfix for the AI player's eye getting stuck when their broadcast is interrupted (#34093)
Initial commit
* Speech is relayed by holopad holograms (#33978)
* Initial commit
* Corrected a field attribute
* Make JPEG a PNG (#34176)
Make 3.png a PNG
* Removed Undesirable Ion Storm Verbs (#34175)
* Remove Undesirable Laws
* empty
* added basic admin logs for PDA notekeeper notes (#34118)
* added basic admin logs for PDA notekeeper notes
* formatting
* added new LogType 'PdaInteract' and changed PDA notekeeper logs to it
---------
Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
* Automatic changelog update
* Sprites defined for all non-generic computer boards. Added new syndicate computer board sprite. (#34104)
* Defined sprites for non-generic computer boards. Added new syndicate computer board sprite.
* Added new sprite to meta.json and updated attribution.
* Reformatted module.rsi meta.json to match other meta file styles.
* Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board.
* Corrected indentation spacing for currently edited entities.
* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
* add pr link to attribution
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
* Added pricegun sound (#34119)
added pricegun sound
Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
* Automatic changelog update
* Separate Tables n' Counters (#32673)
* Update tables.yml
* Remove Extra base: state_
* Update tables.yml
* Automatic changelog update
* Add Chameleon PDA (#30514)
* V1 commit
* Remove PDA name and unnecessary pda state
* Adds PDA to Chameleon backpack & thief toolbox
* Change to use AppearanceDataInit
* Add basic PDA state to ensure there's always a sprite before AppearanceData can be applied
* Revert PDA name (this will be changed to another way later)
* Update PDA name updating to new system
* Fix yaml, and fix Agent ID chameleon
* Updated based on review
* Automatic changelog update
* Add some ion storm actions to replace removed ones (#34180)
* Add some ion storm actions to replace removed ones
* Remove other country references, replace
* Some more tuning of the storm values, removing real-world countries
* boldy basics
* Automatic changelog update
* Amber Station and Science Spawner Tweaks (#34187)
* Modified science spawners a bit since I realized including maints loot was undesireable
* Linked Medical doors to buttons, redesigned the floor of the dining area a bit, placed more science spawners
* Somehow I overlooked that I was importing the maints loot table instead of the sci loot table
* Gave sci an EOD closet
* named the evac shuttle
* Core update (#34201)
add
* Elkridge Depot (The station formerly known as Cell) (#34085)
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs
* updated PostMapInitTest.cs to include Cell
* added psychologist spawn
* fixed scanner console link, fixed disposals conveyors, and more
* added janitor service lights, maints firelocks, and more
* added more fun maint rooms
* improved head offices, kitchen, psych. added maints between science and arrivals
* fixed spawners placed over solid objects
* added unique evac shuttle, the Cilium
* evac shuttle is now orientated correctly
* added unique cargo shuttle
* updated kitchen area
* renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel
* general last-minute touch-ups around the bridge and sec
* changed station name in PostMapInitTest.cs
* Add Elkridge Depot into Map Rotation (#34206)
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs
* updated PostMapInitTest.cs to include Cell
* added psychologist spawn
* fixed scanner console link, fixed disposals conveyors, and more
* added janitor service lights, maints firelocks, and more
* added more fun maint rooms
* improved head offices, kitchen, psych. added maints between science and arrivals
* fixed spawners placed over solid objects
* added unique evac shuttle, the Cilium
* evac shuttle is now orientated correctly
* added unique cargo shuttle
* updated kitchen area
* renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel
* general last-minute touch-ups around the bridge and sec
* changed station name in PostMapInitTest.cs
* added Elkridge to default map pool
* added myself to map_attribution.yml credits
* Automatic changelog update
* Packed Update (#34208)
Packed Update (decals mostly)
* Apply forensics when loading with an ammo box (#32280)
* Automatic changelog update
* Update Credits (#34220)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Fix rainbow lizard plushie inhands (#34128)
* fix rainbow plushie inhands
* address requested changes
* attribute sprites
* wielding refactor/fixes (#32188)
* refactor wieldable events
* fix inconsitency with wielding and use updated events
* wieldable cosmetic refactoring
* Update Content.Shared/Wieldable/Events.cs
Co-authored-by: Centronias <charlie.t.santos@gmail.com>
* real
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Centronias <charlie.t.santos@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* Automatic changelog update
* Lobby chat width and custom lobby titles (#33783)
* lobby name cvar
* panel width
* skrek
* server name localization fix
* comment format fix
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* remove redundant newline
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* string.empty
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
* use SetWidth
* Update Resources/Locale/en-US/lobby/lobby-gui.ftl
---------
Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Automatic changelog update
* Adds bullet collision to station lights (#34070)
Adds collision with bullets to lights
* Automatic changelog update
* Oasis Update (#34245)
santa is keel.
* Amber Station - Minor Fixes (#34246)
* Moved the stand clear decal in front of the janitor's shutters up two pixels
* added tech maints under most maints doors, fixed power issues in cargo, and fixed a couple minor issues
* Make station anchor hitbox less insufferable (#34217)
* Automatic changelog update
* Remove kessler and zombeteors gamemodes from the secret pool (#34051)
* Remove kessler, zombeteors gameodes
* Probably should keep the protos in case an admin wants to torture players secretly
* address slart review
* Automatic changelog update
* Added distinct ad and bye chatter to Dr. Gibb vending (#34182)
* Added distinct ad and bye chatter to Dr. Gibb vending
* Correcting revert mistake
* Changed ad pack names to better match naming convention
* Implement approved rule changes (#34233)
* Special reagents now appear in the guidebook (#34265)
* Special reagents now appear in the guidebook
* Improved guidebook wording for reagent category
* Automatic changelog update
* Implement approved rule changes (#34233)
* Fix compilation errors in tests from update (#34272)
Required for https://github.com/space-wizards/RobustToolbox/pull/5590 to not cause compile fails, but can be merged on its own
* Fix portable scrubber appearing powered on spawn (#34274)
* [HOTFIX] Fix chameleon PDAs renaming IDs (#34249)
Fix chameleon PDA
* [HOTFIX] Fix Meta station power (#34256)
* hotfix meta power
* fixed AME
* add missing cargo shuttle pilot console to cargo
* Update vessel_warning.ogg (#34263)
* Update vessel_warning.ogg
Remove DC offset and apply short fade out.
* Update attributions.yml
* Update attributions.yml
* Add bleating accent to goats (#34273)
* Automatic changelog update
* Happy New Year (#34288)
happy new year
* Amber Station - Balance Improvements (#34294)
changed the center area in med bay to a garden, weakened meteor shielding in some areas, also general touch ups around the station
* Fixed Loop Station's southern solar array unlinked airlocks (#34296)
Fixed Southern solar external airlock door bolts
* Fix empty lines in adminwho with stealthmins. (#34122)
Don't print newline if admin is hidden.
* Automatic changelog update
* Added missing cameras to Loop Station (#34308)
* Added missing cameras
* Added missing cameras
* Amber Station - Fixes and Warm Lights (#34324)
* 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
* Automatic changelog update
* change locking to use ComplexInteraction (#34326)
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Automatic changelog update
* Drink titles and soda vendor consistency (#34178)
* Made capitalisation of proper names consistent.
* Roy Rogers is presumably a proper name.
* Second pass at distinguishing proper names only.
* Two nitpicking/minor changes
* Fixed some overlooked can brand names. Matched case with descriptions.
* Switched generic sodas with brands for SodaInventory
* Removed commonly available branded cans
* Matched case consistency used elsewhere. Minor SPAG corrections.
* Added "nothing" and some missing alcohol bottles to RandomSpawner
* Added distinct ad and bye chatter to Dr. Gibb machines.
* Revert "Added distinct ad and bye chatter to Dr. Gibb machines."
This reverts commit f90b8a470556de05aca81255db8b6b03596ae944.
* Revert "Removed commonly available branded cans"
This reverts commit 43b82168dac1f73b187b7677f34ecdd33b6bb81a.
* Revert "Switched generic sodas with brands for SodaInventory"
This reverts commit f1790f0ce61ef135c79068de6a741e8bb50d85d3.
* Lowercased DrinkGlass suffix. Moved alcoholic drinks from drinks to alcohol.
* Renamed energy drink to Red Bool. Corrected and added some jug descriptions.
* Added reagent names for all bottles except poison-wine
* Revision of title case for cocktails
* SPAG and fixed the only brand reagen with unbranded name.
* Possibly controversial, shortened some bran names to better fit the UI.
* Fixed some inconsistencies in naming
* Matched brand localisation change
* Two name style edits
* Fixed Smite bottle name
* Minor, punctuation
* Blank line to end of file
* Upgraded descriptive names to title case
* Banana Mama
* reverts change, moved to another PR to avoid conflict.
* Removed caffeine reference.
* Minor, corrected some more inconsistencies
* Removed Bottle of Nothing from random spawner.
* Automatic changelog update
* Fix access configurator debug assert (#34330)
* fix
* greytide fix
* fix admin log
* Dirty
* Renamed water melon juice to watermelon juice (#34341)
* Fix battery charging stopping just short of being full (#34028)
* Add copy threshold button to air alarms (#34346)
* Automatic changelog update
* Oasis updoot the dimmining (#34347)
updooty
* Fland Station - Dirt Fix (#34352)
Fland
* Omega Station - Dirt Fix (#34353)
omega
* Marathon Station - Dirt Fix (#34354)
* Marathon
* Rerunning tests
* Cog Station - Dirt Fix (#34355)
Cog
* Box Station - Dirt Fix (#34356)
Box
* Bagel Station - Dirt Fix (#34357)
Bagel
* Packed Station - Dirt Fix (#34351)
* packed
* Rerunning tests
* Replace some sound PlayEntity with PlayPvs (#34317)
* Fixed Forensic Gloves to be Security Contraband (#34193)
* added BaseRestrictedContraband to forensic gloves
* moved from id to parent
* Automatic changelog update
* add large instruments to the cargo request computer (#34240)
* added the church organ to the cargo console (will add more in this PR, assuming i did this right (HOW DO YOU BUY CARGO ORDERS IN DEV ENVIROMENT???? *sobs))
* added other structure instruments to cargo Catalog
* fixed an epic copy/paste fail
* changed prices
* fixed epic copy/paste fail #2
---------
Co-authored-by: TeenSarlacc <baddiepro123@gmail.com>
* Automatic changelog update
* Fix crayon losing durability on stamped paper (#34202)
* Automatic changelog update
* Adds a border to Oppenhopper poster (#34219)
* border
* Update meta.json
* Update Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Trim trailing newlines from examine messages (#33381)
* Trim trailing newlines from examine messages
* TrimTrailingNewlines -> TrimEnd
* Add a popup message when ghost Boo action does nothing (#34369)
* fix ghost_component.ftl locale grammar (#34372)
fix ghost component locale grammar
* Let ghosts sometimes make certain devices say creepy things (#34368)
* Add SpookySpeaker component/system
* Shuffle Boo action targets before trying to activate them
* Add SpookySpeaker to vending machines
* Fix chatcode eating messages starting with "..."
* Add SpookySpeaker to recycler
* Oops
* Decrease speak probability for vending machines
* Add spooky speaker to arcade machines
* Automatic changelog update
* Add directional escape pod sign (#34367)
* Make indestructible tiles not breakable by explosions (#34339)
* No more Ai Spacing
* Move guard into earlier guard statement
* Automatic changelog update
* Arachnid stomach organ yaml fix (#34298)
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
|