master
27 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Ed
|
f84e1ba04d |
Merge branch 'master' into ed-25-08-2025-upstream-sync
# Conflicts: # Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml # Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml # Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml # Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml |
||
|
Red
|
ad46932d11 |
Balance tweaks (#1741)
* disable lurker pulling * fix pack * fix pack * fak pix * vampire objective tweak * buff vampire search * Update air_saturation.yml * fix * fix * Update EntityTest.cs * Update EntityTest.cs * tick * Update EntityTest.cs * remove forkfiltered filter * Update EntityTest.cs |
||
|
Ed
|
b13769a82c | adapt codebase | ||
|
Red
|
3c534069a4 |
Random tweaks (#1701)
* weather overlay offset
* sack head clothing
* remove raid
* less mushrooms, less muhrooms hat
* Update CP14VampireRuleSystem.cs
* Update base_clothing.yml
* fix
* Revert "Update base_clothing.yml"
This reverts commit
|
||
|
Red
|
57a7cb30a7 |
Vampire hotfix (#1696)
* Adjust vampire features and add construction category Increased vampire skill points from 1 to 3 and removed SendOnlyToOwner override. Updated power punch spell: removed cast slowdown, increased paralyze durations, and raised cooldown. Added new construction category for vampires with English and Russian localization, and updated vampire construction recipes to use this category. Reduced furnace recipe craft times from 4 to 1. Cleaned up unused usings in vampire components. * Improve vampire skill popups and clan heart features Added missing popup when no essence is left to gather and improved popup handling for skill point changes. Updated localization for clan progress and essence messages, added WarpPoint to vampire clan heart, and adjusted vampire skill tree structure and UI positions. * Add vampire hypnosis skill and rebalance vampire content Introduces the Hypnosys vampire skill and associated spell, including new status effects and alerts for forced sleep. Adjusts vampire skill tree progression, rebalances bite spell effects, modifies construction recipes to use stone instead of iron, and updates entity drop behaviors. Also tweaks skill point defaults and hunger/thirst effect order for plant growth spells. * Adjust hunger settings and map spawner modifiers Removed baseDecayRate and starvationDamage from Hunger components for NightChildrens, Devourers, and Unnameable in subgamemodes.yml. Updated comoss.yml and venicialis.yml to replace or add spawner modifiers, introducing Boar and Rabbits while removing EnemyFlem, MonsterMosquito, and MobSlimeIce. * Add SSD block to magic system and vampire bite spell Introduced CP14MagicEffectSSDBlockComponent to prevent magic use on SSD (disconnected) players. Updated the magic system to check for SSD status and added localization strings for SSD block messages in English and Russian. Applied the SSD block effect to the vampire bite spell. Also fixed a typo in the PacifiedBlockComponent filename. * Make blood reagents unrecognizable and adjust effects Set all blood reagent variants to 'recognizable: false' to prevent easy identification. Simplified and unified damage effects for blood reagents, removing some specific reactions and adjusting damage groups, particularly for vampire-related blood types. Also fixed a duplicate 'allowedStates' key in the vampire bite spell action. * Enable map initialization and clean up power punch spell Changed map creation in Demiplane and CrashToWildlands systems to run map initialization by setting runMapInit to true. Removed redundant map initialization check in CP14SpawnProceduralLocationJob. Also removed the CP14ActionSpellVampirePower2 entity from the vampire power punch spell prototype. |
||
|
Red
|
906033633e |
Vampire clan battle gamemode (#1672)
* vampire returns + transformstions redo * carcat fangs fix + greetings music update * vampire skill trees * Blood essence gathering Introduces the vampire blood essence mechanic, including the CP14SpellVampireGatherEssence spell, new skill point consumable component, and related UI/localization updates. Adds clientside effects for spell casting, new vampire skill and action, and refines skill point gain/loss popups. Also restructures vampire components, updates spell logic for client/server prediction, and removes unused parallax files. * perma damage * Add skill point cost to magic system and vampire essence spell Introduced CP14MagicEffectSkillPointCostComponent to allow magic effects to consume skill points. Updated the shared magic system to handle skill point checks and consumption. Added a new vampire spell for creating blood essence, including new icons and localization. Adjusted vampire component to grant and remove skill points, and updated related skill tree and spell prototypes. Minor fixes and refactoring in spell logic and descriptions. * blood step + blood vision skills * vampire clans icons * 50 players limit + vampire objectives * fixes * devourers altar transmutation * Remove StealTarget component from animal, dino, and mole NPCs The StealTarget component and associated stealGroup were removed from boar, dinosaur, and mole NPC definitions. This likely disables these entities from being targeted for stealing, possibly to adjust gameplay balance or fix unintended behavior. * fix * essence creation improve * altars * voice masks * transmutation fix * teleportation glyph * crimson candles * candle crafting * fix pointer predictions * Add Vampire Clan Battle gamemode and update vampire roles Introduces the 'Vampire Clan Battle' gamemode with new localization in English and Russian, updated game preset definitions, and secret weights. Refactors vampire antagonist briefings and objectives for multiple clans, adjusts vampire role preferences and team settings, and reduces the damage of the Vampire Gather Essence spell. Also includes minor improvements to spell and game mode descriptions, and corrects file naming for game preset locales. * powerful kicks in * time gates + vampire tree * vampire proto faction * fix * fixes * tree progression * search enemy * Update CP14SharedVampireSystem.cs * blood essence gathering redo * essence gathering refactor 2 * blood healing * Update secret_weights.yml * tree planting * boodgrass * tree upgrade announcement * construction graph integration * delete transmutation system * workbench crafting returns * cloaks crafting + cloak invisibility * make vampire tree is generic red tree (sad) * clan heart sprite * Refactor vampire tree to clan heart system Replaces the CP14VampireTreeComponent with CP14VampireClanHeartComponent, updating all related logic, appearance, and localization. Adjusts skill requirements, examination, and level progression to use the new clan heart system. Updates entity prototypes, visuals, and adds new orb sprites for clan heart levels. Localization strings and logic are updated to reflect the new terminology and mechanics. * Update SpeciesBlacklist.cs * Refactor vampire clan heart and remove tree spell Refactored the vampire clan heart to support essence regeneration over time and adjusted level thresholds. Removed the vampire tree planting spell and related prototype fields, as well as unused tree system code. Updated localization, entity prototypes, and faction definitions to reflect these changes. * Add clan heart construction for vampire clans Introduces construction graphs, entities, and conditions for building unique clan hearts for each vampire clan (Unnameable, Devourers, NightChildrens). Adds new construction conditions (all clan vampires required, singleton enforcement), updates skill tree to unlock constructions, and removes the now-obsolete CP14MagicEffectAllVampireClanRequiredComponent. Also adds new frame sprites and updates localization and prototype files accordingly. * level up vfx * VFX + lobby track * orb resprite * sprites * Add vampire altar mechanics and improve clan heart behavior Introduces the CP14VampireAltarComponent and altar entity, which doubles blood essence extraction when victims are strapped to the altar. Adds a custom explosion behavior for vampire clan hearts upon destruction, updates construction graphs and recipes for altars, and improves localization. Also refines skill description handling and adjusts vampire bite action text. * essence get when heart destruction * Add clan heart damage and destruction announcements Introduces announcements for when a vampire clan heart is damaged or destroyed, with cooldown to prevent spam. Refactors examination logic and updates localization files for both English and Russian to support new messages and sender formatting. * glyph adaptation * resurrection * Add round end summary for Vampire Clan Battles Implemented detailed round end text for the Vampire Clan Battles game mode, displaying victory, defeat, or draw outcomes based on surviving factions and population percentage. Refactored alive player percentage logic into a shared method and updated localization files with new outcome messages in English and Russian. Also removed an unused field from the defence condition component. * Update vampire_cloak.yml * fix * fix * Update portal_glyph.yml |
||
|
Red
|
70bf2e1cf3 | Merge branch 'master' into ed-04-08-2025-upstream-sync | ||
|
Red
|
6b5c27125b |
Gathering resourses redesign (#1594)
* Add Crash to Windlands survival gamemode and map Introduces the CP14CrashToWindlandsRule and its component for a new survival gamemode where a ship crashes into wildlands. Adds the 'nautilus_ship' map, updates English and Russian locale files with new gamemode titles and descriptions, and modifies relevant prototype and map pool files to support the new mode. * fix FTL map * firebombing is real * fix biome dungen all grid overriding * Update PostMapInitTest.cs * Update DungeonJob.CP14Biome.cs * Refactor demiplane generation and crash rules Replaces the old demiplane job system with a new procedural location generation system (CP14LocationGenerationSystem and CP14SpawnProceduralLocationJob). Splits the crash-to-windlands rule into CP14CrashingShipRule (handles explosions) and CP14ExpeditionToWindlandsRule (handles map generation and FTL), with corresponding new components. Updates roundstart game rule prototype and moves/renames several files for clarity and modularity. * Refactor location generation to support optional seed and position Updated the GenerateLocation method to accept an optional seed and position, defaulting to a random seed if none is provided. Adjusted all call sites and the procedural job to support these changes, improving flexibility and consistency in procedural location generation. * procedural integration into game map * Demiplanes deletion * clear demiplane content * remapping procedural + frigid coast deletion * clear demiplane guidebook * dungeons generations * Refactor procedural location configs and add ComossIsland Consolidated and renamed procedural location and dungeonConfig prototypes for demiplane locations, replacing T1-prefixed and legacy IDs with new, consistent names. Updated map YAMLs to reference new location IDs and configs. Added a new ComossIsland location and dungeonConfig. Refactored code to support passing custom dungeon layers and removed unused ExamineProb field from CP14ProceduralLocationPrototype. * Enhance procedural world gen and location configs Improved procedural world generation by adding location generation probability, adjusting level ranges, and refining modifier uniqueness. Updated CP14ProceduralLocationPrototype and CP14ProceduralModifierPrototype, refactored node data generation logic, and made related test and map changes. Added new venicialis_fort station map and updated several procedural location and modifier YAMLs for consistency. * fix * connections room spawners * track finishing global world generation * real connection * Update PostMapInitTest.cs * Update venicialis.yml * Update venicialis.yml * fix raids, decrease city island sizes * Update migration.yml * Update migration.yml * fix shutdowning * Update CP14SpawnProceduralLocationJob.cs |
||
|
Ed
|
e9199b4e77 | fixes | ||
|
Ed
|
3f7bb1f5c6 | ADAPTATION | ||
|
Ed
|
e70e64011f | Update CP14BloodMoonCurseRule.cs | ||
|
Ed
|
23c9e11019 |
Blood moon part 2 (#1272)
* som tweaks * fixing all * bloodlust spell * atatat |
||
|
Ed
|
e0a4f5592f |
Blood moon (#1270)
* some setup * fix dayccle events, add basic gamerules * carcat guidebook update * pfpf * wawa * fnish |
||
|
Ed
|
b66ee390a6 |
Dynamic demiplane weather + farming hotfix (#1131)
* dynamic demiplane weather * add skeleton sprite * hotfix farming * Update wheat.yml |
||
|
Ed
|
edc67dd280 |
Storm nerf (#1107)
* weather lightning nerf * port storm weather to gamerule events * fix |
||
|
Ed
|
abdd46c7d5 |
Random bugfixes and balance (#1088)
* shared magic energy examine * fix #1067 * fix #984 * nerf slimes * fireSpread nerf * slimes demiplane examine + remove whistler |
||
|
Ed
|
1867903c46 |
Planetarization (#1040)
* tiers to level demiplanes * Update demiplane_keys.yml * demiplane on planets * migrate to wizden dayCycle + planetarize Comoss * Update comoss_d.yml * Update audio_music.yml * Update dev_map.yml * add shadows to demiplanes * remove outdated systems * fix silvas * silva fix * Update factoria.yml * Update island.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
|
42627a0c33 |
Random content (#815)
* demiplane crystal sprite update * fix demiplane astral haze vanilla * fix infinity money stacking * rabbits outbreak! * fix meta * fix rga * fix CLRF * move subterranean leap action to actions folder * Update audio.yml * Update natural.yml * restore lzk commit * fix endscreen text * fix goblin displacement, fix #809 * Update kudzu.yml |
||
|
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
|
||
|
Ed
|
fff97fa819 | adapt | ||
|
Ed
|
c21dd891f3 |
Endscreen message + command objectives updadte (#533)
* add simple end screen common goals * finish common objectives endscreen * personal objectives endscreen * Update personal_objectives.yml * new empire objectives |
||
|
Ed
|
08a4c4340d |
Bank implementation (#512)
* get currency refactor * bank work * finish vault markers * add bank doors * map update * loadouts * Update CP14StationTravelingStoreShipTargetComponent.cs * oopsie |
||
|
Ed
|
85463d380f |
Bank preparation (#499)
* TownSend condition * personal objectives update * add common objectives * add common objectives * tweaks * quartermaster and merchant * job spawner icons * add merchants to tavern map |
||
|
Ed
|
08f1aa9fa1 |
Crew goals update (#355)
* randomization goals support * maps update |
||
|
Ed
|
ba03872c57 |
Expedition goals (#318)
* forgot this one * disable dinosaurus * expedition collect objective condition * Update CP14ExpeditionSystem.cs * add expedition objectives * auto-issue of objectives to all expedition participants * delete cp14playtest gamemode * Update CP14ExpeditionObjectivesRule.cs |