Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add A Cryosleep Guidebook Entry (#34)
* Merge Upstream 8/11/23 (#25) * Health analyzer UI improve (#17280) * Automatic changelog update * User accessible playtime (#21242) Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Moves cloning comp & cloning event to shared (#21253) * Generalizes solution overflow & slightly increases space lube yield (#21094) * generalize SolutionSpikeOverflowEvent * let reactions overflow * spacelube: 3 -> 5 * restore TryMixAndOverflow threshold cap * Automatic changelog update * Move ActorComponent to shared (#21293) * Update engine to v174.0.0 (#21311) * Fix planet command help message (#21312) * Wearable bee plush (#20623) * add * fix * temporary change, needs fixing * mayb fix * actually fix FR * yes * Automatic changelog update * remove pulse rifle from ert medic (#21310) * Content audio (#20862) * Automatic changelog update * Update submodule to 175.0.0 (#21318) * Revert "Update submodule to 175.0.0 (#21318)" (#21319) * Atomic bomb add uranium (#21143) * fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all armor. * Atomic bomb * Action bugfixes (#21321) * Disable OOC during round (#21323) * Fix PDA notifications when creating a news entry using the Mass-Media console. (#21320) * Automatic changelog update * Update belt.yml (#21317) changes the chief engineer's belt to remove the lv wires (they take up a lot of space and are easy to get anyways) in exchange for a holofan, a t-ray, and a gas analyzer (first time coding ever this might have to be edited) * New foam sprites (edge sprites) (#21308) * New foam sprites (icon smoothing) * changed to edge sprites for foam * fix * edges for metal foams * fix * Fix bola stam damage, bring back old construction requirements (#21340) * Automatic changelog update * Added thermal insulation to flannel jackets (#21273) * Automatic changelog update * Space Asshole Gear (#21243) * Add Space Asshole Coat * Add sledgehammer * Adjust sledgehammer damage values * Add copyright string to sledgehammer * Fix broken slot highlight in midnight theme. (#21331) * Update Patrons.yml (#21344) * Thicken thindow bounds (#21280) * Automatic changelog update * 1984 mouse AI (#21353) * Automatic changelog update * Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176) * Pumpkin textures * Pumpkin prototypes * Jack o lantern prototypes and pumpkin cake * Finishing touches * Arbitrageloose * Restore old pumpkin helmet sprites (God I hope it works) * Update ground_lighting.yml (#21350) * fix fireaxe swing (#21346) * Automatic changelog update * Enable skeletons temporarily for Halloween (#21356) * Automatic changelog update * Storage Standardization [Take 2] (#21270) * Automatic changelog update * Pea Plants (#20504) * Add Pea Plants * Pea soup * Update flavor-profiles.ftl * Update seeds.yml * Add seeds to vendors * Make things more expensive to fix free money exploit * Update textures * Revert "Update textures" This reverts commit b1b7046504afc7468742b0722f601d98684a1c89. Vines dont grow straight into the air. * Shift up 4 pixels * Fuck autofix conflitcs * Shift up 3 more pizels * I finally got byond working so I made sure they were EXACTLY the same * Address Reviews? I think? --------- Co-authored-by: Nemanja <[email protected]> * Automatic changelog update * fix smoke not transferring (#21332) * Automatic changelog update * Fix the organtype (#21347) * Automatic changelog update * mindshield implants (#21269) * Candy Bucket for Halloween (#21257) * Added candy bucket and component to update appearance of held containers akin to it * cleanup newline * newline was load-bearing * moved component to Shared, cleanup * newline is spooky * You build and run without errors, stop pretending otherwise * Updated for new storage system in master branch * make bloodred large size (#21362) Co-authored-by: deltanedas <@deltanedas:kde.org> * Cockroach + Glockroach Admeme + Mothroach (#19752) * cockroach * Update Resources/Textures/Mobs/Animals/cockroach.rsi/meta.json Co-authored-by: lzk <[email protected]> * parenting fixe * d * rsi fail * mothroach!!!! * cockroach vent event + critters in trashcart * linter * fix * commit --------- Co-authored-by: lzk <[email protected]> * Automatic changelog update * Soapy Water & Edible Soap (#20364) * soap reagent and soapy water * make soapy water recognizable * Fix tile cleaning bug CleanDecalsReaction was able to take more than the reactVolume it was given. * make soapy water an evaporating reagent * Tile reactions when mopping * Fix indescribably soap flavor * Adjust soap flavours Soap and soapy water now taste clean and syndie soap tastes like punishment. * Better soap numbers & DeleteOnSolutionEmpty * Changed TrashOnEmpty to TrashOnSolutionEmpty * Last TrashOnSolutionEmpty change * Fix merged code not compiling * Requested changes. * Automatic changelog update * blue blood now requires copper instead of iron to cure bloodloss (#20863) * blue blood now requires copper instead of iron to cure bloodloss * arachnid species now needs copper to cure bloodloss and copper pills added to medkits. * fix puddlesystem proto * remove the cool * no longer uses hastag, instead uses custom heart organ and hasorgan. * fix * Command Styled QM Card (#21368) * Automatic changelog update * Validate PresetIdCardComponent.JobName prototype ids (#21361) * Anomaly Cores (#21306) * add first anomaly core * meme * 5 min to 10 min fix yml * fix * Update doc * no static price * Automatic changelog update * Getting turned to a rev makes the rev antag sound (#21316) * Automatic changelog update * Revert "Enable skeletons temporarily for Halloween (#21356)" (#21385) This reverts commit 4f81a56. * Automatic changelog update * Fix tests fail (#21384) * More Storage Rebalancing (#21373) * the changes... * eek * Automatic changelog update * Mark all tests that restart rounds as dirty (#21376) * Make all prototype types partial (#21374) * Return the nukie hypo (#21391) * hypo * Bag hypo * Automatic changelog update * Makes thieving gloves sneakier (#21398) * Hidden DoAfters * Fix formatting warnings * Hide progress bar and pickup animation * Copy Hidden field in copy constructor * Automatic changelog update * Fix negative tank pressure (#21401) * Automatic changelog update * buff bag of holding (#21411) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * fixed rat kebab parents (#21409) * Automatic changelog update * Makes a syndicate chemvend so they dont have to hack it on nukie planet. (#21416) Adds a few goodies to the vendor's inventories. * fish petting (#21412) * fish petting * evil --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Fix roaches weight to match new system (#21414) * Security Chunk Salvage (#21403) * Security Chunk * More fish, less bullets. * Fix rotation on Moth Head (Moonfly) marking (#21417) * Automatic changelog update * Mind Action Container (#21336) * fix anomaly core size (#21418) * Added a penguin plushie! (#21097) * Fixes A Anomaly Core Description Typo (#21424) * Candles (#21087) Co-authored-by: faint <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: ElectroJr <[email protected]> * Automatic changelog update * microwave can be turned on with signal (#21138) * microwave can be turned on with signal * update prototype * mapinit * init for storage --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * fix hand examine (#21309) * Fix double counting bounties (#21399) * Automatic changelog update * fix borg actions (#21235) * Automatic changelog update * Soap dont have 100% vomit chance (#21428) People using soap spears and darts too often as weapon. It shouldnt have better vomit chance than ipecac * Senior Physician Beret (#21426) * add * fix * Automatic changelog update * Enter mech with drag-drop (#21405) * Automatic changelog update * adjust radiation blockers (#21286) * Automatic changelog update * Fix admin verb PVS issue (#21406) * SO gets sec beret (#21433) * Fix ambuzol zombie damage (#21432) * Automatic changelog update * Fix accidental crayon graffiti when writing on paper (#21445) * Automatic changelog update * Move "id" clothing layer above gloves, shoes, ears, outerclothing, eyes and belt (#21456) * Cleanup chemistry-bottles.yml (#21459) * Update chemistry-bottles.yml * * * fix susbox slots (#21435) * fix unfilled susbox slots * small susbox cleanup --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * wintercoats fit small items (#21463) * Stop mice eating soap (#21446) * Automatic changelog update * give chemistry bag better storage (#21447) * chemistry bag better storage * large beaker and drink bottles are normal size * * --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * (#21470) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Convert license.txt to attributions.yml in misc folder (#21465) * license.txt to attributions.yml * update * Convert license.txt to attributions.yml in Items folder (#21466) * convert main folder file * convert items/medical * convert items/handcuffs * change items/attributions.yml * fix items/handcuffs/attributions.yml * Convert license.txt to attributions.yml in Animals folder (#21471) * convert animals/attributions.yml * fix attributions.yml * Converted weapons license.txts to attributions.ymls (#21444) * converted weapons license.txts to attributions.ymls * Update Resources/Audio/Weapons/Xeno/attributions.yml Co-authored-by: Kara <[email protected]> * Update attributions.yml * Update Resources/Audio/Weapons/attributions.yml Co-authored-by: Kara <[email protected]> * Update attributions.yml * Delete sonniss attributions --------- Co-authored-by: Kara <[email protected]> * hide medibot messages from chat and logs (#21468) * support npc speech being hidden * hide medibot messages --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Adds more sources for sheet paper material (#21364) * Moves sheetifier research unlock from civilian services to industrial * Makes wood insertable into the sheetifier and makes paper a lathable material * Adds a paper crate to the cargo catalog * Adds localizations * Automatic changelog update * Significantly nerf chemvomit and give it a reasonable default. (#21453) * Automatic changelog update * Bicaridine metabolism bandaid (#21443) * Notice board (#21410) * notice board * more notice notice board * Automatic changelog update * Fix erase verb not removing chat messages in some cases (#21355) * Fix erase verb not removing chat messages in some cases * Admin changelog * Fix deleting messages with entity id 0 * Artifact fragments can now stack. (#21232) * it stacks now * Fixed typo * fixes random sprite * fix * sprite change (#21423) * Automatic changelog update * The Mobs of the Living Light (#21338) * The Mobs of the Living Light * fix * sound * radius * minor sprite changes * Automatic changelog update * allow network payload data to inherit nullability (#21327) * Made livestock crates not airtight. (#21315) * Automatic changelog update * Nukeops hud (#21260) * a * a * a2 * syndi visor * left icon * a3 * (#21182) * Automatic changelog update * diagonal window glass and pirate shuttle improvements (#21174) * shuttle and priate improvements * fix * fix damn ubuntu * darkened syndi airlocks * fix * fix ruranium * added prison cell to pirate ship * Use object-spaced bounding boxes for putting stuff in crates (#21427) * Use object-spaced bounding boxes for putting stuff in crates * Use existing _lookup.GetAABB, different component * PR edits updated * Remove unused bits from around GetAABB * Use GetAABBNoContainer * Automatic changelog update * Ice anomaly spawns ice underneath it (#21227) * added TileAnomalySystem to AnomalyIce * added FloorIce for station * created ice crust entity to spawn under ice anomaly * update draw depth for ice crust * uh oh, added ice-sliding but at what cost * resolved mispredicts * updated sprite alpha, removed appearance component (not used) * fixed function not reflecting event name, left datafield attributes blank, added one comment about saving data (?) --------- Co-authored-by: Yurii Kis <[email protected]> * Roller Skates (#20257) * adds roller skates * removed hascomp and changed addcomp to ensurecomp, modified to _random, _stun * remove icon from type: sprite * sorted dependencies * skates no longer added skater component to user, movmeentspeedmodifier and damagehighspeedimpact had access removed. * fixes * fixes * Microreactor power cell research (#21473) * buff microreactor cell and tweak a little * add portable fission research --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Replicate the PDA belt slot sprite in the IDSLOT (#21457) * Adds a sprite for the PDA in the IDSLOT * Update meta.json * Automatic changelog update * add ied (#20966) * MinSolution and SolutionEmpty construction conditions * make ied sprites * add ied * ied crafting stuff * deconstruct give cable yes * fix * tags * tag * 3x3 * sharing is caring * buff damage --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * mech nitrogen filtering 2 (#19868) * target oxygen logic * filter out nitrogen when low on oxygen * vvrw and datafield for everything * * bruh does work * tagless chicken * move into atmos, make it not depend on mech * update mech prototype --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Freelance Radio Channel and Encryption Key (#20904) * Freelance Radio Channel * Freelance Radio Channel * (Reagent) Minor blood and uncooked protein rework (#20891) * Blood makes non-animals take poison damage, and sates animal hunger at a very low rate * Only affects humans, animal restrictions also removed * ignore the other commits, blood and uncooked protein rework! * Humans recieve a popup when they consume these reagents * lower the original damage of uncooked proteins * Change metablizing organs, make blood digest into uncooked protein instead of it having it's own effect * Automatic changelog update * Anomaly Synchronizer (#20945) * added textures and basic prototype without functionality * add full functional * finish work * fix naming * reduce random anomaly spawner offset * Update AnomalySystem.Vessel.cs * Update SharedAnomalySystem.cs * Update SharedAnomalySystem.cs * Update production.yml * fix errors * fix? * Update anomaly_sync.yml * deltanedas code fixes. Thx, deltanedas! * git what * fix yml * fix yml 2 * meh, try again * work, work, work * fix powered checking. now component work also without ApcPowerReceiving * now supercrit port invoke on start growing, not after explosion fix errors * deltanedas fix pack 1 * Update AnomalySynchronizerComponent.cs * Automatic changelog update * Add map info to status HTTP API (#21089) * ninja stun change (#20503) * tagless fields * add damage and paralyze instead of electrocuting * add disable bool to RevealNinja * raise MeleeAttackEvent on the user after swinging * uncloak ninja after attacking * revert RevealNinja bool * revert meleeattack event * revert uncloak * validate shock prototype * damagespecifier no validation * ; * --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Convert ItemSize to prototypes (#21481) * item sizes are prototypes * eek * Automatic changelog update * Port python packaging to Content.Packaging (#21458) * Update submodule to 176.0.0 (#21500) * Guardian bugfixes (#21467) * eek (penis) (#21498) * Fix map renderer (#21515) * Fix Client RoleSystem not inheriting SharedRoleSystem, network job component (#21436) * Lockers for clown, mime and NT Representative (#21504) * clown, mime, blue shield and NT representative now have own lockers. Will it be merged? You`l see it in the next 3-4 days. Stay tuned in. * blue... shield? never heard of him before. * Automatic changelog update * Minor rule change to include disability slurs in rules (#21518) * Revert "Enable skeletons temporarily for Halloween (#21356)" This reverts commit 4f81a56. * Rule modification for slurs * uwu (#21521) * Make the cloning pod and medical scanner fit through verical doors (#21519) * Unfatten the machines * This actually works better * Add method to clear an action's cooldown (#21517) * Automatic changelog update * Speed Boots [Tier 3 Civ-Service] (#21438) * Speed Boots * validate * monkey * Origin Station Update 06.11.2023 (notice boards and gasgiant parallax) (#21492) * Automatic changelog update * No more passive zombies (#21506) * content (#21505) * Allows reptilians to eat crayons, as is their right (#21420) * Automatic changelog update * Fix mob state error (#21431) * Adding damage visuals for directional windows (#21194) * Added a crack overlay for directional windows. Added directional window crack components to windows, reinforced windows, plasma windows and reinforced plasma windows. * Changed the copyright information with the files I actually used. * Updated the copyright further. * Automatic changelog update * Add Spawners (#20495) * Update Robust to v177.0.0 (#21528) * Revert "Convert ItemSize to prototypes (#21481)" This reverts commit 4729024. * Revert storage rebalance * Revert "make bloodred large size (#21362)" This reverts commit 49f0b20. * Revert "fix anomaly core size (#21418)" This reverts commit a96563c. * Revert "Fix roaches weight to match new system (#21414)" This reverts commit 188cbba. * Revert BoH change * Revert new storage * Revert "Candy Bucket for Halloween (#21257)" This reverts commit 74f1098. * Fix item conflicts * More Item Conflicts * Add rules that somehow got removed --------- Co-authored-by: Artjom <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: Repo <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: TemporalOroboros <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: Whisper <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: kerisargit <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: Yousifb26 <[email protected]> Co-authored-by: brainfood1183 <[email protected]> Co-authored-by: Subversionary <[email protected]> Co-authored-by: nmajask <[email protected]> Co-authored-by: Psychpsyo <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Vasilis <[email protected]> Co-authored-by: Doru991 <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: I.K <[email protected]> Co-authored-by: ZeroDayDaemon <[email protected]> Co-authored-by: Bixkitts <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: potato1234_x <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: Nairod <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: liltenhead <[email protected]> Co-authored-by: themias <[email protected]> Co-authored-by: Tunguso4ka <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Fromoriss <[email protected]> Co-authored-by: Alzore <[email protected]> Co-authored-by: elsie <[email protected]> Co-authored-by: CMDR-Piboy314 <[email protected]> Co-authored-by: PursuitInAshes <[email protected]> Co-authored-by: faint <[email protected]> Co-authored-by: ElectroJr <[email protected]> Co-authored-by: TheEmber <[email protected]> Co-authored-by: daerSeebaer <[email protected]> Co-authored-by: TsjipTsjip <[email protected]> Co-authored-by: Guilherme Ornel <[email protected]> Co-authored-by: crazybrain23 <[email protected]> Co-authored-by: RieBi <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: RiceMar1244 <[email protected]> Co-authored-by: cOrigin <[email protected]> Co-authored-by: Nim <[email protected]> Co-authored-by: avery <[email protected]> Co-authored-by: IntegerTempest <[email protected]> Co-authored-by: JoeHammad1844 <[email protected]> Co-authored-by: Christopher Thirtle <[email protected]> Co-authored-by: KISS <[email protected]> Co-authored-by: Yurii Kis <[email protected]> Co-authored-by: LordEclipse <[email protected]> Co-authored-by: Morb <[email protected]> Co-authored-by: Emisse <[email protected]> Co-authored-by: KingFroozy <[email protected]> Co-authored-by: FluidRock <[email protected]> Co-authored-by: Darkie <[email protected]> Co-authored-by: Gotimanga <[email protected]> * Hey look! My changes are back. (#31) * First Push * Adds a GuideHelp to the cryopod to make the entry more visible --------- Co-authored-by: LankLTE <[email protected]> Co-authored-by: Artjom <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: Repo <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: keronshb <[email protected]> Co-authored-by: TemporalOroboros <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: Whisper <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: kerisargit <[email protected]> Co-authored-by: Simon <[email protected]> Co-authored-by: Yousifb26 <[email protected]> Co-authored-by: brainfood1183 <[email protected]> Co-authored-by: Subversionary <[email protected]> Co-authored-by: nmajask <[email protected]> Co-authored-by: Psychpsyo <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Vasilis <[email protected]> Co-authored-by: Doru991 <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: I.K <[email protected]> Co-authored-by: ZeroDayDaemon <[email protected]> Co-authored-by: Bixkitts <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: potato1234_x <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: Nairod <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: liltenhead <[email protected]> Co-authored-by: themias <[email protected]> Co-authored-by: Tunguso4ka <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Fromoriss <[email protected]> Co-authored-by: Alzore <[email protected]> Co-authored-by: elsie <[email protected]> Co-authored-by: CMDR-Piboy314 <[email protected]> Co-authored-by: faint <[email protected]> Co-authored-by: ElectroJr <[email protected]> Co-authored-by: TheEmber <[email protected]> Co-authored-by: daerSeebaer <[email protected]> Co-authored-by: TsjipTsjip <[email protected]> Co-authored-by: Guilherme Ornel <[email protected]> Co-authored-by: crazybrain23 <[email protected]> Co-authored-by: RieBi <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: RiceMar1244 <[email protected]> Co-authored-by: cOrigin <[email protected]> Co-authored-by: Nim <[email protected]> Co-authored-by: avery <[email protected]> Co-authored-by: IntegerTempest <[email protected]> Co-authored-by: JoeHammad1844 <[email protected]> Co-authored-by: Christopher Thirtle <[email protected]> Co-authored-by: KISS <[email protected]> Co-authored-by: Yurii Kis <[email protected]> Co-authored-by: LordEclipse <[email protected]> Co-authored-by: Morb <[email protected]> Co-authored-by: Emisse <[email protected]> Co-authored-by: KingFroozy <[email protected]> Co-authored-by: FluidRock <[email protected]> Co-authored-by: Darkie <[email protected]> Co-authored-by: Gotimanga <[email protected]>
- Loading branch information