[pull] master from ParadiseSS13:master #15
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Co-authored-by: Bmon <[email protected]>
* stealth box fix * isturf moment
#26743) * IT WORKS UP UNTIL THIS POINT * Consolidates SLOT_FLAG and SLOT_HUD into one * Remove cover_both_ears * SLOT_HUD to ITEM_SLOT * Remove clothing_trait changes for the time being * Remove accidental copy-paste * Re-add no-slip var * More failure to copy-paste correctly * Leftover flag * Combine left and right slot flags where possible * UNGOOF MY DEFINES, PHAND IS NOT A THING * Minor spacing changes * Some more fixes from merge * Seperates ITEM SLOT AMOUNT into two defines * ON SECOND THOUGHT LETS NOT DO THAT. * Addresses Contra's review * Thank you GREP * Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES * Added a comment to the bitmasks in clothing defines * Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY * These are for a seperate PR. * Magboot fixes * Requested changes * Re-add accidental removal * Wrong flags * Update code/__DEFINES/clothing_defines.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Chap <[email protected]> * Requested changes * Merge fixes * Fix double headset * Fixes multiple accessories --------- Signed-off-by: Chap <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: Contrabang <[email protected]>
Co-authored-by: Adrer <[email protected]>
* Reduces range for energy seeking of generators, adds energy spreading and changes instances of power to energy. Containment field destructor no longer crashes when it has no connected generators * review changes * undef * removes redundant line * review changes
…mbs, Minor Refactor of `can_inject()` and Related Variables (#27118) * Creation * refinement * Update hypospray.dm * Update human_mob.dm * update * Update hypospray.dm --------- Signed-off-by: CRUNCH <[email protected]>
* dmdoc: Some cleanups. * satisfy check_grep
* Rover Cyborg Adding a new cyborg skin, 'rover'. * No-Hat The hat won't fit on its head without changes to how hat wearing works. * Rename to Rover-Engi To make way for other department module names.
* muhsoul * onmob for "goggles" * oops all the nonhumans * meson onmob * fixes drask mesons * slight edit to grey onmob --------- Co-authored-by: Bmon <[email protected]>
…#27280) * Delete icons/obj/guns/magic.dmi * Resprites the wizard staff icons, AND the SPELLBLADE!!! The following sprites have been changed, and may have had additional animated frames added to their icon states - Spellblade - Staff of change - Staff of animation - Staff of healing - Staff of door - Staff of slip - Staff lava - Staff of chaos - Staff of nothing - Wand of Slip - Wand of revive - Wand of death - Wand of door - Wand of chaos - Wand of poly - Wand of tele - Wand of fire
…] (#27298) * Delete icons/mob/inhands/weapons_lefthand.dmi * Delete icons/mob/inhands/weapons_righthand.dmi * Delete icons/mob/inhands/staves_lefthand.dmi * Delete icons/mob/inhands/staves_righthand.dmi * In-hand resprite for the spellblade, and wizard staves nominated most likely to merge conflict PR of all time!
* add brass lights * start adding clockwork floor lights * implement floor lights * fix an error and add missing brass light sprites
Better spriting for the CMO's mantle.
…dmi ] (#27281) * Delete icons/obj/wizard.dmi * RESPRITES A FEW ICONS - Horse broom - Staff of Focus - Witch broom - Wizards Staff prop All updated with better color to not be an eyesore, while maintaining their old design
* Deltastation Arrivals Remap * Deltastation 2 * 3 * Delta TIME * Oops I fucked up the pod * Test Commit * Test Commit 2 electric boogaloo * Resolves linter conflict * More linter fixes * Adresses requested changes * Updates and prettifies some floor tiles
* Wheee * Shuttle 2 electric boogaloo * Adresses Suggested Changes
* Update emeraldstation.dmm * removes unwanted changes * Update emeraldstation.dmm
* Janitor Rover Adds the janitorial version of the Rover cyborg skin. * Typo Fix Jani rover formatting fix * No-Hat Currently the code doesn't support different hat offsets for directionals. * Pink-to-Purple Changed to a purpler color to better match other janitorial items. * Deconflict * Deconflict Again
* Removes /structures/ * Add updatepath
* iteration 1 * oops * Okay now it actually works * remove rad cap * Adds a singulo monitor * comments and other fixes * rebuild tgui * updates last size now. breach alerts now go before warnings * oops * fix console lables for the field gens * New generator lookup algorithm * comment added * sort out the return and checks on temp_gens * Adds sprites to the singulo monitor * fix sprite stuff and singulo alert * rebuild tgui * Adds a singulo monitor board to RnD. Uses the correct icon when no singulo is being monitored. * give commas some space * Adds a singulo console board to the singulo engine crate * style fixes and fixes the check for singularity location and type * Rebuild Tgui * style fixes and a comment * Removes redundant brackets * Correct the check for there being containing generators * Changes the generator_field variable to a more generic name * adds a period to a comment * Restore accidentally modified icons to their original state * Rebuild TGUI * Rebuild tgui * rebuild tgui * Rebuild TGUI * rebuild tgui * TGUI rebuild * Style fixes * TGUI rebuild * rebuild tgui * rebuild tgui * Let's see if this works * I didn't see that merge conflict. Rebuilding again * rebuild tgui * Rebuild TGUI * Review changes * Changes to the new variable name in the singulo monitor * Adjusts bar values for each colour according to the reduced energy capacity of the new generators * Rebuild TGUI * Review changes * missed a line
* Added Icons * Fix frontview of undeployed mod
* reset deflectmode on item dropped * louder message that you can't attack
…ble things again (#27515) * Chasms fix pixel Y when spitting things out, and spit out indestructable things again * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: Contrabang <[email protected]>
* 60secondsuntilthisbombexplodes * i exploded
…#27479) * Ports Backpacks, but good this time * Fixes Vox satches, updates genetics colors * Rediffs Back.dmi * Storage.dmi Rediffed + Some resorting * Smugglers resprite * Storage Updates --------- Co-authored-by: DGamerL <[email protected]>
* Removes old icons Push incoming * Resprites alot of the old cyborg humanoid sprites - Removes most/all old cyborg headwear to allow seamless customization at players will. Don't like hardhats? Now you don't have to have one. - Service Maximillian suit dripped out - Engi borg, mining, and janitor hazard vest and uniform sleeves/shoes - Medical borg Bio suited (Funny) - Ryan Gosling bro bot - Sec borg no longer has riot armor due to budget cuts. But atleast he's recognizable as security. - Service borg suit/suit skirt use a better ones. - Janitor borg Bucket head has new galoshes - Hydrobot has sleeves
…ner (#27450) * ports over more nian plushies from shiptest/beestation and introduces plushies into maint loot * remove a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * removed a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * removed a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * remove a value Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/game/objects/effects/spawners/random/plushie_spawners.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * Update code/game/objects/effects/spawners/random/plushie_spawners.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * this should fix the conflict * please let this upload fix the conflict Signed-off-by: Hayden Redacted <[email protected]> * i need to stop pressing commit as a form of saving, my apologies. * added the dmi back * fixing indentation * removes a comment. Co-authored-by: Contrabang <[email protected]> Signed-off-by: Hayden Redacted <[email protected]> * bumps the weight of tools and materials up to 4 --------- Signed-off-by: Hayden Redacted <[email protected]> Co-authored-by: warriorstar-orion <[email protected]> Co-authored-by: Contrabang <[email protected]>
Bumps the npm_and_yarn group in /tgui with 2 updates: [webpack](https://github.com/webpack/webpack) and [nanoid](https://github.com/ai/nanoid). Updates `webpack` from 5.96.1 to 5.97.0 - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.96.1...v5.97.0) Updates `nanoid` from 3.3.7 to 3.3.8 - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](ai/nanoid@3.3.7...3.3.8) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: nanoid dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…mafia suits (#27627) * Removes old suit/mafia icons * Resprites base/mafia suits for Drask
…ia suits (#27612) * Deletes old suit icons * Resprites some suits for greys * Fixes missing icons * Resprites some suits for Greys
… base/mafia suits (#27597) * Removes old suit icons * Resprites Suits * Removes old suits base_mob * Resprites some suits * Delete icons/mob/clothing/species/vox/under/suit.dmi * Resprites Vox suits * Fixes executive suit * Resprites suits * Fixes executive suits * Resprites suits * Fixes executive suit * Resprites suits
Co-authored-by: Bmon <[email protected]>
* fixes a few typos on emeraldstation's camera list * removed an accidentally placed camera * fixed one more typo
* refactor: Movement cross/uncross implementation. * wrong var name * fix unit tests dropping PDAs into nowhere * Add documentation. * remove unused constants * say which procs are off limits * fix simpleanimal z change runtime * helps not to leave merge conflicts * kill me * fix typecast * fix projectile/table collision * treadmills don't cause MC to crash anymore * connect_loc is appropriate here * fix windoors and teleporters * fix bonfires and clarify docs * fix proximity sensors Tested with sensors in crates, sensors in modsuits Tested new proximity component with firing projectiles at singularity Tested new proximity component with portable flashes Tested new proximity component with facehuggers * lint * fix: polarized access helper false positives * Revert "fix: polarized access helper false positives" This reverts commit 9814f98. * hopefully the right change for mindflayer steam * Changes following cameras * fix glass table collision * appears to fix doorspam * fix ore bags not picking up ore * fix signatures of /Exited * remove debug log * remove duplicate signal registrar * fix emptying bags into locations * I don't trust these nested Move calls * use connect_loc for upgraded resonator fields * use moveToNullspace * fix spiderweb crossing * fix pass checking for windows from a tile off * fix bluespace closet/transparency issues * fix mechs not interacting with doors and probably other things * fix debug * fix telepete * add some docs * stop trying to shoehorn prox monitor into cards * I should make sure things build * kill override signal warning * undef signal * not many prox monitors survive going off like this * small fixes to storage * make moving wormholes respect signals * use correct signals for pulse demon * fix pulse heart too * fix smoke signals * may have fucked singulo projectile swerve * fix singulo projectile arcing * remove duplicate define * just look at it * hopefully last cleanups of incorrect signal usage * fix squeaking * may god have mercy on my soul * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * lewc review * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * burza review * fix bad args for grenade assemblies * Update code/__DEFINES/is_helpers.dm Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]>
* unit->game tests, /tg/ assertions and allocations * whoopsies * fix lint
…ds. (#27694) * Fixes for inserting/removing storage items/swapping items between hands. * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * Fix doc comments * kill old comment --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: DGamerL <[email protected]>
* fix turrets * (not)new type of a turret
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )