merge upstream #640
Merged
merge upstream #640
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* aibot.dmi * box_proxy * aibots.dmi again * minebot
… CereStation (ParadiseSS13#22917) * Consequence of changing Box Disposals far too much * Maybe a stacking machine in these trying times? * 50 stacks from 10, truly a stacking machine buff
* i have come to bargain * oops * oversight fixes and stuff * Uhh I made some mistakes in vscode in commit procedure, so i can't return there. Obligatory webediting * Henri215's review grammar fix Co-authored-by: Henri215 <[email protected]> * this one too * waiter waiter less holotables in my ruin please * oops * i cannot can --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: S34N <[email protected]>
…seSS13#23106) * CPR effectiveness messages now properly reflect effectiveness * Update code/modules/mob/living/carbon/human/human_mob.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Adrer <[email protected]> Co-authored-by: Luc <[email protected]>
Co-authored-by: Adrer <[email protected]>
…utton (ParadiseSS13#23078) * God I love how easy Sean made this * Update code/modules/antagonists/_common/antag_team.dm Co-authored-by: Burzah <[email protected]> * Replaces sound * Contra + Lewc review * Contra review * Update code/modules/antagonists/_common/antag_team.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: Luc <[email protected]>
* Fix crew not in accurate positions in crew monitor * Build and update tgui * prettier format --------- Co-authored-by: Arthri <[email protected]> Co-authored-by: tgui builder <41898282+github-actions[bot]@users.noreply.github.com>
* As bland as ketchup * Update code/modules/food_and_drinks/food/foods/misc_food.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: DGamerL <[email protected]>
Co-authored-by: [email protected] <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
* fixes chat message visibility * review one * There was not a second issue
* Automatically set launched syringes to inject * Implement for normal syringe guns too * Put mech syringe back to draw mode if emptied when shot * Use syringe's defines * Move defines * update paradise.dme * Add comment for defines * do not set RSG syringes to inject --------- Co-authored-by: Arthri <[email protected]>
* Autohiss now properly capitalized * Update code/modules/mob/living/autohiss.dm Co-authored-by: Burzah <[email protected]> --------- Co-authored-by: Adrer <[email protected]> Co-authored-by: Burzah <[email protected]>
…radiseSS13#23091) * markdown to yaml * Small update * Features- Feature Co-authored-by: Contrabang <[email protected]> * discord * added comment to docs * exploit report * better text * Slight edit * suggestions --------- Co-authored-by: Contrabang <[email protected]>
) * preset ringtones * Update tgui/packages/tgui/interfaces/pda/pda_messenger.js Co-authored-by: Ryan <[email protected]> --------- Co-authored-by: Ryan <[email protected]>
* patching up mistakes. * fixes small typo * Fix paper spelling by S34N * changing paper path so it makes sense.
* Morgue tray now updates properly * Return of the guard clause * Send signal upon ghosting/reentering * Correct source for reenter corpse signal * Signals split up, now works with DNR --------- Co-authored-by: Adrer <[email protected]>
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2. - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](browserify/browserify-sign@v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Adds SS loading to title screen * Makes it scroll
…aradiseSS13#22983) * makes the lwap not pierce infinite r_walls * even more comments * better format, resin
) * Bump @babel/traverse from 7.17.10 to 7.23.2 in /tgui Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.17.10 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * please dont kill me, mr bot --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: S34N <[email protected]>
* move 'Jump to Ruin' from an admin to a ghost verb * whoops
…23107) * Converts isHoly into a trait * Moves holy from body to mind * Uncurses the source of curses * Updates source to roundstart trait * Contrabang fixes * Forgot one * Add trait mind helper * Request changed Dgamerr/Contra * Fixes issue * Nullchecks minds
* Added HUD goggles * Added HUD goggles and species variants * Adds HUD goggles with species variants (fixed) * Update code/modules/client/preference/loadout/loadout_general.dm Co-authored-by: Henri215 <[email protected]> * makes hud goggles craftable and adds to vendor * changed dmi name to goggles * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/crafting/tailoring.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Contrabang <[email protected]>
* malicious ontological theological horticulture * Update code/modules/surgery/organs/eyes.dm Co-authored-by: Contrabang <[email protected]> * Fixes CI + undefines defines --------- Co-authored-by: Contrabang <[email protected]> Co-authored-by: DGamerL <[email protected]>
…eSS13#23135) Co-authored-by: Adrer <[email protected]>
…ParadiseSS13#23130) * assigns the item_state var the same color assigned to the icon_state var in the lighter/random/New() proc * fixes the typo in deployable.dm * oops * changed the code in get_part_rating() so that non-full restock values get returned * Changed vending_items.dm so that the vendor restocking unit's description isn't always full * Update code/game/objects/items/weapons/vending_items.dm lewcc suggestion Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Luc <[email protected]>
…e ground (ParadiseSS13#22642) * fixes pdas not being able to have their ids removed/added while on the ground * Update code/modules/pda/PDA.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/pda/PDA.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/pda/PDA.dm Co-authored-by: Contrabang <[email protected]> * bam --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Contrabang <[email protected]>
…3#23101) * Moved ChickenBall to meat.dmi * Placed in Alphebetical Order * Update code/modules/food_and_drinks/food/foods/ethnic.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Wartrooper <noreply> Co-authored-by: S34N <[email protected]> Co-authored-by: Henri215 <[email protected]>
* Rework Syndie Research Base * Fixing * Fixing.. * work you cu- * SPAACE * Pack of changes: - Removed Toilets and replaced them with "Dressing" room. - Added Genetics, because person on discord wished for it. - Placed Atmos pipes (scrubbers and supply) * Changes: - Added Pathing for ed209 (syndicate) - Removed random_spawners custom spawner made before. - Added "security" room with allow you to control turrets and see all base cameras. * Fixing turret control panel * Fixing turrets.. again * huh? * Changes: - Decreased Beacons amount from 20 to 10 (they give same path, just less stops). - Added special room to "store" ed209 syndicate, if you want to activate it: View Variables -> patrol = 1. - Added light switches everywhere. - Added Air alarms and fire alarms everywhere, and made sure there are fire doors to stop potential fires. - Added 2 more areas, Genetics and "control room". * Placed Power Cables. * Added disposals Lets fuckign Gooooo * Changes: - Made button from drive actually open doors and shoot stuff to toxin range. - Added emergency PACMAN generator, in case someone join late and whole base will be de-powered. - Added CCTV to caves, now you can see intruders. * Added 2 more boxes of plant disc. * Changes: - Added new variant of free drobes, now syndicate can get drip for free. - Added "hidden" safe at vault with contain 10000credits and stethoscope nearby to help, its only for syndicate researcher, if explorer steal it, they should get bounty on them by syndicate. - Added a lot of vendors refilling units, to make sure that you cannot run out by "accident". * Changed Toxin Test arena to indestructable walls. * Bunch of Changes: - Replaced "grenade casings" (with are foam grenades) with new created "Foam Grenades Box" so its more oblivious what it is. - Added paper note near PACMAN Generator with contain basic instruction how to use it. - Added missing fire doors for "drooms". - Added fire extinguishers EVERYWHERE so syndicate OSHA will be happy. - Changed "genetics" room, now instead of supporing 4 people, it support now only 2 in exchange for "faster" DNA researching. - Added "Foam Grenades Box" around base and in storage, so if there any breaches just throw kanu- grenades at them. - Named and connected disposal to "toxin launcher" so now you can disposal your constractions inside. - Added 4 buttons for "Chemical" testing room (with is not for explosives) so now you cannot get trapped inside. - Made special disposal Ride for genetics "monkeys" to turret so they will be killed (its made this way to avoid researchers spacing themselfs allowing them to escape) - Increased Toxin Storage room, by increasing oxygen and plasma tanks amount by tanks 2 each. - Moved AIR container to engine, now they are replaced with "tank container" to storage... custom plasma mixes without destroying main plasma containers. * fixes * Changed Genetics: - Now genetics layout got changed, now instead of supporting 4 genetics people it only support 2 in exchange for more efficency in making DNA syringes. - Now you can dispose bodies for turrets to shoot holes trough... its funny. * Added Mirrors to dressing room- And Fixed hallway curve * Made cryo and sleepers face themselfs * Added RPD for toxin launcher room - now if you run out of valves, you can just "spawn" new ones. * Used merge conflict fixing tool - and for *some* reason it keep showing merge conflict? (whot) * Requested changes: - Replaced NT machine with syndie cigarette machine. - Removed random blueshield note. - replaced syndie donk machines to secured variant. * Changes full build consoles to unbuild. * Fixes: - Fixed storage, somehow one rack with mats got exaporated. - Added tachyon-doppler array for tracking explosion size. - Removed duplicated buttons from toxin mixing room. - Removed console and placed in storage. - Storage now have items with offsets so they are more visible in stack pile. - Removed Air alarm from toxing testing arena, considering it dont have pipes. * Add RPD in toxing mixing * batch of fixes (?) - Changed Art vendor and critter care to free variant. - Fixed spelling on paper to requested one. - Now syndicate researchers spawn with 100 credits in their backpack for claw machine, if you run out, ask your coworkers to borrow more cash on game. * batch of changes: - Did most requested changes by S34N (except defib one) - Added APC to hallway, so now hallway use power too. - Made new subtype of syndicate APC's with offset depending on direction. * fix stripes issue * Removed random stripes and syndie having cash
* test * good * floorbot rename * normal + layers done * UPDATE_OVERLAY * Sprites done * indentation * color gone * fix * spacing * Spacing
…radiseSS13#22732) * you've got mail * fixes to server load issues * contra
* update issue templates * Modern! * adds required text for required fields * make this logical * inclusivity for all types of issues, not just bugs * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * Apply suggestions from code review --------- Co-authored-by: DGamerL <[email protected]>
* Adds the tech them a lesson objective. * minor changes * SPACING! * onesmallupdate * requestedchanges * requestedchanges
* the power of the ideal gas law * define R
… wear (ParadiseSS13#23038) * Why wear clothes when you can wear belts? * Converted the ignore_under var into a flag
* Adds soil clumps, which are used to make soil(alternative to sandstone). * Adds soil clump recipe to the biogenerator * Adds the compost bin to the game. Which converts biomass to compost and makes soil from it. * Adds sprites for the compost bin * Adds a recipe for the compost bin(10 planks) * Added interface for the compost bin. * Applying suggested changes to compost bin(redundant condition removal, spell check, auto doc) * Applying suggested changes to soil sheets(initialize, remove empty line) * Changed min and max to clamp where able, removed redundant return, compost recursion stays in convert_biomass(). * Call parent on init * Identation and style changes * Rephrase description * Unauto docing unnecessary bits, clicking with screwdriver no longer an attack, removed redundancies, reordred ui procs and changed ui data list to new format. * Converting plant to biomass is now its own function * removed SOIL define. using path as is instead * Moved the compost_bin-3 sprite up a pixel so it aligns with the rest * Added spaces for readability Co-authored-by: DGamerL <[email protected]> * Moved plant deletion to make_biomass() * Rebuilt tgui * Filled gaps in sprite with mostly transparent pixels to make it easier to click * Rebuild tgui * rebuild tgui * Adds the soil clump sprites back after update * Added Trailing newline to compost_bin.dm check said it's missing * Adds a check for presence of biomass when initializing to prevent unneeded proc call Checks whether a compost bin has any biomass before attempting to compost it. * Adding back compost bin icons * rebuild tgui * Made interface window slightly shorter. from 300 to 200 pixels tall. * Replaced the enough_compost() proc with an if statement in the only place it was used * Replaced the compost() proc and calls to it with process(). * Rebuild TGUI * Removed an unused var, idented a comment, and returned the onhit proc to it's original form * Ran prettier on the compost bin interface file * Wake Up Icon Diffbot * Aw shit, here we go again. * Empty-Commit * Wake up icondiffbot * Last attempt for today * Removed redundant new line from sheet_types.dm * removed redundant new lines and moved the ui procs together. * Changed compost label to Compost * Recompile tgui * Rebuild Tgui * Rebuild TGUI * Rebuild TGUI * Capitaliize the word soil in the biogenerator listing for it * following some suggestions Replaced compost capacity defines with "magic numbers", removed redundant init proc, added spaces around a '-' sign. * Removing a redundant check in the insertion proc. moved the check for the compost bin being full to the end of the loop since I already make one before the loop starts. * Rebuild TGUI * Rebuild Tgui * Update code/game/objects/items/stacks/sheets/sheet_types.dm Co-authored-by: Ryan <[email protected]> * Rebuild TGUI * ReRebuild TGUI --------- Co-authored-by: DGamerL <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: Ryan <[email protected]>
Co-authored-by: Alien <[email protected]>
* Porting whistle from CMSS13 * species variations * lets kill the conflict * adding it back * new whistle sound
Co-authored-by: Adrer <[email protected]>
…o ParadiseSS13-master
github-actions
bot
added
🗺️ Изменение Карты
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Обновляемся до оффов