mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-17 02:54:44 +01:00
masterfixes
4 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 Robwo
|
19c2327893 |
I promise It's Not Wallening™ + New Tile Variations (#5169)
## About The Pull Request As the second half of https://github.com/Bubberstation/Bubberstation/pull/4918, this pr is apart of my effort to comprehensively resprite many common assets to be more cohesive in style and whatnot. The extra tile variations are just thrown in for more mapper freedom. They're not deserving of an entire pr dedicated to them. ## Why It's Good For The Game Skyrat's walls and windows are for the most part ripped from other codebases. While they have done a serviceable job, their implementation is not all encompassing and many variations of the standard walls/windows they intend to replace are simply not accounted for (namely indestructible variants). Not to mention, with walls specifically, what has been implemented is incredibly tedious to modify as they do not use automated icon cutting. Instead, the dmi is manually built and false wall variations are added to them. On top of replacing almost every wall and window tile, walls that were previously bereft of icon smoothing, now have the capability to do said smoothing. Also it's not wallening™. ## Proof Of Testing <details> <summary>Screenshots/Videos</summary> <img width="2304" height="1600" alt="image" src="https://github.com/user-attachments/assets/94c3ef7b-d754-4754-aac1-4ac36cc81086" /> The tile variations: <img width="1216" height="896" alt="image" src="https://github.com/user-attachments/assets/cbc6707e-5258-4cbc-9a79-befaea5efb4e" /> <details> <summary>Contextual Examples</summary> **Station** <img width="1216" height="960" alt="image" src="https://github.com/user-attachments/assets/98357cc3-0b2b-4da4-b148-0aa8005b7efd" /> <img width="1216" height="960" alt="image" src="https://github.com/user-attachments/assets/bef30efd-ae88-49f3-b706-fe34d1df97a7" /> <img width="1216" height="960" alt="image" src="https://github.com/user-attachments/assets/933786f6-a6f8-4fab-b222-fbcef88a440f" /> **Centcom** <img width="1216" height="960" alt="image" src="https://github.com/user-attachments/assets/7c92c645-4fdb-4e05-91c3-100508fcf0da" /> **Shuttle** <img width="1216" height="896" alt="image" src="https://github.com/user-attachments/assets/3304c842-8bac-40b0-8024-7c6616717331" /> **Plastitanium** <img width="1088" height="576" alt="image" src="https://github.com/user-attachments/assets/cb252aab-b501-4218-bd0d-ab60492676a4" /> <img width="448" height="704" alt="image" src="https://github.com/user-attachments/assets/434bceb2-4884-4d2a-826b-b524ec054a56" /> **Necropolis** <img width="1216" height="960" alt="image" src="https://github.com/user-attachments/assets/aed42870-c4a4-4255-9ff0-7544127469f5" /> **Assorted With Notes** <img width="1216" height="704" alt="image" src="https://github.com/user-attachments/assets/01f826ee-ca4d-44dc-bc9f-9057f71cb9ea" /> Many variations of wall replacements were not previously accounted for. The most immediate one I could think of were the indestructible wooden walls in the Ghost Cafe. <img width="1216" height="960" alt="image" src="https://github.com/user-attachments/assets/1ad067c3-840c-4f78-a24d-b597dfc34743" /> <img width="1216" height="960" alt="image" src="https://github.com/user-attachments/assets/d0f44e35-46fe-4c38-865c-c3421a2c2282" /> The "interior" of many of the wall sprites were kept intentionally flat and dark as to more convincingly sell perspective*. <img width="382" height="318" alt="dreamseeker_Cy4kIapjp6" src="https://github.com/user-attachments/assets/fa5bd972-4a44-4eef-9faf-8992a768f144" /> The standard walls are an exception to this rule as they need to be readily apparent to unscrupulous ne'er-do-wells with mesons. </details> </details> ## Changelog 🆑 Robwo add: Added new variations to small tiles and pod floors image: Almost all of the wall and window sprites have been redone image: The palette of wooden platforms now more closely match wooden floors image: New bronze table sprites fix: Fixed rock wall sprites being incorrectly (un)colored fix: Decal painter now sprays our override decals. /🆑 --------- Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> |
||
|
Alexis
|
5c5a636485 | Merge branch 'master' into upstream-feb12-2026 | ||
|
nevimer
|
00ccf0c6b5 |
Merge remote-tracking branch 'tgstation/master' into upstream-feb12-2026
# Conflicts: # .github/CODEOWNERS # .github/workflows/compile_changelogs.yml # .github/workflows/stale.yml # SQL/database_changelog.md # _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm # code/__DEFINES/atom_hud.dm # code/__DEFINES/inventory.dm # code/__DEFINES/mobs.dm # code/__DEFINES/species_clothing_paths.dm # code/__DEFINES/subsystems.dm # code/__DEFINES/surgery.dm # code/__HELPERS/global_lists.dm # code/_globalvars/lists/maintenance_loot.dm # code/_globalvars/traits/_traits.dm # code/controllers/subsystem/minor_mapping.dm # code/controllers/subsystem/processing/quirks.dm # code/controllers/subsystem/shuttle.dm # code/datums/components/palette.dm # code/datums/components/surgery_initiator.dm # code/datums/diseases/advance/advance.dm # code/datums/hud.dm # code/datums/mood.dm # code/datums/mutations/chameleon.dm # code/datums/quirks/negative_quirks/nyctophobia.dm # code/datums/status_effects/debuffs/debuffs.dm # code/datums/status_effects/debuffs/drunk.dm # code/datums/status_effects/debuffs/slime/slime_leech.dm # code/datums/weather/weather.dm # code/game/data_huds.dm # code/game/objects/items.dm # code/game/objects/items/devices/scanners/health_analyzer.dm # code/game/objects/items/frog_statue.dm # code/game/objects/items/rcd/RLD.dm # code/game/objects/items/robot/items/hypo.dm # code/game/objects/items/stacks/medical.dm # code/game/objects/items/stacks/wrap.dm # code/game/objects/items/storage/garment.dm # code/game/objects/items/tools/medical/defib.dm # code/game/objects/items/weaponry.dm # code/game/objects/items/weaponry/melee/misc.dm # code/game/objects/structures/crates_lockers/closets/secure/security.dm # code/game/objects/structures/curtains.dm # code/game/objects/structures/dresser.dm # code/game/objects/structures/girders.dm # code/game/objects/structures/maintenance.dm # code/game/objects/structures/mirror.dm # code/modules/admin/greyscale_modify_menu.dm # code/modules/admin/verbs/light_debug.dm # code/modules/antagonists/ashwalker/ashwalker.dm # code/modules/antagonists/heretic/knowledge/starting_lore.dm # code/modules/antagonists/ninja/ninjaDrainAct.dm # code/modules/art/paintings.dm # code/modules/client/preferences.dm # code/modules/client/verbs/ooc.dm # code/modules/clothing/head/wig.dm # code/modules/events/disease_outbreak.dm # code/modules/holodeck/holo_effect.dm # code/modules/jobs/job_types/head_of_security.dm # code/modules/jobs/job_types/security_officer.dm # code/modules/library/skill_learning/generic_skillchips/point.dm # code/modules/mining/lavaland/ash_flora.dm # code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm # code/modules/mob/dead/new_player/new_player.dm # code/modules/mob/living/basic/guardian/guardian.dm # code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm # code/modules/mob/living/carbon/carbon.dm # code/modules/mob/living/carbon/human/human.dm # code/modules/mob/living/carbon/human/human_defines.dm # code/modules/mob/living/carbon/life.dm # code/modules/mob/living/living.dm # code/modules/mob/living/living_defines.dm # code/modules/mob/mob.dm # code/modules/mob_spawn/ghost_roles/mining_roles.dm # code/modules/mod/mod_control.dm # code/modules/mod/modules/modules_general.dm # code/modules/modular_computers/computers/item/computer_ui.dm # code/modules/paperwork/paper.dm # code/modules/paperwork/paperbin.dm # code/modules/power/lighting/light.dm # code/modules/projectiles/guns/energy/kinetic_accelerator.dm # code/modules/projectiles/projectile.dm # code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm # code/modules/reagents/chemistry/reagents/food_reagents.dm # code/modules/reagents/chemistry/reagents/other_reagents.dm # code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm # code/modules/research/xenobiology/crossbreeding/_clothing.dm # code/modules/research/xenobiology/crossbreeding/prismatic.dm # code/modules/surgery/advanced/brainwashing.dm # code/modules/surgery/advanced/lobotomy.dm # code/modules/surgery/amputation.dm # code/modules/surgery/blood_filter.dm # code/modules/surgery/bodyparts/_bodyparts.dm # code/modules/surgery/brain_surgery.dm # code/modules/surgery/cavity_implant.dm # code/modules/surgery/coronary_bypass.dm # code/modules/surgery/gastrectomy.dm # code/modules/surgery/healing.dm # code/modules/surgery/limb_augmentation.dm # code/modules/surgery/organ_manipulation.dm # code/modules/surgery/revival.dm # code/modules/surgery/sleeper_protocol.dm # code/modules/surgery/surgery_helpers.dm # code/modules/surgery/surgery_step.dm # code/modules/unit_tests/_unit_tests.dm # code/modules/unit_tests/designs.dm # code/modules/unit_tests/icon_state_worn.dm # code/modules/unit_tests/screenshots/screenshot_antag_icons_cultist.png # code/modules/unit_tests/screenshots/screenshot_antag_icons_headrevolutionary.png # code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png # code/modules/unit_tests/screenshots/screenshot_husk_body.png # code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png # icons/map_icons/clothing/head/_head.dmi # icons/map_icons/clothing/shoes.dmi # icons/map_icons/items/_item.dmi # icons/mob/huds/hud.dmi # icons/mob/inhands/64x64_lefthand.dmi # icons/mob/inhands/64x64_righthand.dmi # icons/obj/machines/computer.dmi # tgui/packages/tgui/interfaces/OperatingComputer.jsx # tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/MainPage.tsx # tgui/packages/tgui/interfaces/PreferencesMenu/types.ts # tgui/packages/tgui/interfaces/SurgeryInitiator.tsx # tools/icon_cutter/check.py |
||
|
Nick
|
834245ecdb |
creates more deticated folders for tools and weaponry and move dm files into them (#94804)
## About The Pull Request Hello hello the evil folder mover goat is back, i will destroy years worth of muscle memory. Items is an folder alot of stuff that really didn't get a spefific location. Items/Weaponry Contains Shields.dm Items/Weaponry/Melee Contains (Most of the extra dm files come from me splitting misc/weaponry.dm into its own categories killing offf weaponry.dm in its whole) baseball_bat.dm, baton.dm, chainofcommand.dm, chainsaw.dm, claymore.dm, dualsaber.dm, energy.dm fireaxe.dm, high_frequency_blade.dm, his_grace.dm, katana.dm, knives.dm, misc.dm, powerfist.dm, sabre.dm soulscythe.dm, spear.dm, supermatter_sword.dm. Items/weaponry/ranged Contains flamethrower.dm, pnuematic_cannon.dm, throwing_star.dm items/tools Contains control_wand.dm, extinguisher.dm, inducer.dm, spess_knife.dm, theft_tools.dm items/tools/engineering Contains airlock_painter.dm, decal_painter.dm, paintable_decals.dm, crowbar.dm, screwdriver.dm, weldingtool.dm wirebbrush.dm, wirecutters.dm, wrench.dm items/tools/janitorial Contains broom.dm, janitor_key.dm items/tools/medical Contains bodybag.dm, cane.dm, defib.dm, reflex_hammer.dm boxcutter.dm is merged into knives.dm Kitchen.dm renamed into kitchen utensils and moved into food and drinks module surgery_tray.dm moved into surgery module banhammer/extendo hand moved from weaponry into toys.dm balloon mallet moved into clown_items.dm ectoplasm moved from weaponry.dm into soulstone.dm (since thats the resulting residue when a shade dies, and not really a weapon) ## Why It's Good For The Game So things are way easier to navigate ## Changelog |