-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
makes revenants not runtime clicking nearly anything #25601
Merged
SteelSlayer
merged 2 commits into
ParadiseSS13:master
from
Qwertytoforty:stop-breaking-revenants-please
May 25, 2024
Merged
makes revenants not runtime clicking nearly anything #25601
SteelSlayer
merged 2 commits into
ParadiseSS13:master
from
Qwertytoforty:stop-breaking-revenants-please
May 25, 2024
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
Contrabang
reviewed
May 23, 2024
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Contrabang
approved these changes
May 24, 2024
SteelSlayer
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.
Fucking revenants.
Fordoxia
added a commit
to Fordoxia/CRUNCHParadise
that referenced
this pull request
May 28, 2024
commit b819961a52ccaf982026744cb6617b1a485181a8 Merge: e5e4941732 67a8a340e6 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Sat May 25 14:55:18 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 67a8a340e6468efd775e20166825fa328317c584 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat May 25 02:43:32 2024 +0100 Fix admin PMs not working from discord (#25604) commit 2e01f3591d248917e92284038aab68449884e1ff Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> commit 2ea75e81f39f44e0d9c0a6c46c8c63cccbc20088 Author: Charlie Nolan <funnyman3595@gmail.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri May 24 21:18:51 2024 -0400 fix full auto on certain guns with double click speed (#25520) commit d438d5d3be9d84835f3a41a8b2af1fc8f25fc862 Author: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Fri May 24 21:11:01 2024 +0100 spider spider spider (#25492) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit fbfd1bf82af36edae0b3298dd53423c1ba4f1589 Author: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Fri May 24 16:08:34 2024 -0400 Gives Golems access to Xenobiology (#25484) commit 624a1261f837bedfcce30c00b98e0d569a0be304 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <144391971+PollardTheDragon@users.noreply.github.com> 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 <70349271+Onyxarias@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> * Adresses Fordoxia's reviews. Updates extended descriptions for Old Durand and Reticence. * Update code/game/mecha/combat/marauder.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> * Update code/game/mecha/combat/marauder.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> --------- Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit 55b257ead86968138f1193af3b33012bcfc0b98b Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Fri May 24 20:43:35 2024 +0100 Tweaks Ghetto Surgery (#25439) * very ghetto * Update organs_internal.dm commit 72a5c9e3c7b960f4cc7791bcfd063befb20f72dc Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Date: Fri May 24 21:32:03 2024 +0300 Now you need alt-shift-click to empty sprays (#25437) commit 2903560dc1f8fa1221d91415cf95ad5f3bf3bf42 Author: Migratingcocofruit <69551563+Migratingcocofruit@users.noreply.github.com> 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 <66401072+Oyu07@users.noreply.github.com> Date: Fri May 24 19:26:49 2024 +0100 tested (#25387) commit 4a1d1f5971b0344f798b32c601ce0519613dadcf Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <96800819+GDNgit@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/contort_body.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Contra review * Contra review --------- Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 9030cfbb61cca109307de298d921ac2799937f49 Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 82a1cc6a4ed555caf39aa6ae1cdfe6676262845f Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> commit 03cca11f953fbb22e8526910a322cbd87724cf1c Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> 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 <91113370+Contrabang@users.noreply.github.com> Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * Makes noticeboard less silly --------- Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 23ad8a48fa272e7c6b826e571a14adb19bb460cb Author: Luc <89928798+lewcc@users.noreply.github.com> 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 <96800819+GDNgit@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * 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 <89928798+lewcc@users.noreply.github.com> * 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 <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * 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 <89928798+lewcc@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit 7bf45dce58f8007284c9ffe9e1a831a04ddfaf25 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> 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 <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * code compaction * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update RCD.dm * Update RCD.dm * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update RCD.dm * The worst typo in history Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Makes everything work * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update RCD.dm * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> commit bfa88abd5a02a64cddd1ca59b47ceb423593bc2c Author: Charlie Nolan <funnyman3595@gmail.com> Date: Thu May 23 00:13:02 2024 -0700 Be safe, radios. (#25595) commit 6baa75a5bf1b3fe105ef2af85bb019af61ff0547 Author: chuga-git <98280110+chuga-git@users.noreply.github.com> 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 <96908085+1080pCat@users.noreply.github.com> Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com> --------- Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit 9296564ab65759f25a9c4221d4db8e18a6ef80b2 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu May 23 05:48:43 2024 +0200 Fixes various radio issues (#25586) * Fixes various radio issues * Steel review commit 37189cd2c4eb0417d5c70d4cd1e11be8f58e7da3 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * one minute * Update code/game/area/areas.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit ccf5ef4fc44b9bca379c70c28642858c4ea5977c Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update nanopaste.dm * Update nanopaste.dm * Update nanopaste.dm * Update nanopaste.dm * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update nanopaste.dm * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/mecha/mecha.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit d32d6ee9ebf6a1f0369b1fd432aa6e062397402a Author: matttheficus <57759731+matttheficus@users.noreply.github.com> Date: Wed May 22 20:57:33 2024 -0400 50% off! (#25440) commit 34dc3224d9631c86d7be814def404ce378f6f698 Author: SPACEGEESE <136994596+spacegeese@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> 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: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <42818125+BiancaWilkson@users.noreply.github.com> Date: Wed May 22 20:57:12 2024 -0400 this really fixed it huh? (#25519) commit 7a0d4bb089e8a99e27008947f1cb15790ad8fe6b Author: dj-34 <dj-34@bk.ru> Date: Thu May 23 05:20:58 2024 +0500 Fix ppflowers (flora) generate missing icon (#25553) commit a2d3e518615a0ca93aed5796133c507d045196b2 Author: warriorstar-orion <orion@snowfrost.garden> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> --------- Signed-off-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 83dfa64ecba253272a8502c14d205b96e05a62f4 Author: warriorstar-orion <orion@snowfrost.garden> Date: Wed May 22 19:50:23 2024 -0400 refactor: remove unused var in medicine.dm (#25579) commit 269be6bc97bb95e359ae49ba3316bda91cb206d7 Author: S34N <12197162+S34NW@users.noreply.github.com> 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 <41360489+Arthri@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> * Style & Formatting Suggestions Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * 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 <41360489+a@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit cd4fc1dd25bea0091f906e846cb9a2b96af534ac Author: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/human_life.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> --------- Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 3b351c86367b3bef9e292fbe2f0e7d278b75d11c Author: Charlie Nolan <funnyman3595@gmail.com> 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 <108773801+DGamerL@users.noreply.github.com> * Less demanding background. * Removed verb decoration and STATUS_USED_EXPERT_CHEF * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * 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 <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> commit 06db6bc004f6ebc47aa71b16332a3dc2a88152c1 Author: GDN <96800819+GDNgit@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 8f2bcdba85b60c17f6ffcb86dc54e58d5817b9dd Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> commit 956bf6cd79bdefde1bdf39f7e0073d7a93a5afdc Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue May 21 18:23:39 2024 -0400 health scanners no longer say slime people have no heart (#25498) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 6b0d87d3289897d491f007e212d6846eb9fa2f1d Author: Charlie Nolan <funnyman3595@gmail.com> Date: Tue May 21 15:22:30 2024 -0700 Oops. (#25562) commit da36e9fc46849c48b2d81784acd2d878fa7ff330 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Mon May 20 20:45:00 2024 -0700 Crashing into stuff while leaping will actually work now. (#25545) commit e20bbc6ca3f974f7769e99830c55042a34224077 Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> commit e799cef6b9012b01895d4dbb0afb63ffa6e309bc Author: Taurtura <141481662+Taurtura@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> commit 8e43007b83e42eb4ea8f4b8d1a9b59defd4a946b Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Sun May 19 12:42:02 2024 +0200 fix this (#25524) commit ac84655df6552731a7b8e2d4db6d06fe856cc126 Author: matttheficus <57759731+matttheficus@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * oops 2 Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * dgamerl review * i didnt save lul --------- Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> commit 21d42614002e470f5be387a42b01173b24378e09 Author: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com> Date: Sun May 19 06:09:25 2024 -0400 Medbeams now heal IBs and burn wounds along with (#25474) fractures commit 77b6f52e6d8137bc35f6a6abb25234601124c33b Author: Luc <89928798+lewcc@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Date: Sat May 18 01:25:10 2024 -0700 Tweaks dynamics height adjustment for num input (#25489) commit e5e4941732bdff8f4b2cf96c348d881e18d5bccc Merge: 0d9409dc5a 2ac2dbca44 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Sat May 18 00:03:53 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 2ac2dbca44fc0fe7f46244e1a725e9c7143dd00a Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat May 18 00:07:23 2024 +0200 i swear to god (#25506) commit 1409c03463c7cc09f849999efc3b08d965f2992c Author: Aylong <69762909+AyIong@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri May 17 11:10:09 2024 -0400 Update game_mode.dm (#25509) commit 407f2345b0fb98a49d2cdfac77576eb026196231 Author: chuga-git <98280110+chuga-git@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit f8f34e64dfcc9fdfcec9a21fa9bdc61379259c7e Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <118299273+silverplatedelta@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit e2aeeb78034f7ad6277b3edd114b41a66b1b5032 Author: Arthri <41360489+Arthri@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> * 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 <41360489+a@users.noreply.github.com> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> commit 64e0947b97311cb9238eabe2bcac2475777f820b Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com> --------- Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit f3a24e24bbd4d231a7c93f628e8231e12fb10b56 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri May 17 14:01:13 2024 +0100 Improves note deletions (#25460) * Improves not deletions * balls * balls the second commit 0339ef65dd90290238c07f7c05bb4b5df7723152 Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Fri May 17 09:00:27 2024 -0400 Body Randomize button now changes physique and height (#25418) commit 0e0fe9f107611c116bc19e1167540576e0eb46c3 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/modules/food_and_drinks/food/foods/meat.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> commit 418d4fae2a5e8667959afda020e29502224cfd4d Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit ca31767ea72cdb2dd3a919ab866aabe2b20246dc Author: Deniz <66401072+Oyu07@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> --------- Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit fefb4401c021c2a1a57a5e86d920e7424e05d05b Author: Luc <89928798+lewcc@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/datums/status_effects/neutral.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit ecabb8f7e64cfd65a546b55b6858159326b211d2 Author: larentoun <31931237+larentoun@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> 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 <69762909+AyIong@users.noreply.github.com> 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 <funnyman3595@gmail.com> 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 <96800819+GDNgit@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * No slasher movies, please. * No prions for CC, please. * Update code/modules/station_goals/secondary/botany/kudzu_goal.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> * Update code/modules/station_goals/secondary/kitchen/variety_food.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> * Update variety_food.dm --------- Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit a57169eb2e9d308f1be3bd6d8f114f9403cf52ca Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Fri May 17 14:49:10 2024 +0200 Adds a global spores limit (#25155) commit b216289b417fe6ad107a14b97f2afabd00518e56 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update leather.dm * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update mechfabricator_designs.dm * fix .dmi * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update ripley.dm * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 9afec804301e9ddfd24e2ae41e85aba886098a99 Author: Gatchapod <20936555+Gatchapod@users.noreply.github.com> 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 <Gatchapod@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 1933d2fab3e94a4baeb075b1ba665a79c3d21f66 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update cyborg_gripper.dm * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update cyborg_gripper.dm * coin flipping * Update cyborg_gripper.dm * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Oh hi mark! * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Line split * Some comments, examine(). Examining a gripper now tells you what's inside. --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> commit ad48f54c60b4043c58cacac32145ca732b789001 Author: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> 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 <96908085+1080pCat@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit 85a9b97e80f48552170605ddab459fb871a4fa7f Author: Contrabang <91113370+Contrabang@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 95b2fcf09525cf25a4abdd82e9248064e39d418e Author: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Date: Fri May 17 13:59:40 2024 +0200 challenge check fix (#25372) commit 94b7057989f5d422b47fb9786d03df8b97c7c4bd Author: warriorstar-orion <orion@snowfrost.garden> 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 <89928798+lewcc@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> * invert/guard clause * add examine text for hints --------- Signed-off-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> commit 74ad8c1463d2dcc61d37299c46dd358fbfcaef64 Author: Daylight <18598676+Daylight2@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com> * Fancy comments --------- Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 131e631cc4133d4004d373d13b441eec36f4dc19 Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Fri May 17 07:37:16 2024 -0400 Adds a rod smite (#25424) * better * no more ripping commit 1d97474ee559b484710b7ff7cef1ab9911c7de29 Author: Migratingcocofruit <69551563+Migratingcocofruit@users.noreply.github.com> 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 <143041327+Fordoxia@users.noreply.github.com> Date: Fri May 17 12:22:14 2024 +0100 Adds Abductor Janitorial Tools! (#25057) * 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 * Out of this world cleaning! * missing empty space * Locker belt * fix merge conflict and upgrade belt * Update code/modules/research/designs/mechfabricator_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/research/designs/medical_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update medical_designs.dm * Update code/game/objects/items/robot/robot_upgrades.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update code/game/gamemodes/miniantags/abduction/abduction_gear.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Fixed missing item state * Begone, bucket! * Update code/game/objects/structures/mop_bucket.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit bec2043efe2c5bc13a1783e4de315263a2fd8bba Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Fri May 17 11:48:09 2024 +0200 speed up OD lint CI significantly (#25505) commit 843f3167dd7aa93ef345d538fcdf826a4deec4c8 Author: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com> Date: Fri May 17 01:44:40 2024 -0700 typo fix (#25503) commit 180f2ec9627c1603301104e0ff73132ead0dbb5c Author: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Thu May 16 22:46:38 2024 -0500 Adds blackbox tracking for purchasing Changeling abilities (#25422) * adds changeling power purchase to blackbox feedback * adds feedback for all weapon sting_actions and dissonant shriek * whoopsie daisies commit 4419c5d6674708d23f89a4aae9ea743854496ea0 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Fri May 17 04:46:02 2024 +0100 Updates tips. (#25428) * New tips! * Update tips.txt * Apply suggestions from code review Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update tips.txt --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> commit 52d8708f621f72fb8a8b8026f08a1f7a59d437e5 Author: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Thu May 16 19:55:32 2024 -0400 [S] Fixes a matter eater exploit (#25500) * adjacent * add spaces * double precautions * wrong else commit baedfbf6aaeb6c7dc15fca8d9165cb7b6961c166 Author: Taurtura <141481662+Taurtura@users.noreply.github.com> Date: Fri May 17 00:09:34 2024 +0200 Proto-Kinetic Accelerator and Kinetic Crusher examine text update (#25338) * kinetic crusher examine text * pka examine text * apply suggestions from review * bring back a change to the KPA's interaction description that somehow disappeared commit 53b8c0517e7154b18a2dd387fe7a79d649505b7e Author: Daylight <18598676+Daylight2@users.noreply.github.com> Date: Fri May 17 01:00:05 2024 +0300 Infrared emitter lasers no longer float off into space. Fixes #25317 (#25445) * My application for headcoder * Revert "My application for headcoder" This reverts commit 63437ffcca3dfe2483114054f46322e6e1403a9d. * This is a much better idea * Whitespace * Readability cleanup * Webedit my beloved Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com> --------- Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit be44430c83d7163a6ac993b9c2338ac1ff57ada1 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu May 16 15:23:25 2024 -0400 Tarot statue time fix, no longer can emote or pda as a statue (#25461) * Tarot statue time fix, no longer can emote or pda as a statue * oops * Update code/game/objects/structures/crates_lockers/closets/statue.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 902dc169c905e06c49decb7bab627d38954562a7 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu May 16 14:35:15 2024 -0400 lets admins see inside mod storage again (#25497) commit f888d3deba16562f1bf675eb5b507a4e5d3938cf Author: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Date: Thu May 16 05:06:30 2024 -0400 medtoolsdescupdate (#25405) commit 57bd70cd412893bc588455888d8759fa6d0f560b Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Thu May 16 10:01:45 2024 +0100 [FIX] Glorious Communist Walls of USSP Station Now Fully Repel Capitalist Pigs! (#25453) * Update walls_mineral.dm * Space indentation I hate you commit a56dfa233a9155e5c55354b751f2683be036af5a Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Date: Wed May 15 23:29:32 2024 -0500 NanoMap Auto-Update (Thu May 16 01:13:40 UTC 2024) (#25480) Co-authored-by: NanoMap Generation <action@github.com> commit 7872119993b26c4d01310b87a7cb26e9700adc5b Author: Matt <116982774+Burzah@users.noreply.github.com> Date: Wed May 15 21:05:08 2024 -0700 Adds additional logging for Uplink purchases (#25454) * Adds additional logging * Updated log to show cost of purchase commit c772be34bd463bd73554b1a3c4ba445b0073ec22 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu May 16 05:01:00 2024 +0100 Removes a file we forgot about (#25447) commit 00a0eb798dec2ce8077bb1a048f50a818d9f90a5 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed May 15 10:22:48 2024 -0400 Click cooldown modifiers affect full auto component the same as every other gun (#25307) commit 2ce4c205157e3b24157e0ba2a8021351e28c00c1 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed May 15 10:13:51 2024 -0400 Adds the Lance emergency shuttle (#24806) * WIP: Adds the Lance emergency shuttle * untodo * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * c-c-c-changes * Apply suggestions from code review Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * Update code/datums/shuttles.dm Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> commit 5c71a3f55807f0e9c5f761f24755e2aa6ba9c155 Author: Deniz <66401072+Oyu07@users.noreply.github.com> Date: Wed May 15 14:49:45 2024 +0100 [TGUI] AI Bot Access (#24837) * stash * aa * , * many edits * thanou prettier * edits b * botref * checkpoint reached * Procs * if on * procs back to datum * discord suggestions + help * get data * testing * testing * testing more * test test * tab based bots * IT WORKS * draft time? * TGUI * TGUI * TGUI * cleanup * name and mode * bsod * colors * botref tgui * fixes * it works * ITS ALIVE * less checks * griefsky didnt have type nor model * oops * general * stack * color * security tab * no bot found * deletes webui * test * bundle go die in a ditch * Aylong shortening ty Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> * bot_type defines, security tab * Remove href interface * Status Messages * Build and update tgui * Update colors Arrest to blue * mapped modes * Build and update tgui * chmod * Typo * Build and update tgui * remove prettier edit from pr * SEAN reviews * interact to state Wonder what problems this brought on Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> * modeRange -> mode * CI + mode -> modes * some comments that make me insane * Build and update tgui * forgot , * It compiled Has not been tested ##TESTING will be updated properly today or tomorrow * define and commits * Revert "It compiled" This reverts commit eec57190ea38c54fb2e7ed752bdb17892a6ac750. * bundle * switch case changed * Update botcall.dm Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> * Update code/modules/mob/living/silicon/ai/ai_verbs/botcall.dm Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> * Bundle + Comment * format edit no change --------- Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> Co-authored-by: /tg/ui <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit 58e29fa7ca37ba1eae56ed9f1d5df4b91ce06773 Author: asciodev <81930475+asciodev@users.noreply.github.com> Date: Wed May 15 09:37:23 2024 -0400 Enable runechat for grey psionic speech (#25309) This change adds the HIVEMIND_RUNECHAT flag to the grey language datum, displaying runechat above the receiver for all psionic messages that are heard, as with the abductor hivemind language. commit f4c49a5cca35bc716a618f88c1d37bb06d6e57d4 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed May 15 15:31:35 2024 +0200 Removes two unused damage defines (#25434) commit b9728025132e451cec89496f51500a1674485a56 Author: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com> Date: Wed May 15 07:28:22 2024 -0400 Reverse Wheel of Fortune tarot card now no longer spawns wallmeds or Donksoft vendors (#25486) *…
Fordoxia
added a commit
to Fordoxia/CRUNCHParadise
that referenced
this pull request
May 28, 2024
commit f5ca247e0ef926587a8db502773dcd326cb50960 Merge: b819961a52 094d7bd13b Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Tue May 28 02:17:36 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 094d7bd13b42c07309efff59e1527291d226385c Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <85680653+ItsMarmite@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> commit c9f44b1f293826a8a320aff3fb1800f4b05636a8 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 2b9ccda51b90b29c5989eaf4be5251731b090214 Author: Rayforx <154929127+Rayforx@users.noreply.github.com> 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 <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Rayforx <154929127+Rayforx@users.noreply.github.com> --------- Signed-off-by: Rayforx <154929127+Rayforx@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit d107f06ee3ec827ce75e064dcbe2a41896f9b6c9 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <action@github.com> commit 2f8db520c70b693c58b055705ade230f073386ac Author: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Sun May 26 15:42:23 2024 -0400 No! Bad AI! No Tracking on the Research Post! (#25467) commit 2c28b93349577b01465fe157a77e0f6aa7e5dc13 Author: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Mon May 27 00:04:28 2024 +1000 Update boxstation.dmm (#25614) commit a695a0f015d6cad4d4da147a48b83f06bbc12e2b Author: warriorstar-orion <orion@snowfrost.garden> Date: Sun May 26 10:02:47 2024 -0400 fix: VV list display with values that are zero (#25618) commit 8412356b22b111f7c3d3ee5682f8c579101cf7bc Author: Daylight <18598676+Daylight2@users.noreply.github.com> Date: Sat May 25 21:39:43 2024 +0300 Punctuation (#25627) commit 9d1b4c1b981139dca3c58a0862c08cf95853f3ea Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sat May 25 18:37:22 2024 +0200 Heavily reduces explosion smoke amounts (#25517) commit 0420e9a7fb01663dc5f1aa212590af3cd97509df Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> 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 <25063394+AffectedArc07@users.noreply.github.com> commit bd0e54752e29e17ce30260a02a34cdff832a964e Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Sat May 25 16:48:22 2024 +0100 Removes the Sheet Snatcher 9000 (#25496) * Yeetus Deletus * removed icon --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit b819961a52ccaf982026744cb6617b1a485181a8 Merge: e5e4941732 67a8a340e6 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Sat May 25 14:55:18 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 67a8a340e6468efd775e20166825fa328317c584 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat May 25 02:43:32 2024 +0100 Fix admin PMs not working from discord (#25604) commit 2e01f3591d248917e92284038aab68449884e1ff Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> commit 2ea75e81f39f44e0d9c0a6c46c8c63cccbc20088 Author: Charlie Nolan <funnyman3595@gmail.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri May 24 21:18:51 2024 -0400 fix full auto on certain guns with double click speed (#25520) commit d438d5d3be9d84835f3a41a8b2af1fc8f25fc862 Author: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Fri May 24 21:11:01 2024 +0100 spider spider spider (#25492) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit fbfd1bf82af36edae0b3298dd53423c1ba4f1589 Author: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Fri May 24 16:08:34 2024 -0400 Gives Golems access to Xenobiology (#25484) commit 624a1261f837bedfcce30c00b98e0d569a0be304 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <144391971+PollardTheDragon@users.noreply.github.com> 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 <70349271+Onyxarias@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> * Adresses Fordoxia's reviews. Updates extended descriptions for Old Durand and Reticence. * Update code/game/mecha/combat/marauder.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> * Update code/game/mecha/combat/marauder.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> --------- Signed-off-by: Onyxarias <70349271+Onyxarias@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit 55b257ead86968138f1193af3b33012bcfc0b98b Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Fri May 24 20:43:35 2024 +0100 Tweaks Ghetto Surgery (#25439) * very ghetto * Update organs_internal.dm commit 72a5c9e3c7b960f4cc7791bcfd063befb20f72dc Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Date: Fri May 24 21:32:03 2024 +0300 Now you need alt-shift-click to empty sprays (#25437) commit 2903560dc1f8fa1221d91415cf95ad5f3bf3bf42 Author: Migratingcocofruit <69551563+Migratingcocofruit@users.noreply.github.com> 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 <66401072+Oyu07@users.noreply.github.com> Date: Fri May 24 19:26:49 2024 +0100 tested (#25387) commit 4a1d1f5971b0344f798b32c601ce0519613dadcf Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <96800819+GDNgit@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/contort_body.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Contra review * Contra review --------- Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 9030cfbb61cca109307de298d921ac2799937f49 Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 82a1cc6a4ed555caf39aa6ae1cdfe6676262845f Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> commit 03cca11f953fbb22e8526910a322cbd87724cf1c Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> 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 <91113370+Contrabang@users.noreply.github.com> Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * Makes noticeboard less silly --------- Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 23ad8a48fa272e7c6b826e571a14adb19bb460cb Author: Luc <89928798+lewcc@users.noreply.github.com> 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 <96800819+GDNgit@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * 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 <89928798+lewcc@users.noreply.github.com> * 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 <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * 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 <89928798+lewcc@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit 7bf45dce58f8007284c9ffe9e1a831a04ddfaf25 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> 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 <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * code compaction * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update RCD.dm * Update RCD.dm * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update RCD.dm * The worst typo in history Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Makes everything work * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update RCD.dm * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update RCD.dm * Update code/game/objects/items/weapons/RCD.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> commit bfa88abd5a02a64cddd1ca59b47ceb423593bc2c Author: Charlie Nolan <funnyman3595@gmail.com> Date: Thu May 23 00:13:02 2024 -0700 Be safe, radios. (#25595) commit 6baa75a5bf1b3fe105ef2af85bb019af61ff0547 Author: chuga-git <98280110+chuga-git@users.noreply.github.com> 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 <96908085+1080pCat@users.noreply.github.com> Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com> --------- Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit 9296564ab65759f25a9c4221d4db8e18a6ef80b2 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu May 23 05:48:43 2024 +0200 Fixes various radio issues (#25586) * Fixes various radio issues * Steel review commit 37189cd2c4eb0417d5c70d4cd1e11be8f58e7da3 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * one minute * Update code/game/area/areas.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit ccf5ef4fc44b9bca379c70c28642858c4ea5977c Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update nanopaste.dm * Update nanopaste.dm * Update nanopaste.dm * Update nanopaste.dm * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update nanopaste.dm * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/mecha/mecha.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/objects/items/stacks/nanopaste.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit d32d6ee9ebf6a1f0369b1fd432aa6e062397402a Author: matttheficus <57759731+matttheficus@users.noreply.github.com> Date: Wed May 22 20:57:33 2024 -0400 50% off! (#25440) commit 34dc3224d9631c86d7be814def404ce378f6f698 Author: SPACEGEESE <136994596+spacegeese@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> 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: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <42818125+BiancaWilkson@users.noreply.github.com> Date: Wed May 22 20:57:12 2024 -0400 this really fixed it huh? (#25519) commit 7a0d4bb089e8a99e27008947f1cb15790ad8fe6b Author: dj-34 <dj-34@bk.ru> Date: Thu May 23 05:20:58 2024 +0500 Fix ppflowers (flora) generate missing icon (#25553) commit a2d3e518615a0ca93aed5796133c507d045196b2 Author: warriorstar-orion <orion@snowfrost.garden> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> --------- Signed-off-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 83dfa64ecba253272a8502c14d205b96e05a62f4 Author: warriorstar-orion <orion@snowfrost.garden> Date: Wed May 22 19:50:23 2024 -0400 refactor: remove unused var in medicine.dm (#25579) commit 269be6bc97bb95e359ae49ba3316bda91cb206d7 Author: S34N <12197162+S34NW@users.noreply.github.com> 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 <41360489+Arthri@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> * Style & Formatting Suggestions Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * 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 <41360489+a@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit cd4fc1dd25bea0091f906e846cb9a2b96af534ac Author: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/human_life.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> --------- Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 3b351c86367b3bef9e292fbe2f0e7d278b75d11c Author: Charlie Nolan <funnyman3595@gmail.com> 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 <108773801+DGamerL@users.noreply.github.com> * Less demanding background. * Removed verb decoration and STATUS_USED_EXPERT_CHEF * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * 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 <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> commit 06db6bc004f6ebc47aa71b16332a3dc2a88152c1 Author: GDN <96800819+GDNgit@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 8f2bcdba85b60c17f6ffcb86dc54e58d5817b9dd Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> commit 956bf6cd79bdefde1bdf39f7e0073d7a93a5afdc Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue May 21 18:23:39 2024 -0400 health scanners no longer say slime people have no heart (#25498) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 6b0d87d3289897d491f007e212d6846eb9fa2f1d Author: Charlie Nolan <funnyman3595@gmail.com> Date: Tue May 21 15:22:30 2024 -0700 Oops. (#25562) commit da36e9fc46849c48b2d81784acd2d878fa7ff330 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Mon May 20 20:45:00 2024 -0700 Crashing into stuff while leaping will actually work now. (#25545) commit e20bbc6ca3f974f7769e99830c55042a34224077 Author: Charlie Nolan <funnyman3595@gmail.com> 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) <funnyman@google.com> commit e799cef6b9012b01895d4dbb0afb63ffa6e309bc Author: Taurtura <141481662+Taurtura@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> commit 8e43007b83e42eb4ea8f4b8d1a9b59defd4a946b Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Sun May 19 12:42:02 2024 +0200 fix this (#25524) commit ac84655df6552731a7b8e2d4db6d06fe856cc126 Author: matttheficus <57759731+matttheficus@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * oops 2 Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> * dgamerl review * i didnt save lul --------- Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> commit 21d42614002e470f5be387a42b01173b24378e09 Author: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com> Date: Sun May 19 06:09:25 2024 -0400 Medbeams now heal IBs and burn wounds along with (#25474) fractures commit 77b6f52e6d8137bc35f6a6abb25234601124c33b Author: Luc <89928798+lewcc@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Date: Sat May 18 01:25:10 2024 -0700 Tweaks dynamics height adjustment for num input (#25489) commit e5e4941732bdff8f4b2cf96c348d881e18d5bccc Merge: 0d9409dc5a 2ac2dbca44 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Sat May 18 00:03:53 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 2ac2dbca44fc0fe7f46244e1a725e9c7143dd00a Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat May 18 00:07:23 2024 +0200 i swear to god (#25506) commit 1409c03463c7cc09f849999efc3b08d965f2992c Author: Aylong <69762909+AyIong@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri May 17 11:10:09 2024 -0400 Update game_mode.dm (#25509) commit 407f2345b0fb98a49d2cdfac77576eb026196231 Author: chuga-git <98280110+chuga-git@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit f8f34e64dfcc9fdfcec9a21fa9bdc61379259c7e Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <118299273+silverplatedelta@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit e2aeeb78034f7ad6277b3edd114b41a66b1b5032 Author: Arthri <41360489+Arthri@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> * 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 <41360489+a@users.noreply.github.com> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> commit 64e0947b97311cb9238eabe2bcac2475777f820b Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com> --------- Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit f3a24e24bbd4d231a7c93f628e8231e12fb10b56 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri May 17 14:01:13 2024 +0100 Improves note deletions (#25460) * Improves not deletions * balls * balls the second commit 0339ef65dd90290238c07f7c05bb4b5df7723152 Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Fri May 17 09:00:27 2024 -0400 Body Randomize button now changes physique and height (#25418) commit 0e0fe9f107611c116bc19e1167540576e0eb46c3 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/modules/food_and_drinks/food/foods/meat.dm Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> commit 418d4fae2a5e8667959afda020e29502224cfd4d Author: DGamerL <108773801+DGamerL@users.noreply.github.com> 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit ca31767ea72cdb2dd3a919ab866aabe2b20246dc Author: Deniz <66401072+Oyu07@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> --------- Signed-off-by: Deniz <66401072+Oyu07@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit fefb4401c021c2a1a57a5e86d920e7424e05d05b Author: Luc <89928798+lewcc@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/datums/status_effects/neutral.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit ecabb8f7e64cfd65a546b55b6858159326b211d2 Author: larentoun <31931237+larentoun@users.noreply.github.com> 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 <52090703+Qwertytoforty@users.noreply.github.com> 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 <69762909+AyIong@users.noreply.github.com> 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 <funnyman3595@gmail.com> 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 <96800819+GDNgit@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * No slasher movies, please. * No prions for CC, please. * Update code/modules/station_goals/secondary/botany/kudzu_goal.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> * Update code/modules/station_goals/secondary/kitchen/variety_food.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> * Update variety_food.dm --------- Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit a57169eb2e9d308f1be3bd6d8f114f9403cf52ca Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Fri May 17 14:49:10 2024 +0200 Adds a global spores limit (#25155) commit b216289b417fe6ad107a14b97f2afabd00518e56 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> 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 <77684085+Henri215@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update leather.dm * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update mechfabricator_designs.dm * fix .dmi * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/mecha/working/ripley.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update ripley.dm * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/objects/items/stacks/sheets/leather.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 9afec804301e9ddfd24e2ae41e85aba886098a99 Author: Gatchapod <20936555+Gatchapod@users.noreply.github.com> 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 <Gatchapod@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit 1933d2fab3e94a4baeb075b1ba665a79c3d21f66 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update cyborg_gripper.dm * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update cyborg_gripper.dm * coin flipping * Update cyborg_gripper.dm * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Oh hi mark! * Update code/game/objects/items/robot/cyborg_gripper.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Line split * Some comments, examine(). Examining a gripper now tells you what's inside. --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> commit ad48f54c60b4043c58cacac32145ca732b789001 Author: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> 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 <96908085+1080pCat@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit 85a9b97e80f48552170605ddab459fb871a4fa7f Author: Contrabang <91113370+Contrabang@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 95b2fcf09525cf25a4abdd82e9248064e39d418e Author: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Date: Fri May 17 13:59:40 2024 +0200 challenge check fix (#25372) commit 94b7057989f5d422b47fb9786d03df8b97c7c4bd Author: warriorstar-orion <orion@snowfrost.garden> 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 <89928798+lewcc@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> * invert/guard clause * add examine text for hints --------- Signed-off-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> commit 74ad8c1463d2dcc61d37299c46dd358fbfcaef64 Author: Daylight <18598676+Daylight2@users.noreply.github.com> 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 <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com> * Fancy comments --------- Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 131e631cc4133d4004d373d13b441eec36f4dc19 Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Fri May 17 07:37:16 2024 -0400 Adds a rod smite (#25424) * better * no more ripping commit 1d97474ee559b484710b7ff7cef1ab9911c7de29 Author: Migratingcocofruit <69551563+Migratingcocofruit@users.noreply.github.com> 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 <143041327+Fordoxia@users.noreply.github.com> Date: Fri May 17 12:22:14 2024 +0100 Adds Abductor Janitorial Tools! (#25057) * 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 Br…
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 30, 2024
* 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 * Cardborg suit icons and code trimming. icons added for cardborg suits, helmets pending. * Added cardborg head sprites * Added head sprites for equip * Added Body Sprites * Spraypaint * suffering * Heavy cooking * Update crayons.dm * Update cardborg_suit.dm * DOG FASHION WOOO! * Species sprites * prettification * indentation grr * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/cardborg_suit.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/cardborg_suit.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/crayons.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/crayons.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/datums/dog_fashion.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * early return * borgimorph desc * Atomisation * Helmet nerf * Apply suggestions from code review Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * some work * More work * Removed commented out stuff * associative list * LISTLESS! * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * usr > user * oops * huff * I need caffine * Update crayons.dm * Update code/modules/clothing/suits/cardborg_suit.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Squashed commit of the following: commit f49219c0197cdaba877c1408a21216df794bd930 Merge: 4d7a67497c 5040dc286e Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Fri May 3 01:25:48 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 5040dc286e8803d1361de6207db2c49b50b82588 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Fri May 3 01:49:04 2024 +0200 Makes mentor PMs show up as mentor PMs again (#25351) commit fe59ff5c3d73cf51b71f80630a40bc056e45a60f Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Thu May 2 19:33:24 2024 -0400 adds more hand keybinds (#25225) commit b14830c85af1f09df66432fd50648fcd5b580943 Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Thu May 2 18:17:19 2024 -0500 Timer log now includes the function called (#25308) commit 073ad533faeb86eb7e056b8afd71e38afaae1485 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Thu May 2 18:38:45 2024 +0100 Autodocs robot_mob.dm. Removes an unused proc. (#25331) * Autodoc. Removes unused proc. * removes a space * Update code/modules/mob/living/silicon/robot/robot_mob.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * Update robot_mob.dm * Update robot_mob.dm --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 02a09a7c7f00b0466608df536282cb88b5415706 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu May 2 13:17:12 2024 +0100 Upgrades TGS build script to actually build RUSTG (#25340) commit 2144a93627b3ffc77849e9d559acd8e898be7e8e Author: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Thu May 2 08:52:00 2024 -0300 Mining charges, second try! (#24790) * mining charges * Apply suggestions from code review Co-authored-by: warriorstar-orion <orion@snowfrost.garden> * span class * deconstruct comment update * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/objects/items/weapons/explosives.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * ops * Update code/game/objects/items/weapons/explosives.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/equipment/mining_charges.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit d587effe2c728dc028a8f15952a287ae0b983cc1 Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Date: Thu May 2 12:37:44 2024 +0100 Beret + softcap .dmi split (#25314) * beret softcap dmi split * icon rename * dme crlf to lf * tsf cap fixes * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> * vox cap icon name * remove beret subtype on fluff * Update code/modules/clothing/head/soft_caps.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> --------- Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 15e7fcdb3fdd482bc1c48264eee2964110cbff63 Author: Divulf <134484326+Divulf@users.noreply.github.com> Date: Thu May 2 21:59:35 2024 +1200 Improves barsigns and makes them buildable. (#24685) * Improves barsigns and makes them buildable. * Requested fixes. * fingerprints and a parent call on attack_hand() (sure hope this doesn't break anything) * More fixes. (the change to barsigns.dmi is removing a bunch of almost-transparent pixels on the mead bay sign that shouldn't have been there) * Even more fixes. * Better code and sprite fixes. * early returns * better * more * switch * qwertyuiop * whoops * maps are stupid * mcramon sprites :o * i hope mapmerge works this time * i hope mapmerge works THIS time * zrsxdctfhghfcdszzsxdgcfhv --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> commit fd30c120473a58c61e2e2741b9a090e885890441 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Wed May 1 20:04:42 2024 -0700 Secondary goals will now refuse to generate if messaging is offline. (#25170) * Secondary goals will now refuse to generate if messaging is offline. * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> --------- Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 13c583d2bf755f43701f0acf38eafaa545950033 Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Thu May 2 04:57:26 2024 +0300 Sanitize empty values in `file2list()` (#25255) * Sanitize empty values in `file2list()` * seperator --------- Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> commit 87aef935869e4a3eaf5192c69ac3a8e0068afc5d Author: asciodev <81930475+asciodev@users.noreply.github.com> Date: Wed May 1 20:36:02 2024 -0400 Allow borgs to use holopads (#25094) * Allow borgs to use holopads * Revert kludge cyborg icon fix in favor of sane fix * Further remove cyborg hologram kludge For cyborgs, a false value was previously set for the safety argument when calling `/proc/getHologramIcon` (from commit 17c96bc24d). This was because the `icon/A` parameter was mistakenly set to `robot.icon`, which caused a runtime error to occur when `Height()` is called on it in line 1008, preventing cyborg holograms from appearing. Setting a false safety value made use of the so-conditional `new(A)` call on line 1003, which created a new icon from the `robot.icon` string. This kludge prevented a runtime and made cyborg holograms appear. The kludge was removed in commit dbb8851ae3, but the false safety value remained. This commit fixes that. * Update code/game/machinery/hologram.dm Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit ba4994d8897746290cce87b6ae0ac1610f55747d Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Thu May 2 03:35:39 2024 +0300 Tweak recipes of glasses (#25070) * Tweak recipes of glasses * Allow some sunglasses as ingredient * Revert time of recipes commit 5ca09c7fe7678f737aa333bf2c1653859401ba1f Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Thu May 2 03:27:10 2024 +0300 Don't walk without gravity while being space drugged (#25248) * Don't walk without gravity while being space drugged * Update code/modules/reagents/chemistry/reagents/drugs.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> --------- Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> commit 24726c60fec6104f24b9ee3db58980414d2f8a6d Author: Adrer <erwin@lombok.demon.nl> Date: Thu May 2 02:20:07 2024 +0200 Moving pulled objects as a borg checks if the turf is adjacent to you. (#25253) * Move_Pulled now checks for adjacency of the turf you are moving something to. * Move comment to correct line. * Update code/modules/mob/mob_movement.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> commit 31390ff2e1dd63f26a89b6d4944610f206ec4ae4 Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Wed May 1 20:14:23 2024 -0400 Check against current mob for admin keybinds (#25341) commit 45b0f34d9566b01c2fb610a5f01f153ee189f1d4 Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Thu May 2 03:06:23 2024 +0300 Don't check side pressure if filter isn't.. filtering (#25019) commit 50a986b8dea60b90106ce6ae7c0d3610e02ab921 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Wed May 1 17:04:50 2024 -0700 Makes tesla movement pretty (#24786) * They hate how easy this is * No more deciseconds * Intermediate code * Made tesla movement pretty. * Lint. * Update code/modules/mob/mob_movement.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Review comments. --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> commit e19559ad5480e5e870f8a487fcaef22c2335e980 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Thu May 2 01:01:24 2024 +0100 The Gibber Now Drops 6 Meat Instead of 3 When Gibbing. (#25287) * Update gibber.dm * extra commit 1feb21eed13f592809fef6c2c550859cbf32225b Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Thu May 2 00:58:35 2024 +0100 [FIX] Cyborgs With Guns Can Now Perform Executions (With Guns!). (#25275) * borg execution time * Update gun.dm * Update gun.dm * Update gun.dm commit 41eff52fac1d647d7b59cdcd7c862552d4076976 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu May 2 01:55:38 2024 +0200 Renames most processing SS' to the convention of `SS[SS name here]` (#25302) * Renames most processing SS' * Contra review commit 271d67d237338fbb396484d5c7350301e9b6a26c Author: Deniz <66401072+Oyu07@users.noreply.github.com> Date: Thu May 2 02:54:00 2024 +0300 Adds MARK: to some comments (#25184) * robot_upgrades * disability * airlock * mecha * Abcudtor * Forgot a space here * Some style changes + additions * removed a no comment * comment change * empty * empty again dont dare look insde * ault Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 4a1f3967076c0f6bb973e511a406084e2f238fc2 Author: dearmochi <1496804+dearmochi@users.noreply.github.com> Date: Thu May 2 08:52:14 2024 +0900 Grant TRAIT_NOFIRE while cloning (#25327) * Grant TRAIT_NOFIRE while cloning * Update code/game/machinery/clonepod.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit f8ebba6ed100f98d74f4404da6422b267f567688 Author: Burzah <116982774+Burzah@users.noreply.github.com> Date: Wed May 1 16:49:05 2024 -0700 Adds logging for thrall deconversions (#25305) * thrall deconversion logging inside water.dm * moves logging to vamp_thrall.dm instead commit f0209d975b070fc82ebdb92ea2bdc0e603c72a48 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed May 1 19:46:42 2024 -0400 ion scatter gets 2 more pellets and 5 degrees more spread (#25269) * ion scatter gets 2 more pellets and 5 degrees more spread * mech ion as well commit 96aa08823c50fe3b6b4cd9142544d9c000b74d6d Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu May 2 01:23:31 2024 +0200 Adds it (#25254) commit af7f35a0feab8879e5d98b7f81497a63c8502ba0 Author: Arthri <41360489+Arthri@users.noreply.github.com> Date: Thu May 2 07:23:26 2024 +0800 Remove tgui say error (#25273) * Remove the error * Build and update tgui * Restore precautionary if statement * Build and update tgui * trigger ci --------- Co-authored-by: Arthri <41360489+a@users.noreply.github.com> Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com> commit a3a1be49b0b7a86048f26f9edc612f50858ffeec Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed May 1 19:23:19 2024 -0400 modsuits have the same virus protection as space suits / biosuits (#25310) commit daf76d3aaa84b801419c9b0d72631b01495dc326 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed May 1 19:23:09 2024 -0400 gives lavaland plants 50 potency (#25322) commit 55ed33a253630622e507f4557ed635c7768b6927 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Thu May 2 01:23:03 2024 +0200 Changes incorporeal_move to defines (#25319) * Changes incorporeal_mvoe to defines * Lets the switch use defines too commit f2dd4f6595fc086dbb9fe36f7f61b9539e7e3675 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed May 1 19:22:59 2024 -0400 fix shield generators on zlvl change (#25318) commit 3e5a3ea35cbc281beec7e0fd506b069e462753f2 Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Wed May 1 16:37:44 2024 -0400 works (#25337) commit f97a9ee9346eeb758da8b444dc48bfee039e6c6e Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Date: Wed May 1 19:05:54 2024 +0100 NanoMap Auto-Update (Wed May 1 01:16:06 UTC 2024) (#25329) Co-authored-by: NanoMap Generation <action@github.com> commit 9d2c9d9ed1424c8d297e9a5f72feabb48113fa26 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed May 1 13:27:37 2024 +0200 Removes a variable that is only set once (#25003) * One of the variables of all time * Oyu review commit 44fb00ca25010083a4de517da9c769063c1be1f0 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Date: Wed May 1 13:42:57 2024 +0300 Qol + fix for mecha (#25206) * Qol + fix for mecha * Update code/game/mecha/mecha.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/mecha/mecha.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 86530f4e3efa9ed82ccb1c57cb5aa3a26bc43318 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Date: Wed May 1 13:40:48 2024 +0300 BUFF: Mining Grenade launcher (#25204) * BUFF: Mining Grenade launcher * Update weapons.dm commit 14ce47830dc39157ead1355f18098bee658a87c7 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Wed May 1 03:39:01 2024 -0700 Reduce the chance of getting no changes to a stat when mutating plants. (#25179) * Reduce the chance of getting no changes to a stat when mutating plants. * Update code/modules/hydroponics/seeds.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 7daf219ec0db1b4de86da6470f26ca68012c9e3f Author: larentoun <31931237+larentoun@users.noreply.github.com> Date: Wed May 1 13:37:08 2024 +0300 More Crowbar Acts (#24986) * crowbar acts part 1 * livings checked * convert istypes to tool behaviour * solars * use tool_volume * Update code/modules/research/server.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com> * Update code/modules/power/generators/portable generators/pacman.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com> * return * return returns * Update code/modules/mob/living/simple_animal/bot/mulebot.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com> * Update code/game/objects/structures/janicart.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com> --------- Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 4d7a67497c4e6d1af5af761af0d3027ab57b37b1 Merge: afd185773a a2e7d95306 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Wed May 1 04:00:48 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit a2e7d95306fc3215e6b61271790e2573666112ae Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue Apr 30 22:41:03 2024 +0100 Moves a custom item to the right file (#25325) commit 6ea2f09570835e3db62ab7dee0ae3cd6fd829646 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Tue Apr 30 20:41:45 2024 +0200 Removes a rogue # (#25313) commit 9271d9e106fa184c9ad7ff0991f469f5d3ca2528 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Tue Apr 30 05:29:19 2024 -0700 Added tracking of when a secondary goal is handed out. (#25168) Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> commit 4ea0bbd6da7f606df6def1e3d715ed1afe447c05 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Tue Apr 30 13:07:18 2024 +0100 Tweaks Farragus Robotics, Adds a Corpse Delivery Chute! (#25090) * 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 * Makes farragus less bad * Tweaks * Reconstruction * Tweaks * Merge Deconflict AGAIN * Update cerestation.dmm * More deconflictation * Update cerestation.dmm commit 107950f50ef0238e0a025c654cf5af72ae451dc6 Author: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Tue Apr 30 12:51:15 2024 +0100 Removes Advanced Reagent Scanner from Service & Medical Cyborgs, Transfers Functionality to Innate Reagent Vision. (#24457) * Update robot_modules.dm * Adds advanced reagent vision * rounding * Update code/datums/outfits/outfit_debug.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/clothing.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update atoms.dm * This one hyphen will kill me if I don't fix it. * Update code/game/atoms.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/atoms.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update atoms.dm * Update code/game/atoms.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/modules/clothing/clothing.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> --------- Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> commit 773ee4afedc6cdc771af65097db11c16432182ee Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Tue Apr 30 12:45:41 2024 +0100 Update the TGUI conflict merge resolution to properly commit rebuilt bundles (#25246) * update the tgui conflict merge process * tidy this commit 94b5d2203457d739faeec2cbe6d2b95c1c75b29d Author: larentoun <31931237+larentoun@users.noreply.github.com> Date: Tue Apr 30 14:40:41 2024 +0300 Records Multiline (#24991) * pre-wrap for labeledlist * multiline for pdas * consoles fix * update tgui * update tgui bundle commit 54d563ada1b9e48e0fcca0591319f01813d98aef Author: Charlie Nolan <funnyman3595@gmail.com> Date: Tue Apr 30 04:23:16 2024 -0700 Reverse direction of requests console messages. (#25169) Also fixes a bad error message. Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> commit afd185773a3a82f850c3ea055ca01c5be17de5b3 Merge: 8b0ff64cc0 ec2c5638fc Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Tue Apr 30 03:45:45 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit ec2c5638fc1dadf785450ad95bdd9c95ec44b83f Author: Zantox <vetle.neumann@protonmail.com> Date: Tue Apr 30 02:57:36 2024 +0200 Add ventcrawl unit-test (#24830) * Add ventcrawl unit-test * Fix linting * Solve chair-flipping without HANDS_BLOCKED * Remove unit_test_dummy variable * Use `isturf` helper in ventcrawl unit-test Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Update code/modules/unit_tests/atmos/test_ventcrawl.dm --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 3e9c29258ecd78a7679d301e209290a4a958b924 Author: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Date: Mon Apr 29 20:51:19 2024 -0400 Diverse Traders (#24883) * Diverse Traders Types * Trader Type control, announcements, species spawning * Trader Outfits * Posh Moth - Posh Cane * Landmarks, Trader ID Name Change * Trader Shuttle Adjustment - Landmarks for Item Pools * Outfit Survival Kit changes * Added another refill for the hand labeler due to more cargo * Trader Shuttle locker fix * Item Stocks, Item Stock Assignments, Box Kits, Love Bottle * Mech access, No double mechs, Small box fix * Removed Solgov Gunkit from General Pool * Spacing * Moved traders to not be event subtypes, added documentation to vars * Boxed spacing, removed improper * Moved postequip, used box variables * Lore team requested change - Bolt action instead of AK * Changed landmark * Moved soviet ammo to minor gear, increased soviet minor gear to 8. * Obfuscated Cybersun * Lootpool Adjustments * Readded Solgov Kit to general pool at low weight * Commas! * Spelling Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Comments Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Re-Nulled After_Equip_Job * Removed extraneous var spaces * Relocated space in trader introduction message * Robomoon is now once again Cybersun * Impropered Enforcer Kit * No more ERT box for non-NT boxes * Fixed turbine kit stock part amount * Subtyped skrell/unathi suit boxes * Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons * Reduced weight on arm/esword implant rare items * Also reduced arm laser weight * Added a couple items to skipjack large - more 'random', filled in reduced weights * Path typo fix Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Removed trailing / in path Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Removed Cheap Breacher suit from inventory * Apply suggestions from code review Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 417d6fe8cfe35c664ed04e78726a1fb18b7fa473 Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Mon Apr 29 20:50:35 2024 -0400 Makes kudzu much more likely to entangle you (#25167) * lets kudzu entangle you * Increase buckle time * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 48db11cd8454af49e9ced4afd3352f40fbfffee4 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Date: Tue Apr 30 03:14:26 2024 +0300 Ash Walkers now Ash Doctors (#25207) * Ash Walkers now Ash Doctors * Update other.dm commit 6848ee850252a01353071eeea0027a20fe462b7a Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Tue Apr 30 01:12:49 2024 +0100 Updates readme, licence files (#25259) * test * more * more stuff * images * more! * sanity? * details * fix licences, update readme * remove GPL disclaimer * more docs * wiki link * spacing tweaks * text change * wording * DM language reference * Update README.md Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com> --------- Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com> commit 2e4089dc15b985ce0923cff2b68fe5cbce5f1cdd Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Mon Apr 29 03:07:25 2024 +0100 Various TG Chat message sorting fixes (#25229) * Fixes unsorted emotes, announcements, votes, surgery, prayers, ahelp responses * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit 4add53d6c1cce3e564305607d37383deb721628d Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Date: Mon Apr 29 05:00:34 2024 +0300 Add alternative Spear recipe for Ash walkers (#25208) * Add alternative Spear recipe for Ash walkers * Update recipes.dm * Update code/modules/crafting/recipes.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/crafting/recipes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 7f37f93408a6016cf1ac4ec44caf0e37db65d3b3 Author: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Date: Mon Apr 29 04:33:25 2024 +0300 fix avoiding powerfist antidrop (#25274) * fix avoiding powerfist antidrop * Update code/game/objects/items/weapons/powerfist.dm Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update code/game/objects/items/weapons/powerfist.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> commit 83c9d8878a37aa06ab368b894f2642612ec61f9e Author: Rayforx <154929127+Rayforx@users.noreply.github.com> Date: Mon Apr 29 00:21:48 2024 +0200 Blood level QoL for vampires (#25075) commit a50683ef28d4a170754a9ddab36be53a755a223c Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun Apr 28 18:03:14 2024 -0400 Adds the SPRK-12 Energy Pistol (#24869) * Adds the SPRK-12 Pistol * I Was improper and forgot to name it right Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * check it * Update gun.dm * less copypasta * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> * early return --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> commit fb027f73ddfe697004627a48b6dec9ab2045e849 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sun Apr 28 22:57:26 2024 +0200 Changes the `is_changeling` and `is_mindslave` procs into proper defines (#25212) * Changes these procs into proper defines * Henri review commit fc7acc4597c2e69a425395f37d7cd4e24ed9ba82 Author: Burzah <116982774+Burzah@users.noreply.github.com> Date: Sun Apr 28 13:05:39 2024 -0700 adjusted logic for humanize_spider (#25286) commit a42bacb9fa33a805bc4c53be0f3b764274aa0664 Author: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Sun Apr 28 15:53:29 2024 -0400 fifty percent off deal (#25243) commit 057e9f16eb56606b2e3c6968fab165d89a04e05c Author: Code-Lyoko0 <degg444@gmail.com> Date: Sun Apr 28 14:51:34 2024 -0500 Informs Deathsquad that the bomb has been armed during Epsilon Alert. (#25242) * informs the Death Squad that the bomb has been armed during Epsilon Alert * Contra review, properly qdel'ing the radio on destory commit 6fa7a48ba857c8324afb8809ec05a3191db49d2d Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sun Apr 28 15:48:13 2024 -0400 ibheriewfofi0wnmfeionfm (#25294) commit daa368ca10e6bd9dc175d856bcbd061cf07dce97 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun Apr 28 15:48:00 2024 -0400 day 1 shadow tweaks (#25290) commit 36f7c43c9c0036a1b1ce1381ccffa5dbfb36fa54 Author: larentoun <31931237+larentoun@users.noreply.github.com> Date: Sun Apr 28 06:01:16 2024 +0300 Better Gas Scans (Chatbox and Colored!) (#24975) * feat: Better Gas Analyzer AND TGUI! https://github.com/ss220-space/Paradise/pull/2333 https://github.com/ss220-space/Paradise/pull/2461 https://github.com/ss220-space/Paradise/pull/2522 * rename atmos helpers * remove tgui * more fixes * better act self * now scanner finally works again * what if we want turf beneath the target? * fix chatbox * color code the gases * unnecessary stuff removal * ghosts can now scan portable atmospherics * better code * do we really need to know that? * change colors * add a space to separate gases from other info * update tgui bundle * update dark-theme CO2 color commit 1d4d95a10b4d3f8c52eb7a4aea1211dc65467693 Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sat Apr 27 21:43:58 2024 -0400 yes (#25297) commit a3e43a3161008d1ae5ccb72ae17637703763c423 Author: warriorstar-orion <orion@snowfrost.garden> Date: Sat Apr 27 20:06:39 2024 -0400 fix: null check during morph eat (#25291) commit d2d932d4d15ddb3426b4b284d06f5ea1c99eb6c9 Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Date: Sat Apr 27 12:22:22 2024 +0100 NanoMap Auto-Update (Sat Apr 27 01:09:53 UTC 2024) (#25280) Co-authored-by: NanoMap Generation <action@github.com> commit 572b79bce96fa164527e74f6842c94c5f8fd9700 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sat Apr 27 10:25:17 2024 +0200 Removes num2dir (#25261) commit dbc3bf1c8bc0981e84aa213b3ccc0518e5c92e46 Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Sat Apr 27 03:23:48 2024 -0500 Removes a lot of lists (#25272) * Removes a lot of lists * Update code/game/turfs/simulated/floor.dm Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/turfs/simulated/floor/misc_floor.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/turfs/simulated/floor/mineral_floors.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/game/turfs/simulated/floor/mineral_floors.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> --------- Signed-off-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit e810b3a9c76fb3bb42b381c4e6540efe4a14b5d9 Author: Adrer <erwin@lombok.demon.nl> Date: Sat Apr 27 10:21:13 2024 +0200 Security level changes no longer force depowered lights on. (#25245) Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> commit b1658390731745adf5cc9fb039bb0f17ad3c11a7 Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Date: Sat Apr 27 01:17:59 2024 +0100 Biosuit resprite (#25004) * biosuits babeyyy * minor changes to comments * lil booties * suggested change commit e73dc13a29c34c5065462ea14653996e4ba40c68 Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Fri Apr 26 20:00:51 2024 -0400 Improves interactions with display cases. (#25228) * better player info for display case * this too * improved messaging * finish out the docs * Update code/game/objects/structures/displaycase.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 7a45c712b898b7c9fe7db69bd6c919b6986a0264 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sat Apr 27 00:32:00 2024 +0200 Adds a stamina meter (#24782) * Finally done * Contra + Qwerty review * I don't think I broke anything :D * Lewc review commit 88af37bfcf564b9f433a74839ab0756dfcee780d Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri Apr 26 18:31:09 2024 -0400 Adds the NTSS Shadow (#24778) * WIP * change this * the rest of the fucking owl * removes QWERTODO * let us fix the CC beacons too * makes it look better * makes CI work on everything but shadow, asking warriorstar * exclude ntss shadow from window spawner checks * final changes hopefully * moved around parts of the shuttle * Update code/modules/atmospherics/machinery/components/trinary_devices/filter.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * moves it moves it to it's own file * move it move it * bobby_drop_tables * oops * fuck --------- Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 78e782dfcbf3390ea47120b90942f78419e5bec2 Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Fri Apr 26 23:11:08 2024 +0100 skip nanomap when no changes needed (#25182) commit 8b0ff64cc03053f2b1ac726c15cf6fb5bffee7ad Merge: c75279f7c8 7ab24d6519 Author: Fordoxia <fordoxia@googlemail.com> Date: Fri Apr 26 22:42:06 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 7ab24d6519bb4871ee8c240c6dbf7a37a9392586 Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri Apr 26 16:50:36 2024 -0400 fixes tarot card capitalization in uplink (#25278) commit c75279f7c8452ab02a0e41fe02d762fa7b278b07 Merge: 8c704101de 5b8ae44d03 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Fri Apr 26 16:23:32 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 5b8ae44d032c2959e56cae07fb7230fd70e1432c Author: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com> Date: Thu Apr 25 15:14:31 2024 -0400 whoops (#25268) commit 5adf1408d151a74200ae1d9bf577c8bb5b34a9a5 Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Thu Apr 25 22:04:31 2024 +0300 Bring `respawn_enabled` back to config (#25264) commit 20701d905c2d86d11cc49b34151c5f94bcaa8e58 Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Thu Apr 25 14:20:50 2024 -0400 Shades now drop bodies when killed/destroyed (#24784) * this was a bit of a pain * yes * damger reviwe * funny review * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit e204ca66947d827dade7c034fb0a05d02f471705 Author: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Fri Apr 26 04:20:35 2024 +1000 pens (#25159) commit ae7da539e3b3cc886927269a848507eabbc73f1d Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu Apr 25 19:20:14 2024 +0100 Fixes an SQL update file + null character save issue (#25149) * This is what I get for sending a PR * I DID SAY TESTING: None commit 1377fd11667a1b49af3bf101a04780268193d2d1 Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Thu Apr 25 06:00:44 2024 +0300 [s] Disguise with plant trick (#25260) * Fix plant-disguise trick * Resolve name collision commit af5d187014386ee61ce11f7a63b893f5e4e66f2b Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed Apr 24 19:10:46 2024 -0400 Adds magic tarot cards [SERIOUS DO NOT CLOSE AFTER AFD] (#24933) * starts it * Update magic_tarot.dm * MORE PROGRESS * So many thanks to Cloudbucket, for sprites * The Work, the Art, continues. * more changes * pushes the Work foward. All cards done. * and more thanks github * adds to BSH * tochat * Finishes QWERTYTODO. Magic key. World smoke * Isaac and his mother lived alone in a small house on a hill. Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television. Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above. “Your son has become corrupted by sin. He needs to be saved.” “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life. Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins." “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world. One last time, Isaac’s mom heard the voice of God calling to her. “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you." "Yes Lord, anything!” Isaac’s mother begged. "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else." "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen. Isaac, watching through a crack in his door, trembled in fear. Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug. Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below. * nanny bag it before I forget * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * returns early * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * RE-RE-RE-REVIEW * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com> * requested changes and such * duh * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * returns early * Update code/datums/status_effects/buffs.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * new hrefs here to troll CI :trollface: * Update code/game/gamemodes/wizard/magic_tarot.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com> commit 69d6a8df2110f1b7d7fdec9306f3e84ed8c36aa8 Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Wed Apr 24 16:21:11 2024 -0500 Overhauls player facing verb UI (#24060) * Preference verb overhaul * this too * Update code/__DEFINES/preferences_defines.dm * Update code/modules/client/preference/preferences.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * fixes + better html * removes unused define --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit e615738e22d572b2d9cf2f7ece45b73991e20cc5 Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Wed Apr 24 20:42:12 2024 +0100 All your TGUI belong to us (#25250) commit 0c5fdaa57be0b8c2fec282f71b40a44295b3adab Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Wed Apr 24 15:40:45 2024 -0400 Updates contributing guide regarding signals, removes SIGNAL_HANDLER_DOES_SLEEP (#24824) * Updates contributing guide, removes DOES_SLEEP * Update .github/CONTRIBUTING.md Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 3333fd051ff6e6feb70690782215d936cbaa245d Author: larentoun <31931237+larentoun@users.noreply.github.com> Date: Wed Apr 24 22:38:47 2024 +0300 if you have PROCCALL rights, you can call it from VV (#25030) commit 20a0836d1a3ba8b8b12bcd4db29d89e4b549ea21 Author: Rayforx <154929127+Rayforx@users.noreply.github.com> Date: Wed Apr 24 07:45:43 2024 +0200 Update ghost_bar.dm (#25234) commit c3af4456e15172057b90ae4431269a6ed8cd51d4 Author: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Wed Apr 24 00:45:37 2024 -0500 Restricts rubbershot's guaranteed knockdown range (#25178) * restricts rubbershot knockdown range * actually commit the right version * Henri review commit a2de7f4533d36c8d2aa6697657e2cb58b2bc72f6 Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Wed Apr 24 00:45:25 2024 -0500 fixes a radial menu gc false positive (#25237) commit 6c756f98c02300a3a3d106eab89980cff6097880 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Wed Apr 24 07:45:16 2024 +0200 Makes the walls from Desecrated Duel GC properly (#24990) * GC is a thing of all time * Spacing commit d233824add0b45bf2062dfe0cf9537fc2541ca1e Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Wed Apr 24 00:45:03 2024 -0500 nerfs machine overload (#25153) commit 752deb811984b2adaca140e5a7e7c82776be2ec1 Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Tue Apr 23 22:09:44 2024 +0300 Make it possible to get out of abductors experimentation machine (#24842) * Make it possible to get out of abductors experimentation machine * Better roll of result * Better message of escape attempt * Apply suggestions from code review * Remove unnecessary check * Slightly tweak values commit 8c704101de2fb08d63002e49fe92ed8f4fd62ead Merge: 339ded7dd3 67cba07b99 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Tue Apr 23 03:22:48 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 67cba07b9975b23cd7cc48fd7ea7d503ba9df19c Author: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com> Date: Mon Apr 22 21:14:08 2024 -0400 Fixes Cerestation Medical Storage disposals bin, also simplifies disposals in Medbay Break Room (#24776) * Fixes Medbay Storage disposals bin * Life is pain * Rogue pipe be gone commit 853f108c89aa005e2ed1a391a54ed8fd0cb40736 Author: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Mon Apr 22 20:50:48 2024 -0400 [SERIOUS] Improves admin tooling for radiation (#24968) * lets clean some radiation * changes * lgtm commit de6a54fbde1a0ed80e5ad4209fa2c10ef9d43c7e Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Tue Apr 23 02:49:52 2024 +0200 Removes all mentions of `return .` where they would be unnecessary (#25142) * Removes all mentions of `return .` * I can do this all day * Arthri review * Update code/__HELPERS/sanitize_values.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/__HELPERS/sanitize_values.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> commit 6b442d3ed2ba46876c6d847d8fb87f8777325abd Author: warriorstar-orion <orion@snowfrost.garden> Date: Mon Apr 22 20:48:08 2024 -0400 cere: increase maint loot spawns (#25152) commit a1ca632a191476324ff65e7d3c0e1c5ef3a4b8d1 Author: Aylong <69762909+AyIong@users.noreply.github.com> Date: Tue Apr 23 01:37:59 2024 +0300 [TGUI] Coin Mint (#24885) * Backend * Simplify * Almost ready * Done., i think * You can now craft a money bag * Autodoc * Fingerprints * Earlier return if no money bag * Update code/modules/mining/mint.dm * Update code/modules/mining/mint.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update tgui.bundle.js * Rebuild * Fuckin hell * Rebuild * Update tgui.bundle.js * Update code/modules/mining/mint.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/mint.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 2cfa9d620fd5f5c1aeb9e2ab39d1473369ff1169 Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Tue Apr 23 01:04:38 2024 +0300 Fixes exploit (#25101) commit 7fa44a31fb522fcb62ae4d5f4cca8707f1d99cf9 Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Tue Apr 23 00:32:49 2024 +0300 Full Auto Gun Mode Component (#24998) * Full Auto Gun Mode Component * Apply some refactoring * spaces mhmm * Some signal movement * Apply DGamerL suggestions * Unknown SIGNAL_HANDLER no more * Fix runtime if uid is passed * Why the hell you even care * god you serious --------- Co-authored-by: Gottfrei <zweisen@gmail.com> commit 00be61a8116ad3dbc550853870cd8228977deccf Author: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com> Date: Mon Apr 22 23:53:14 2024 +0300 Better round start time handling after using delay (#25035) commit 2d1d7e283b0fd5617945c933e84f448ec3f49ced Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Mon Apr 22 15:46:21 2024 -0500 makes some uis no longer automatically update (#25121) * makes some uis no longer automatically update * fixes cloning sporadically not working * Revert "fixes cloning sporadically not working" This reverts commit 2d88887cf632cebf6993a9bea0bb2df64ec763d0. * Update code/modules/hydroponics/seed_extractor.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/hydroponics/seed_extractor.dm * Update code/modules/hydroponics/seed_extractor.dm --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 80438de31641d0079cfc66c89e7eeafbaaad3222 Author: larentoun <31931237+larentoun@users.noreply.github.com> Date: Mon Apr 22 23:46:20 2024 +0300 Remove automatedannouncer mob (#24727) * remove automated announcer mob * remove list(z) from autosay * typo * remove more of unused role args * missed passing a value... * move comment * better check * better check * comment for say_understands * Update code/modules/mob/living/brain/living_brain.dm Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> --------- Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> commit 8b6fec06221500472daab165c42911b81affb341 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Mon Apr 22 13:38:01 2024 -0700 Prevent duplicate messages when sending a PM to yourself. (#25124) * Prevent duplicate messages when replying to yourself. * Oops. --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> commit 58c61475e650f0a2e147d256e7df800d65e92f7e Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Mon Apr 22 15:37:16 2024 -0500 fixes repair borg not working in some cases (#25151) commit 3449f5175dc21fa5b34a60c3067a5e8c7fbfa76c Author: warriorstar-orion <orion@snowfrost.garden> Date: Mon Apr 22 16:33:14 2024 -0400 ci: add maplints/fix matching stacked disposals/pipes (#25120) commit 831776b40dc6505cc2cf740f5fa63ef0634629a0 Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Mon Apr 22 15:33:07 2024 -0500 fixes some action button issues (#25140) * fixes some action button issues * murder * thanks autocopy * morph and xenos * Update code/datums/action.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 71bc06cd4eed17607a910854b0d697c8d44a770d Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon Apr 22 22:32:58 2024 +0200 Halves the damage dealt by PKAs to blobs (#25154) * Makes PKAs deal half damage to blobs * Update code/modules/events/blob/theblob.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> commit 15483d1b88885e807ffc538f3e0cab2484505c08 Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Mon Apr 22 21:32:52 2024 +0100 Add modern equivalents of legacy IE-only CSS rules/properties (#25205) * alternatives to legacy -ms stuff from TGUI * tgui build * bundle * rebuild --------- Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> commit fdea9d76692f7f384a9b5dc09dd50fcce8c55fb5 Author: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Mon Apr 22 23:08:45 2024 +1000 Update cerestation.dmm (#25190) commit 5fe22f485c028615f76f9acbf666daa15ecabadf Author: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Mon Apr 22 08:00:03 2024 -0500 permits mobs with chunky fingers to fire blowgun (#25176) commit 4b0f774cdc5f0f8472081fb60b94ba6995e57843 Author: Code-Lyoko0 <degg444@gmail.com> Date: Mon Apr 22 05:29:06 2024 -0500 make the station not go into delta alert when the Death Squad arms the nuke (#25163) commit 339ded7dd3745f78584cf4d16eb805479335b4a7 Merge: 8481f50f90 f12f75c652 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Mon Apr 22 01:52:33 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit f12f75c65284b86779086fbeba2a6778a23d8bb9 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Sun Apr 21 16:47:32 2024 -0700 Update CONTRIBUTING.md (#25235) commit 6d3549c3ca35eb4dcecabb35968af1d4d81a9d35 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon Apr 22 01:34:33 2024 +0200 LOOK IT'S COCAINE BEAR (1985) (#25086) commit ebbbf62cecb3deaba0ae9e484d2b5874a2cde604 Author: tristan1333 <ttb09RD@gmail.com> Date: Mon Apr 22 09:06:47 2024 +1000 Chicken meat/burger, Onigiri, Seaweed, updated boiled rice sprite (#24813) * Adds chicken meat, burger, onigiri, updates boiled rice sprite * Update code/modules/food_and_drinks/food/foods/side_dishes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/stacks/seaweed.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * changed chickenburger pathname, deleted old boiled rice sprite * Transfers reagents from rice to onigiri * Update code/modules/research/designs/biogenerator_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * All sushi now requires seaweed * new seaweed desc, attackverb oopsy daisy, seaweed attack_self doesn't show pointless list, Onigiri goes in hand * moved seaweed sprite to organic.dmi * Update code/modules/research/designs/biogenerator_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update organic.dmi * re * goal * oops * early return * Update code/modules/food_and_drinks/food/foods/side_dishes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/food_and_drinks/food/foods/side_dishes.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/food_and_drinks/food/foods/side_dishes.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/food_and_drinks/food/foods/side_dishes.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> commit 224c488c40191e4f30db7102350f14d5ac5bdec6 Author: Burzah <116982774+Burzah@users.noreply.github.com> Date: Sun Apr 21 15:54:06 2024 -0700 CA Gang (#25233) commit 0a38123ff8bf5e40da19e86090e088d6cc830a66 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Mon Apr 22 00:39:59 2024 +0200 Adds me to `CONTRIBUTING.md` (#25232) * I WILL conflict burza and funny * Okaaaaaaaay fiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiine commit 8481f50f9015a6c0b91b36ad18b16b5c6e6e0219 Merge: 5b793c36ed 4f8d91a316 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Sun Apr 21 21:54:14 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 4f8d91a316a915d3ab627b02f731a3ccd6beb718 Author: Charlie Nolan <funnyman3595@gmail.com> Date: Sun Apr 21 12:45:47 2024 -0700 oops (#25210) Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> commit 9e6dcf9c46d6e9d1d476f814a0e8f43b0d11a437 Author: GDN <96800819+GDNgit@users.noreply.github.com> Date: Sun Apr 21 13:26:35 2024 -0500 removes the remaining datum redeclares (#25220) * removes the remaining datum redeclares * the two fixes * finneee contra * OK CONTRA * readd * CURSED TO BE BROWN! * facking automerge commit f83ef617e97107c02d778bebdbbd28df02b9b07e Author: Luc <89928798+lewcc@users.noreply.github.com> Date: Sun Apr 21 11:59:23 2024 -0400 Expands "genderless" to all species, adds body-type option, removes some gender checks (#23910) * adds most body type support, removes some gender checks * remove gender from species, accessories * restore pick_list * re-adds limitations on accessories * Universal access to body hair * remove unused var * Update example config, some preference saving code * updates tgui bundle * oops * Remove formatting * hopefully undoes formatting changes * dammit * been meaning to fix this one for a while * dgamer reviews * move body_type into human_defines * sql file changes * update tgui * Update db code * bump versions --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> commit 9bc9b4b67ac460816db834e81a2d335eff6003e8 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sun Apr 21 17:24:50 2024 +0200 Removes duplicate definitions of `/datum/gamemode` on almost every gamemode file (#25219) * Why did every gamemode do this :( * Contra request commit 585a885b1f5c667f6e2a4da55571c7cde833a338 Author: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sun Apr 21 16:53:25 2024 +0200 Easy fix (#25216) commit f6196809f2c6367ea41e34a7864b7a09292fd590 Author: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Date: Sat Apr 20 10:08:45 2024 +0100 NanoMap Auto-Update (Sat Apr 20 01:09:53 UTC 2024) (#25211) Co-authored-by: NanoMap Generation <action@github.com> * Revert "Squashed commit of the following:" This reverts commit baaf5dd7b82e82c2ac4e6c80a82f5d7426a2b723. * Update code/game/objects/items/crayons.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * stuff * Update cardborg.dmi * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> * refactor extended descriptions * Squashed commit of the following: commit b819961a52ccaf982026744cb6617b1a485181a8 Merge: e5e4941732 67a8a340e6 Author: Fordoxia <143041327+Fordoxia@users.noreply.github.com> Date: Sat May 25 14:55:18 2024 +0100 Merge branch 'master' of https://github.com/Fordoxia/CRUNCHParadise commit 67a8a340e6468efd775e20166825fa328317c584 Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat May 25 02:43:32 2024 +0100 Fix admin PMs not working from discord (#25604) commit 2e01f3591d248917e92284038aab68449884e1ff Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> 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 <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> --------- Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Contrabang <91113370+C…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
-Status: Awaiting type assignment
This PR is waiting for its type to be assigned internally
Fix
This PR will fix an issue in the game
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
Revenants no longer runtime because someone added something to attack ghost without typechecking again
Why It's Good For The Game
runtimes bad typecase pls
Testing
clicked shit
Changelog
🆑
fix: makes revenants not runtime clicking nearly anything
/:cl: