-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Explorer Redux #24202
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Explorer Redux #24202
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
S34NW
approved these changes
May 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ship it
Contrabang
requested changes
May 25, 2024
Co-authored-by: Contrabang <[email protected]> Signed-off-by: Marm <[email protected]>
auto-merge was automatically disabled
May 26, 2024 09:59
Head branch was pushed to by a user without write access
This was fixed. |
Contrabang
approved these changes
May 26, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
revert changes in tools/{bootstrap,ci}
SteelSlayer
approved these changes
May 27, 2024
Fordoxia
added a commit
to Fordoxia/CRUNCHParadise
that referenced
this pull request
May 28, 2024
commit f5ca247e0ef926587a8db502773dcd326cb50960 Merge: b819961a52 094d7bd13b Author: Fordoxia <[email protected]> Date: Tue May 28 02:17:36 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 094d7bd13b42c07309efff59e1527291d226385c Author: Сиротка <[email protected]> Date: Mon May 27 22:56:07 2024 +0300 Fix undestrictible armor from attachable armor (#25608) * Fix undestrictible armor from ataacable armor * also fix ash hide comsumption commit 5a68c5f6d3b60ee82c06e0287d1eb8108d2e1fe2 Author: Marm <[email protected]> Date: Mon May 27 20:27:59 2024 +0100 Explorer Redux (#24202) * WE'RE SO BACK * LET THERE BE SOUND * More bugs * fixes * sound * hmm * clothing sprites + minor code changes to clothes * meestake * spritening * YARR * hiss * Cyberiad explorer remap * hand telover * delta days * rooms done * VENDOR * Mapping done * Salvage mapped * qol * Forgot the hivelord. * woops * oops redux * reviews and more * consistency * Update code/game/jobs/job_globals.dm Co-authored-by: Henri215 <[email protected]> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <[email protected]> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <[email protected]> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <[email protected]> * the doorening * redooring * modsuit * more reviews * the plasmamamninigngg * add random salvage generation across space ruins * add blackbox tracking for salvage sold * gun * deconflicts and reviews * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <[email protected]> * all conversations resolved * maybe work now? * please no more, too many apcs * Update code/modules/mob/living/simple_animal/corpse.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <[email protected]> * PDA * conflicts * more conflicts * maybe all conflcits? * wait fuck * maybe fixed??? * KIDAN SPRITES * MAYBE? * access fixes * explorer hotfixes 1: - fixes space pirates dying in space - gives explorers ORM access - box: fixes access on NTR airlock - box: fixes naming on BS airlock - box: adds expedition access to mail sorting room * add salvage selling back * NOT FOR SALE * oh my god actually sell the fucking salvage this time * maybe fine now? * carpover * NO MORE CABLE * balance tweaks * some depot loot updates * merge conflict * deconflicted??? * woops more oversights * skirts, bombers, exploredrobe code + sprites * woops (again) * deconflicting * remove old explorer room again * Hat fix * minor changes to sprites and code for hats * yarrr fix 1 * first fixes * don't drop loot from syndies gibbed by depot destruction * add selling back with new signal based system * speedmerge this shit * minor changes to collars/bomber resprite * docking port in * ruins * WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN * no more murder hallway on whiteship * undelete meson sunglasses, redelete uristrunes * BOOTY BAGS * don't drop ashdrake loot from crusher kills * box: fix ntrep fax, add explorer access to ORMroom * add meson sunglasses item icon back * fix cere handtele, meta shutter control, death sound arg * cleaning up * she mosins on my russian till i dj station * Update code/modules/clothing/head/soft_caps.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Marm <[email protected]> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Marm <[email protected]> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Marm <[email protected]> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Marm <[email protected]> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <[email protected]> Co-authored-by: Christasmurf <[email protected]> Co-authored-by: warriorstar-orion <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]> commit c9f44b1f293826a8a320aff3fb1800f4b05636a8 Author: Сиротка <[email protected]> Date: Mon May 27 19:42:02 2024 +0300 Improve mecha circuit crates to make them useful + few fixes (#25516) * Improve mecha circuit crates to make them useful * fix * Update ripley.dm commit e6d1b5f8a8614d3659654632d2c23941bf3523f0 Author: Qwertytoforty <[email protected]> Date: Mon May 27 12:36:51 2024 -0400 MASSIVE RAZORWIRE BUFF (you can now pick 4 new colour options) (#25463) * MASSIVE RAZORWIRE BUFF (4 new colour options) * Update code/modules/surgery/organs/augments_arms.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 2b9ccda51b90b29c5989eaf4be5251731b090214 Author: Rayforx <[email protected]> Date: Mon May 27 18:35:18 2024 +0200 Proto adrenalin price changes and one use adrenalin (#25475) * Adrenal changes * Update code/datums/uplink_items/uplink_general.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Rayforx <[email protected]> --------- Signed-off-by: Rayforx <[email protected]> Co-authored-by: 1080pCat <[email protected]> commit d107f06ee3ec827ce75e064dcbe2a41896f9b6c9 Author: Qwertytoforty <[email protected]> Date: Mon May 27 11:25:27 2024 -0400 [s] maint drones no longer can endlessly ghost and respawn (#25651) * [s] maint drones no longer can endlessly ghost and respawn * comment improvement * she trues on my false till I 0 commit d38a8f1c9e34ffaa286c8f93f4059a1817558b3b Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Date: Sun May 26 22:15:10 2024 -0500 NanoMap Auto-Update (Mon May 27 01:15:23 UTC 2024) (#25645) Co-authored-by: NanoMap Generation <[email protected]> commit 2f8db520c70b693c58b055705ade230f073386ac Author: PollardTheDragon <[email protected]> Date: Sun May 26 15:42:23 2024 -0400 No! Bad AI! No Tracking on the Research Post! (#25467) commit 2c28b93349577b01465fe157a77e0f6aa7e5dc13 Author: 1080pCat <[email protected]> Date: Mon May 27 00:04:28 2024 +1000 Update boxstation.dmm (#25614) commit a695a0f015d6cad4d4da147a48b83f06bbc12e2b Author: warriorstar-orion <[email protected]> Date: Sun May 26 10:02:47 2024 -0400 fix: VV list display with values that are zero (#25618) commit 8412356b22b111f7c3d3ee5682f8c579101cf7bc Author: Daylight <[email protected]> Date: Sat May 25 21:39:43 2024 +0300 Punctuation (#25627) commit 9d1b4c1b981139dca3c58a0862c08cf95853f3ea Author: DGamerL <[email protected]> Date: Sat May 25 18:37:22 2024 +0200 Heavily reduces explosion smoke amounts (#25517) commit 0420e9a7fb01663dc5f1aa212590af3cd97509df Author: AffectedArc07 <[email protected]> Date: Sat May 25 17:05:38 2024 +0100 Adds CI to verify maps are within 255x255x1 (#25369) * Adds CI to verify maps are within 255x255x1 * Ooops platform agnostic * Webedit to fight autoformat * Time that shit --------- Signed-off-by: AffectedArc07 <[email protected]> commit bd0e54752e29e17ce30260a02a34cdff832a964e Author: CRUNCH <[email protected]> Date: Sat May 25 16:48:22 2024 +0100 Removes the Sheet Snatcher 9000 (#25496) * Yeetus Deletus * removed icon --------- Co-authored-by: S34N <[email protected]> commit b819961a52ccaf982026744cb6617b1a485181a8 Merge: e5e4941732 67a8a340e6 Author: Fordoxia <[email protected]> Date: Sat May 25 14:55:18 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 67a8a340e6468efd775e20166825fa328317c584 Author: AffectedArc07 <[email protected]> Date: Sat May 25 02:43:32 2024 +0100 Fix admin PMs not working from discord (#25604) commit 2e01f3591d248917e92284038aab68449884e1ff Author: Qwertytoforty <[email protected]> Date: Fri May 24 21:42:15 2024 -0400 makes revenants not runtime clicking nearly anything (#25601) * makes revenants not runtime clicking nearly anything * Update code/_onclick/observer_onclick.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: Contrabang <[email protected]> commit 2ea75e81f39f44e0d9c0a6c46c8c63cccbc20088 Author: Charlie Nolan <[email protected]> Date: Fri May 24 18:41:14 2024 -0700 Corrected admin/user names in ticket typing indicator. (#25599) * Reversed admin/user names. * Preserve casing commit 50851d7958d934bfae3eed4cea50b4fc5f7c5f3b Author: Qwertytoforty <[email protected]> Date: Fri May 24 21:18:51 2024 -0400 fix full auto on certain guns with double click speed (#25520) commit d438d5d3be9d84835f3a41a8b2af1fc8f25fc862 Author: Marm <[email protected]> Date: Fri May 24 21:11:01 2024 +0100 spider spider spider (#25492) Co-authored-by: S34N <[email protected]> commit fbfd1bf82af36edae0b3298dd53423c1ba4f1589 Author: PollardTheDragon <[email protected]> Date: Fri May 24 16:08:34 2024 -0400 Gives Golems access to Xenobiology (#25484) commit 624a1261f837bedfcce30c00b98e0d569a0be304 Author: DGamerL <[email protected]> Date: Fri May 24 22:01:27 2024 +0200 Makes adrenals no longer have a chance to addict you (#25479) * A new no addiction omnizine * Adds to the blocked chem list commit a52a54d0dfc8a51eb3b00de9cb39d5ed371c1498 Author: PollardTheDragon <[email protected]> Date: Fri May 24 15:46:14 2024 -0400 Trade Shuttle Console Fix + Standardization (#25466) * Trade Shuttle Console Fix + Standardization * Gets rid of other "Jupiter Station" references on trader spawn area commit 80fb55365a36e8c0c0d7d571113f5d73e9082bb9 Author: Onyxarias <[email protected]> Date: Fri May 24 12:44:45 2024 -0700 Mech Lore Pack - examine_more descriptions for mechs (#25414) * Durand text, test * Test 2 * Test AGAIN * Old Durand * Old Durand 2 * Old Durand 3 * Old Durand 4 * Old Durand 5 * Marauder * Marauder 2 * Marauder 3 * Ares * Ares 2 * Ares 3 * Seraph * Mauler * Mauler 2 * Gygax * Dark Gygax * Dark Gygax 2 * Dark Gygax 3 * HONK * HONK 2 * Phazon * Reticence * Ody * Ripley * Ripley 2 * Firefighter * Death Squid * Death Squid 2 * Apply suggestions from Burza to make punctuation and formatting consistent. Co-authored-by: Burzah <[email protected]> Signed-off-by: Onyxarias <[email protected]> * Adresses Fordoxia's reviews. Updates extended descriptions for Old Durand and Reticence. * Update code/game/mecha/combat/marauder.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Onyxarias <[email protected]> * Update code/game/mecha/combat/marauder.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Onyxarias <[email protected]> --------- Signed-off-by: Onyxarias <[email protected]> Co-authored-by: Burzah <[email protected]> commit 55b257ead86968138f1193af3b33012bcfc0b98b Author: CRUNCH <[email protected]> Date: Fri May 24 20:43:35 2024 +0100 Tweaks Ghetto Surgery (#25439) * very ghetto * Update organs_internal.dm commit 72a5c9e3c7b960f4cc7791bcfd063befb20f72dc Author: Сиротка <[email protected]> Date: Fri May 24 21:32:03 2024 +0300 Now you need alt-shift-click to empty sprays (#25437) commit 2903560dc1f8fa1221d91415cf95ad5f3bf3bf42 Author: Migratingcocofruit <[email protected]> Date: Fri May 24 21:30:45 2024 +0300 Pipe fix/tweak (#25431) * Pipe fixes and tweaks. Allows refilling of pipes using dried plants, removes their ability to conjure nicotine, and applies the May 22, 2015 pipe tweak to cob pipes, and make them start empty(corn has no nicotine). * refilling pipes now sets smoketime * oops * Adding spaces to comments commit d30d122ebe17fc5746ee807e6d1092c2f2eedf57 Author: Deniz <[email protected]> Date: Fri May 24 19:26:49 2024 +0100 tested (#25387) commit 4a1d1f5971b0344f798b32c601ce0519613dadcf Author: DGamerL <[email protected]> Date: Fri May 24 20:25:50 2024 +0200 Contort body now autodisables on death (#25247) * Makes contort body remove itself via signals * Unregisters signal on remove and other fix * Update code/modules/antagonists/changeling/powers/contort_body.dm Co-authored-by: GDN <[email protected]> * Update code/modules/antagonists/changeling/powers/contort_body.dm Co-authored-by: GDN <[email protected]> * Contra review * Contra review --------- Co-authored-by: GDN <[email protected]> Co-authored-by: S34N <[email protected]> commit 9030cfbb61cca109307de298d921ac2799937f49 Author: Charlie Nolan <[email protected]> Date: Fri May 24 10:43:24 2024 -0700 Removed a bunch of unnecessary work from atmos machinery. (#25495) * Removed a bunch of unnecessary work from atmos machinery. * Portable machinery does some useful work in the parent. Reactions, icon updates. --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]> Co-authored-by: S34N <[email protected]> commit 82a1cc6a4ed555caf39aa6ae1cdfe6676262845f Author: Charlie Nolan <[email protected]> Date: Thu May 23 21:42:53 2024 -0700 Revert #25303 and subsequent fixes (#25613) * Revert "Be safe, radios. (#25595)" This reverts commit bfa88abd5a02a64cddd1ca59b47ceb423593bc2c. * Revert "Fixes various radio issues (#25586)" This reverts commit 9296564ab65759f25a9c4221d4db8e18a6ef80b2. * Revert "refactors radios to use proximity (#25303)" This reverts commit 06db6bc004f6ebc47aa71b16332a3dc2a88152c1. * One more bit that needed reverting. * Begone, unnecessary file! --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]> commit 03cca11f953fbb22e8526910a322cbd87724cf1c Author: AffectedArc07 <[email protected]> Date: Thu May 23 20:43:33 2024 +0100 Init Sanity Unit Test (#25442) * Init Sanity Unit Test * Oops * Update code/modules/unit_tests/init_sanity.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: AffectedArc07 <[email protected]> * Makes noticeboard less silly --------- Signed-off-by: AffectedArc07 <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 23ad8a48fa272e7c6b826e571a14adb19bb460cb Author: Luc <[email protected]> Date: Thu May 23 11:46:43 2024 -0400 Adds true observing -- letting you see what your target sees (#24855) * bring it back now y'all * adds a bunch of other changes * pretty much works at this point * grep * Fixes some bugs, still chasing some down * Add observers to recursive mob check, ensuring they can see messages from their orbitted atom * tidy some things up * resolve * remove unnecessary checks * Address todos, minor cleanups * oh dear * initial testing * Fix some vulnerabilities (oops) * Fix some other bugs from testing * ci fixes * Add some contingencies against clicking things you shouldn't * fix some noted bugs * Add observe to admin jump, improve messaging * add a few more fixes that should mostly address some runtimes * oh this wasn't really great * one last thing * Fix suit inventory problem * Remove merge artifact * Add some missing parens * Prevents you from observing other ghosts, and should fix the getting stuck outside of your body issue. * we love testing * adds to player panel * Fix more bugs with observers getting stuck outside of their body * cleans up player panel, verb offerings * shit * Update code/_onclick/hud/alert.dm welp Co-authored-by: GDN <[email protected]> Signed-off-by: Luc <[email protected]> * Fixes some targeting issues * Fixes targeting on aobserve * Fix some weird storage bugs * clean up some doulbed up follow links * Update code/modules/admin/player_panel.dm Signed-off-by: Luc <[email protected]> * Adds some checks for ghost observe * Remove mentor debug log * ahhhhhhhhh that'll do it * Cleans up some additional checks that were not quite what they should have been * better logging, too * mochi review * one more thing * Gets robot huds mostly working * hopefully fix folks not getting observe * Fix order of operations causing a runtime on qdeleting * Remove some unnecessary stack traces * Apply suggestions from code review Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Luc <[email protected]> * Fix bug with items in your inventory disappearing on changing HUD modes * Fix some bugs with the observe verbs * possibly fix nullspace issues * funny review * missed one --------- Signed-off-by: Luc <[email protected]> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GDN <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: 1080pCat <[email protected]> commit 7bf45dce58f8007284c9ffe9e1a831a04ddfaf25 Author: CRUNCH <[email protected]> Date: Thu May 23 12:10:50 2024 +0100 Gives the RCD a unique suicide act (well, 2 or 4, depending on how you look at it) (#24496) * RCD Suicide Time The most suicidal item in SS13 now! * Do not dust the items thanks * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <[email protected]> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <[email protected]> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <[email protected]> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <[email protected]> * code compaction * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <[email protected]> * Update RCD.dm * Update RCD.dm * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <[email protected]> * Update RCD.dm * The worst typo in history Co-authored-by: Henri215 <[email protected]> * Update RCD.dm * missed perception check * Refactor RCD actions. * Death message. * Removes magic numbers * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Makes everything work * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update RCD.dm * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]> commit bfa88abd5a02a64cddd1ca59b47ceb423593bc2c Author: Charlie Nolan <[email protected]> Date: Thu May 23 00:13:02 2024 -0700 Be safe, radios. (#25595) commit 6baa75a5bf1b3fe105ef2af85bb019af61ff0547 Author: chuga-git <[email protected]> Date: Thu May 23 00:54:01 2024 -0500 Removes sleep() call from clockwork and floor turfs (#25541) * turns sleeps into timer * revenant death animation converted to animate() * Update code/game/turfs/simulated/floor/plating.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: chuga-git <[email protected]> --------- Signed-off-by: chuga-git <[email protected]> Co-authored-by: 1080pCat <[email protected]> commit 9296564ab65759f25a9c4221d4db8e18a6ef80b2 Author: DGamerL <[email protected]> Date: Thu May 23 05:48:43 2024 +0200 Fixes various radio issues (#25586) * Fixes various radio issues * Steel review commit 37189cd2c4eb0417d5c70d4cd1e11be8f58e7da3 Author: Qwertytoforty <[email protected]> Date: Wed May 22 20:57:54 2024 -0400 Prison break virus update (#25491) * Prison break virus update * Update code/modules/events/prison_break.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * one minute * Update code/game/area/areas.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: DGamerL <[email protected]> commit ccf5ef4fc44b9bca379c70c28642858c4ea5977c Author: Сиротка <[email protected]> Date: Thu May 23 03:57:37 2024 +0300 Nanopaste now can repair mecha (#25251) * Nanopaste now can repair mecha * Update nanopaste.dm * refactor mech code * fix * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update nanopaste.dm * Update nanopaste.dm * Update nanopaste.dm * Update nanopaste.dm * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update nanopaste.dm * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/game/mecha/mecha.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> --------- Signed-off-by: Сиротка <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Matt <[email protected]> Co-authored-by: S34N <[email protected]> commit d32d6ee9ebf6a1f0369b1fd432aa6e062397402a Author: matttheficus <[email protected]> Date: Wed May 22 20:57:33 2024 -0400 50% off! (#25440) commit 34dc3224d9631c86d7be814def404ce378f6f698 Author: SPACEGEESE <[email protected]> Date: Wed May 22 17:57:28 2024 -0700 shortens maints drone's description, moves the long part to a double examine (#25367) * the better drone rework * Update maint_drone.dm emag tidbit returned commit 0e2ced3c00ff26d427717428183cbf6fdc08bb2e Author: Qwertytoforty <[email protected]> Date: Wed May 22 20:57:25 2024 -0400 You can no longer push people with riot shields (and other parry objects) on help intent (#25301) * You can no longer push people with riot shields (and other parry objects) on help intent * Update buffs.dm commit d75cd41ba267cf8bd0c34fd0079d3e0d18846e93 Author: Сиротка <[email protected]> Date: Thu May 23 03:57:22 2024 +0300 RCD now build floor on chasms instead of wall (#25432) * RCD now build floor on chasms instead of wall * yeah, this is work commit 8b75706436809447368f4351d5c4cce6582428fb Author: BiancaWilkson <[email protected]> Date: Wed May 22 20:57:12 2024 -0400 this really fixed it huh? (#25519) commit 7a0d4bb089e8a99e27008947f1cb15790ad8fe6b Author: dj-34 <[email protected]> Date: Thu May 23 05:20:58 2024 +0500 Fix ppflowers (flora) generate missing icon (#25553) commit a2d3e518615a0ca93aed5796133c507d045196b2 Author: warriorstar-orion <[email protected]> Date: Wed May 22 20:06:58 2024 -0400 refactor: remove unused /turf/proc/reachableAdjacentTurfs (#25580) * refactor: remove unused /turf/proc/reachableAdjacentTurfs * Update code/game/turfs/turf.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 83dfa64ecba253272a8502c14d205b96e05a62f4 Author: warriorstar-orion <[email protected]> Date: Wed May 22 19:50:23 2024 -0400 refactor: remove unused var in medicine.dm (#25579) commit 269be6bc97bb95e359ae49ba3316bda91cb206d7 Author: S34N <[email protected]> Date: Wed May 22 21:26:47 2024 +0200 Implements byondStorage for 516 browsers (#25363) * Add 516 storage that doesnt break 515 * tgui rebuild * TGUI Bundle Rebuild * TGUI Bundle Rebuild --------- Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> commit 38fb21c4675154c6a46d71917e7abe443b7d130f Author: Arthri <[email protected]> Date: Wed May 22 16:15:14 2024 +0800 ChemMaster Production Mode Refactor (#24723) * Datumization of chem_master * [ci skip] * Undef properly * Update code/modules/reagents/chemistry/machinery/chem_master.dm Co-authored-by: Henri215 <[email protected]> * Style & Formatting Suggestions Co-authored-by: Contrabang <[email protected]> * Refactoring Suggestions [skip ci] * Naming changes [skip ci] * Rename variables and rewrite some checks * Build and update tgui * Rerun CI * Turn production_modes into an associated list * Fix tab selection * Fix ui actions * Fix sprite selection button * [ci skip] * Build and update tgui * trigger ci * force ci * force ci --------- Co-authored-by: Arthri <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Burzah <[email protected]> commit cd4fc1dd25bea0091f906e846cb9a2b96af534ac Author: Spaghetti-bit <[email protected]> Date: Tue May 21 19:09:19 2024 -0600 Lazarus Reagent Change, Decay Rate change, and Formaldehyde Buff (#25324) * Changes necrosis_prob to use decaylevel. * Reverts previous change to create a new branch. * Changes Lazarus Reagent to use decaylevel. * Changes decay rates while leaving the point at which they're skeletonized the same. This is to give only a 3 minute timer for lazarus instead of a 5 minute timer without any consequence. * Changes the later halves of decay rate. * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Update code/modules/mob/living/carbon/human/human_life.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> --------- Signed-off-by: Spaghetti-bit <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 3b351c86367b3bef9e292fbe2f0e7d278b75d11c Author: Charlie Nolan <[email protected]> Date: Tue May 21 17:29:40 2024 -0700 Nanotrasen Chefs have now officially gone to Chef College (#25066) * chef buff * comments and crap * blam * revert * s34n review * last review * Reduced expert chef cooldown to 5s. * Renamed things for clarity. * Moved Expert Chef Knowledge to IC * Don't use a Oven, use an Oven. * Made kitchen machines less egotistical. * Gave Expert Chef Knowledge a spell. * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * Less demanding background. * Removed verb decoration and STATUS_USED_EXPERT_CHEF * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * Apply suggestions from code review Co-authored-by: GDN <[email protected]> * Changed trait name. * Lint * Apply review comment. * Remove master-removed panel var * Update code/modules/mob/living/carbon/human/human_mob.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: GDN <[email protected]> commit 06db6bc004f6ebc47aa71b16332a3dc2a88152c1 Author: GDN <[email protected]> Date: Tue May 21 19:17:26 2024 -0500 refactors radios to use proximity (#25303) * refactors radios to use proximity * Apply suggestions from code review Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 8f2bcdba85b60c17f6ffcb86dc54e58d5817b9dd Author: Charlie Nolan <[email protected]> Date: Tue May 21 16:29:27 2024 -0700 Added a typing indicator to the tickets interface. (#25189) * Added a typing indicator to the tickets interface. * Lint * Review changes. --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]> commit 956bf6cd79bdefde1bdf39f7e0073d7a93a5afdc Author: Qwertytoforty <[email protected]> Date: Tue May 21 18:23:45 2024 -0400 you can no longer kinesis the chair you are buckled to (#25561) commit e7ecbda4bf6891983d8d4cdd4ff16e85aa97c594 Author: Qwertytoforty <[email protected]> Date: Tue May 21 18:23:39 2024 -0400 health scanners no longer say slime people have no heart (#25498) Co-authored-by: S34N <[email protected]> commit 6b0d87d3289897d491f007e212d6846eb9fa2f1d Author: Charlie Nolan <[email protected]> Date: Tue May 21 15:22:30 2024 -0700 Oops. (#25562) commit da36e9fc46849c48b2d81784acd2d878fa7ff330 Author: Charlie Nolan <[email protected]> Date: Mon May 20 20:45:00 2024 -0700 Crashing into stuff while leaping will actually work now. (#25545) commit e20bbc6ca3f974f7769e99830c55042a34224077 Author: Charlie Nolan <[email protected]> Date: Mon May 20 20:39:41 2024 -0700 Requests Console standardization (#25213) * Requests Console standardization * Update Secondary Goals to match the new Chemistry Requests Console --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]> commit e799cef6b9012b01895d4dbb0afb63ffa6e309bc Author: Taurtura <[email protected]> Date: Mon May 20 05:55:49 2024 +0200 adds the abductor surgery toolset (#25419) * adds surgical abductor toolset * ..Yes. The crew needs to be able to get it somehow. Right * handle review from 1080p * Required tech should be the correct one, and not engi's * Henri's review * 1080p's review * adds surgical abductor toolset * ..Yes. The crew needs to be able to get it somehow. Right * handle review from 1080p * Required tech should be the correct one, and not engi's * Henri's review * 1080p's review commit b290fdd76a993d78a7cbfb6277963b905018d8a3 Author: Qwertytoforty <[email protected]> Date: Sun May 19 14:25:42 2024 -0400 The lance now has a very clear confirmation message on it. (#25501) * The lance now has a very clear confirmation message on it. * Update code/modules/supply/supply_console.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: Matt <[email protected]> commit 8e43007b83e42eb4ea8f4b8d1a9b59defd4a946b Author: S34N <[email protected]> Date: Sun May 19 12:42:02 2024 +0200 fix this (#25524) commit ac84655df6552731a7b8e2d4db6d06fe856cc126 Author: matttheficus <[email protected]> Date: Sun May 19 06:13:04 2024 -0400 Radio Hotmic Noise + Alt Click Toggle (#25239) * radio check - lime charlie * examine addition * oops Co-authored-by: Matt <[email protected]> Signed-off-by: matttheficus <[email protected]> * oops 2 Co-authored-by: Matt <[email protected]> Signed-off-by: matttheficus <[email protected]> * dgamerl review * i didnt save lul --------- Signed-off-by: matttheficus <[email protected]> Co-authored-by: Matt <[email protected]> commit 21d42614002e470f5be387a42b01173b24378e09 Author: SchrodingersWolf <[email protected]> Date: Sun May 19 06:09:25 2024 -0400 Medbeams now heal IBs and burn wounds along with (#25474) fractures commit 77b6f52e6d8137bc35f6a6abb25234601124c33b Author: Luc <[email protected]> Date: Sat May 18 14:17:04 2024 +0200 Fix my error (#25515) Haha this event is so funny it makes me want to merge without looking commit a6dc4f43fa603b013dd9d4fe947fad16ce486eec Author: Matt <[email protected]> Date: Sat May 18 01:25:10 2024 -0700 Tweaks dynamics height adjustment for num input (#25489) commit e5e4941732bdff8f4b2cf96c348d881e18d5bccc Merge: 0d9409dc5a 2ac2dbca44 Author: Fordoxia <[email protected]> Date: Sat May 18 00:03:53 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 2ac2dbca44fc0fe7f46244e1a725e9c7143dd00a Author: S34N <[email protected]> Date: Sat May 18 00:07:23 2024 +0200 i swear to god (#25506) commit 1409c03463c7cc09f849999efc3b08d965f2992c Author: Aylong <[email protected]> Date: Fri May 17 20:27:10 2024 +0300 [TGUI] Noticeboard (#25095) * [TGUI] NoticeBoard Well... that's... something? Little animation Update tgui.bundle.css Pretty laggy animations More design Revert inset shadow Polishing You can craft it now Wrap this shit RMB func * Polish * Review changes * Rebuild rebuild rebuild... * Rebuild TGUI * Unwrench it commit 3eae519539c6f2d39a4f42ebb5cdbf4d083aaefb Author: Qwertytoforty <[email protected]> Date: Fri May 17 11:10:09 2024 -0400 Update game_mode.dm (#25509) commit 407f2345b0fb98a49d2cdfac77576eb026196231 Author: chuga-git <[email protected]> Date: Fri May 17 08:25:57 2024 -0500 Prevents using organ extractor to circumvent mephedrone heart damage (#25401) * adds check to prevent organ extractor/mephodrone cheese * Update code/modules/surgery/organs/organ_extractor.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Matt <[email protected]> --------- Signed-off-by: Matt <[email protected]> Co-authored-by: Matt <[email protected]> Co-authored-by: DGamerL <[email protected]> commit f8f34e64dfcc9fdfcec9a21fa9bdc61379259c7e Author: DGamerL <[email protected]> Date: Fri May 17 15:19:21 2024 +0200 Adds explosion particles! (#25410) * Adds explosion particles * Adds back the smoke explosion system * Removes whitespace * Fixes CI * Adds TGMC explosion * Fixes explosions, removes smoke explosions * More particle tweaks * Removes a random extra kickup * Fixes CI by properly removing kickups commit 8b2852e82430831025d8cc301cb7f02f447d473a Author: Silverplate <[email protected]> Date: Fri May 17 09:12:26 2024 -0400 GOLDEN BLAST: a new judo combo (#25457) * FACE THE WRATH OF THE GOLDEN BOLT * lew review * 120 stam damage standardization * makes it cooler * GOLDEN BLAST is now louder * Update code/modules/martial_arts/combos/judo/goldenblast.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]> commit e2aeeb78034f7ad6277b3edd114b41a66b1b5032 Author: Arthri <[email protected]> Date: Fri May 17 21:11:16 2024 +0800 Adds a VV Menu for Manipulating Reagent Holders (#25006) * Add reagents_editor * Add tgui * Fix memory leak * Fix volume limits * Don't unnecessarily update UI * Handle null volume * Change syringe color to green * Wrap in section * Add buttons for updating total and forcing reaction * Remove padding for volume cell * Fix memory leak again * Allow removal of reagent * Fix memory leak again * Tweak centering * Fix grammar * Remove redundant types * Reorder types * Remove redundant css * Strip css * Rewrite Icons into Buttons * Add dedicated remove button * Change confirm icon * Build and update tgui * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * Remove non-existent scss import * [ci skip] * Build and update tgui * trigger ci * force ci * Build and update tgui * force ci --------- Co-authored-by: Arthri <[email protected]> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> commit 64e0947b97311cb9238eabe2bcac2475777f820b Author: Qwertytoforty <[email protected]> Date: Fri May 17 09:07:01 2024 -0400 prototype nanite injector now heals ipcs / robotic limbs / cybernetic organs (#25473) * nanocalcium now heals ipcs / robotic limbs / cybernetic organs * Update code/modules/reagents/chemistry/reagents/medicine.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: S34N <[email protected]> --------- Signed-off-by: S34N <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: DGamerL <[email protected]> commit f3a24e24bbd4d231a7c93f628e8231e12fb10b56 Author: AffectedArc07 <[email protected]> Date: Fri May 17 14:01:13 2024 +0100 Improves note deletions (#25460) * Improves not deletions * balls * balls the second commit 0339ef65dd90290238c07f7c05bb4b5df7723152 Author: Contrabang <[email protected]> Date: Fri May 17 09:00:27 2024 -0400 Body Randomize button now changes physique and height (#25418) commit 0e0fe9f107611c116bc19e1167540576e0eb46c3 Author: Сиротка <[email protected]> Date: Fri May 17 15:59:28 2024 +0300 Kangaroo and larva now can be butchering (#25360) * Kangaroo and larva now can be butchering * Update code/modules/food_and_drinks/food/foods/meat.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/modules/food_and_drinks/food/foods/meat.dm Co-authored-by: Sheep <[email protected]> Signed-off-by: Сиротка <[email protected]> --------- Signed-off-by: Сиротка <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Sheep <[email protected]> commit 418d4fae2a5e8667959afda020e29502224cfd4d Author: DGamerL <[email protected]> Date: Fri May 17 14:59:06 2024 +0200 You can now crash into things with leap (#25345) * I'm happy with this * Lewc review * Adds varedit safeties * Update code/game/dna/mutations/mutation_powers.dm Co-authored-by: Matt <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Matt <[email protected]> Co-authored-by: S34N <[email protected]> commit ca31767ea72cdb2dd3a919ab866aabe2b20246dc Author: Deniz <[email protected]> Date: Fri May 17 13:58:50 2024 +0100 Cleans up a nested proc with returns (#25339) * indent culling 1 * PAI done * hemostat done * Re-ordered message * Update code/modules/mob/living/simple_animal/bot/bot.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Deniz <[email protected]> --------- Signed-off-by: Deniz <[email protected]> Co-authored-by: Henri215 <[email protected]> commit fefb4401c021c2a1a57a5e86d920e7424e05d05b Author: Luc <[email protected]> Date: Fri May 17 08:58:30 2024 -0400 Adds a new rock-paper-scissors emote (#25300) * adds rock paper scissors mechanics * better icon * Cleans up the last bit of the implementation * use barber scissors instead * minor cleanups * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> Signed-off-by: Luc <[email protected]> * Update code/datums/status_effects/neutral.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Luc <[email protected]> --------- Signed-off-by: Luc <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: 1080pCat <[email protected]> commit ecabb8f7e64cfd65a546b55b6858159326b211d2 Author: larentoun <[email protected]> Date: Fri May 17 15:57:45 2024 +0300 Fix planetary_atmos working correctly only for lavaland + use defines for lavaland atmos (#25296) * planetary atmos is not only lavaland * use defines for lavaland temperature * use defines for lavaland air * temperature is initial commit b557dabad1f913e8693e20b232c06b7cd95d231b Author: Qwertytoforty <[email protected]> Date: Fri May 17 08:53:08 2024 -0400 C4 now takes 1.5 seconds to attach to an object. C4 is now directional. (#25361) * C4 * C4's are now directonally hidden behind walls / doors commit 621127de61b22933449f56a4c70fafbd57103deb Author: Aylong <[email protected]> Date: Fri May 17 15:52:59 2024 +0300 Make some guns REAL auto (#25267) * The Man Who Sold the World * UHHHH * Revert WT full-auto commit da0843e96d69fd9beaf06862315907e5943ef57d Author: Charlie Nolan <[email protected]> Date: Fri May 17 05:49:32 2024 -0700 Add Variety of Food secondary goal, small tweaks. (#25173) * Add Variety of Food secondary goal, small tweaks. * oops * Apply suggestions from code review Co-authored-by: GDN <[email protected]> Co-authored-by: DGamerL <[email protected]> * No slasher movies, please. * No prions for CC, please. * Update code/modules/station_goals/secondary/botany/kudzu_goal.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Charlie Nolan <[email protected]> * Update code/modules/station_goals/secondary/kitchen/variety_food.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Charlie Nolan <[email protected]> * Update variety_food.dm --------- Signed-off-by: Charlie Nolan <[email protected]> Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]> Co-authored-by: GDN <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Henri215 <[email protected]> commit a57169eb2e9d308f1be3bd6d8f114f9403cf52ca Author: DGamerL <[email protected]> Date: Fri May 17 14:49:10 2024 +0200 Adds a global spores limit (#25155) commit b216289b417fe6ad107a14b97f2afabd00518e56 Author: Сиротка <[email protected]> Date: Fri May 17 15:45:32 2024 +0300 FEAT: Two new attachable armor for Ripley (#25231) * FEAT: Two new attachable armor for Ripley * Delete mecha 32x48.dmi * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/mecha/working/ripley.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/mecha/working/ripley.dm Co-authored-by: 1080pCat <[email protected]> * Add defines into separate files, change descriptions a bit * fix * change (loc) to get_turf(src) * mecha * edit defines * Update leather.dm * Update code/game/mecha/working/ripley.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update leather.dm * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update mechfabricator_designs.dm * fix .dmi * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update ripley.dm * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Сиротка <[email protected]> --------- Signed-off-by: Сиротка <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 9afec804301e9ddfd24e2ae41e85aba886098a99 Author: Gatchapod <[email protected]> Date: Fri May 17 14:44:34 2024 +0200 Less scuffed Tajaran veils (#24701) * Tajaran enveilening * Fix load name, swap to Initialize, more OOP * Addressing reviews, small redoing of desc * Suggested changes * changes suggested by lewcc --------- Co-authored-by: Gatchapod <[email protected]> Co-authored-by: S34N <[email protected]> commit 1933d2fab3e94a4baeb075b1ba665a79c3d21f66 Author: CRUNCH <[email protected]> Date: Fri May 17 13:43:06 2024 +0100 Refactors borg grippers, service now has a specialized gripper. (#24596) * Fixing some minor typos for cyborg upgrade flavour text Throws in some missing apostrophes, capitalisation, and the letter "s." * Briefcase Full of Cash buff Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr * Reverts double-feature PR * Reverts a broken revert * Reverting again because Ebba told me to * And reverting yet again * Most of the stuff Most of the refactor. Needs to fix medical borg doing shrapnel extraction. * Forgot this * fixing space intent * Newline * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <[email protected]> * More improvement * CI fixes * GO AWAY SPACE INDENTATION I DIDN'T PUT YOU THERE AAAAA * oops mb mb * Makes this work with ebba's PR * get dat fokkin disk * Update cyborg_gripper.dm * Removes all nuclear stuff * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Henri215 <[email protected]> * Update cyborg_gripper.dm * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <[email protected]> * Update cyborg_gripper.dm * coin flipping * Update cyborg_gripper.dm * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <[email protected]> * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> * EOL comments no longer EOL * autodoc * Update cyborg_gripper.dm * can hold all * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Henri215 <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Oh hi mark! * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Luc <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Line split * Some comments, examine(). Examining a gripper now tells you what's inside. --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Luc <[email protected]> commit ad48f54c60b4043c58cacac32145ca732b789001 Author: BiancaWilkson <[email protected]> Date: Fri May 17 08:32:39 2024 -0400 [S] Fixes an exploit (#25502) * you have no idea what it took to make this commit * Update code/game/objects/mail.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: 1080pCat <[email protected]> commit 85a9b97e80f48552170605ddab459fb871a4fa7f Author: Contrabang <[email protected]> Date: Fri May 17 08:00:06 2024 -0400 Refactors outfits to work with mind initialization (#25395) * wow * fix runtime and ci * i spell good * Fix * Update code/datums/outfits/outfit_admin.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Matt <[email protected]> --------- Signed-off-by: Matt <[email protected]> Co-authored-by: Matt <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 95b2fcf09525cf25a4abdd82e9248064e39d418e Author: HMBGERDO <[email protected]> Date: Fri May 17 13:59:40 2024 +0200 challenge check fix (#25372) commit 94b7057989f5d422b47fb9786d03df8b97c7c4bd Author: warriorstar-orion <[email protected]> Date: Fri May 17 07:58:36 2024 -0400 tube stations can be skipped by holding direction key (#25350) * tube stations can be skipped by holding direction key * Update code/game/objects/structures/transit_tubes/station.dm Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * invert/guard clause * add examine text for hints --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: Luc <[email protected]> commit 74ad8c1463d2dcc61d37299c46dd358fbfcaef64 Author: Daylight <[email protected]> Date: Fri May 17 14:44:17 2024 +0300 Gives singularity engines a slight nudge towards the station (#25420) * Makes the singolo target * Spelling * Update code/modules/power/engines/singularity/singularity.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Daylight <[email protected]> * Fancy comments --------- Signed-off-by: Daylight <[email protected]> Co-authored-by: DGamerL <[email protected]> commit 131e631cc4133d4004d373d13b441eec36f4dc19 Author: Luc <[email protected]> Date: Fri May 17 07:37:16 2024 -0400 Adds a rod smite (#25424) * better * no more ripping commit 1d97474ee559b484710b7ff7cef1ab9911c7de29 Author: Migratingcocofruit <[email protected]> Date: Fri May 17 14:32:48 2024 +0300 Adjusts grinder behaviour and towercap log contents (#25249) * Adjusts grinder behaviour and towercap log contents wood logs now contain 20 carbon, and the plank carbon amount is reduced accordingly, steel logs now contain 50 iron, non-edible plants are ground the same way as edible plants. * Rearranged checking for grinding behavior to if else from nested if and removed the old non-edible plant grinding code. commit 66e3528b7c08a4d2d78c060d8651f9097d6ce520 Author: CRUNCH <[email protected]> Date: Fri May 17 12:22:14 2024 +0100 Adds Abductor Janitorial Tools! (#25057) * Fixing some minor typos for cyborg upgrade flavour te…
Legendaxe
added a commit
to ss220club/Paradise-SS220
that referenced
this pull request
May 28, 2024
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает Мерж апстрима без изменений карт с оффов (гейтеры хуейтеры) ## Changelog :cl: add: Полный реворк эксплореров. Ознакомиться с ним вы можете подробнее на [Гитхабе](ParadiseSS13#24202) tweak: Вы больше не можете использовать телекинезис на кресло, к которому пристегнуты add: У поваров появился новый verb «Expert Chef Knowledge», который входит в их CQC. Он позволяет им изучать окружающую их еду и видеть рецепты, которые они могли бы приготовить add: Шеф-повара также могут исследовать кухонную технику (например, микроволновки), чтобы понять, сможет ли еда в них приготовится из ингредиентов, которые в них засунули tweak: Подправлена вероятность некроза tweak: Изменена скорость разложения tweak: Изменено меню создания CondiMaster 3000, чтобы оно больше соответствовало ChemMaster 3000 fix: Атмосферные устройства больше не перестают работать без причины tweak: RCD меха теперь строит пол на чазмах, а не стены tweak: Вы больше не можете толкать людей RIOT щитами (и другими парирующими предметами) на зелёном интенте tweak: Пользователей бензопил с баффом бензопилы больше не получится толкнуть вперед tweak: Advanced Pinpointer теперь стоит 10 ТК, а не 20 ТК add: Нанопаста теперь может ремонтировать мехи в режиме обслуживания. 20 за использование (вдвое больше, чем у сварки), итого 120 здоровья за одну упаковку tweak: Ивент «Prison Break» больше не уведомляет ИИ за 3 минуты до начала, а также может открывать взрывоустойчивые двери и ставни fix: Исправлено, что dchat не слышит рации fix: Удалены упоминания о ```Ghost radio: Nearby speakers only``` - этого не было add: RCD теперь имеет акт самоубийства (осуждаем, не поддерживаем), который меняется в зависимости от выбранного режима add: Добавлена возможность наблюдать за людьми непосредственно, как если бы вы были ими, видеть их инвентарь и элементы HUD tweak: Contort body теперь автоматически отключается при смерти tweak: Cleanbot больше не требует разблокировки для УДЕРЖАНИЯ области tweak: Cobpipe теперь соответствует обычным трубкам, их можно заполнять сушенными растениями и он не наполнен никотином при изготовлении tweak: Теперь для опустошения спреев нужно нажать Alt-Shift-Клик tweak: Адреналин больше не будет вызывать у вас зависимость tweak: «Spread Infestation» теперь является атакующей способностью tweak: «Spread Infestation» теперь дешевле в использовании 45 -> 30 химикатов tweak: «Spread Infestation» больше не требует определенного количества ДНК для покупки fix: Исправлено некорректное отображение Admin PMs del: Вырезан Sheet Snatcher 9000 tweak: Взрывы теперь выпускают гораздо меньше дыма tweak: Ремонтные дроны больше не могут бесконечно появляться и перерождаться add: Базовый адреналин за 20 ТК tweak: Изменена цена на прото-адреналин до 10 ТК tweak: Теперь вы можете щелкнуть по Razorwire, чтобы изменить его цвет на 5 вариантов tweak: Circuit Crates теперь переименованы в Construction Crates. Они стали дешевле (с 500 до 350) и содержат дополнительно пласталь и предметы, облегчающие строительство мехов. Медик теперь может купить ящик Одиссея, а инженер - ящик Рипли. Также для этих ящиков предусмотрен специальный респрайт fix: Исправлено значение брони на прикрепляемой броне для Рипли, сделав ее разрушаемой tweak: Теперь драконья шкура требует 9 листов для изготовления драконьего Рипли, как и предполагалось ранее fix: Ревенантов в гост-форме больше нельзя шаттл-гибнуть fix: Мобы, пристегнутые к стульям и носилкам, больше не застревают на угловых стенах tweak: Патроны WT-550 TTX теперь требуют наличия Illegals 3 add: Добавлена новая атакующая способность Генокрадов, «Bone shard» - серию костяных сюрикенов, которые можно бросать во врагов add: Добавлены Saltpetre Crystals tweak: Saltpetre Crystals могут быть сделаны в Compost Bin tweak: Compost Bin теперь принимает Potassium и Ash в дополнение к Plantmatter и Nutriment /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. -->
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
-Status: Awaiting review
This PR is awaiting review from the review team
BoxStation
This PR will edit the map BoxStation (Cyberiad)
CereStation
This PR edits the map CereStation (Farragus)
DeltaStation
This PR will edit the map DeltaStation (Kerberos)
Feature
This PR is a new addition to the game
Large PR
This PR will lag you if you try to review it
Map Edit
This PR will modify a map
MetaStation
This PR will edit the map MetaStation (Cerebron)
Requires SOP Update
This PR requires an update to our Standard Operating Procedures (SOP).
Requires Wiki Update
Useful for Wiki Contributers to search for things that need updating
Sound
This PR modifies the game sound
Sprites
This PR modifies the game sprites
Testmerge Active
This PR is currently testmerged on production
Testmerge Requested
This PR has a pending testmerge request
TGUI
This PR modifies TGUI, will conflict
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.
What Does This PR Do
I'd recommend looking at the changelog for the specifics, but ultimately this PR reworks explorer in a number of ways. Notably:
Why It's Good For The Game
Since I've started playing this game, explorer has been a weird job. Originally it was a job you could only get via the HOP and involved running through one random, pre-set gateway dungeon (sometimes?) before going into space. Eventually the job got made into a proper job with #20855. Ultimately though that PR has left explorer in a state without any SOP, department head, ways to communicate with other explorers and what has amounted to pointless loot hoarding while running the depot over and over again.
The recent addition of new ruins and the moonbase ruin has put explorer in a good place for pushing forward with more content additions and so this PR has been made. Originally starting as wanting to give the QM another subordinate role, this PR finally gives explorers a department head in the form of the Quartermaster, who as of the last months has been newly liberated from the tyranny of the Head of Personnel.
My hopes is these changes of giving Explorer a department with supply, making ruins harder to run through, giving them additional reasons and means to interact with the station alongside an actual 'purpose' that contributes to the department in the form of salvage selling will turn the role of the explorer team into an actual team. I'm hoping this 'team' of explorers will correctly hide their smuggled contraband and do their best to work together to best the various space ruins instead of rushing off to depot roundstart so "the other guys don't get all the loot first."
Will that happen? Who knows, I hope the PR's changes encourage it.
Images of changes
I'll be using this section to credit certain people for sprites and sounds.
Hivelord and Basilisk resprite courtesy of Jacquerel - tgstation/tgstation#78213
tgstation/tgstation#77630
Space Dragon resprite courtesy of Toastgoats - tgstation/tgstation#64948
Salvage sprites courtesy of McRamon
Explorer outfits courtesy of Christasmurf.
Pirate engage courtesy of Sierra721 - https://freesound.org/people/sierra721/sounds/718953/
Pirate death courtesy of Duisterwho - https://freesound.org/people/Duisterwho/sounds/644046/
Testing
Each feature has been tested individually as its been added, I'd like to request this be test merged to see if the cargo award for salvage selling could do with a tweak.
Changelog
🆑
add: Explorer has been reworked, new access, new department, new sprites and new equipment.
add: The Salvage system has been implemented, rather dropping from space mobs, or found randomly in space ruins. They can be sold at cargo.
add: A new type of mining equipment vendor has been created for explorers.
add: There is a new toy for Explorers, Supply toys have been added into the cargodrobe.
tweak: Syndicate depot loot has been rebalanced.
tweak: The Quartermaster now has expedition and teleporter access.
tweak: Explorers now have general cargo and teleporter access.
tweak: The Space Bar will now always spawn.
tweak: Most space ruins have had their layouts tweaked and contain both new threats and rewards.
tweak: The Space Dragon is now a part of the carp faction and will no longer attack space carp.
tweak: Traitor Explorers now have access to the indoor pressure mod item.
tweak: The spare Hand Teleporter now spawns in the AI satellite.
imageadd: New sprites for hivelords and basilisks have been added.
soundadd: Added new sounds for salvage handling, space dragon's death and pirates.
/:cl: