mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
2047cdc26a
* merge into main * Revert "merge into main" This reverts commitb6aa002a82. * Adds initial files for AsteroidStation * Fixes air while mining issue * Cleans up and decorates command * Service and engineering framework * Medbay layout * Shifted around layout, started on science * Fixes random templates in engine * touches up science * Finalized layout * Outlines locations for solars * Tweaks maint * Forgot vault and upload * Fixes breach in engineering * Removes template from botany * All solar locations added Plays with maint, rnd * Fixes breach and zoo * Removes random shutters * Improves xenobio and mini zoo * Boris! * Lights and power * Lighting improvements * . * Everything should have power now * Tweaks after suggestions * . * Lot of work on sec * Fixes execution and other minor tweaks * AI Core * Cargo * Tweaks after testing * Russian bunker * Replaces bar template, starts on engineering * Fills out medbay * Some decorations in sci * Tweaks based on feedback * nerf russian ruin * Starts on atmos * Atmos completed - untested * Fixes mapping on all areas * I didn't forget EVA you forgot EVA * Lights and power for EVA * AI atmos * Minor tweaks * Fixes russian bunker area tags * Swaps nanites and rnd, gives rnd and xenobio a desk * All suggested changes * Removes more pipes through walls * AI holopads * Fixes botany and brig phys issues pointed out by chubbygummibear * Disposals * Fixes all lighting * Fire extinguishers * Light switches * Fire alarms * Air alarms * Security Cameras * Misc minor tweaks * Directions signs * Adds posters and signs Gives det surgery table * Lots of firelocks, fixed a few maint airlocks * Intercomms * Decorates HoS office * Tweaks detective autopsy table * Fixes all map errors * Nav beacons * firelocks for flaps * Fixes some 1 tile hallways and other weirdness * Removed hidden items under rock, second rock type from station asteroid * Fixes one of the maint rooms * Fixes some rwalls * Forgot to decorate the sci mass driver area * Maint firelocks and helpers * glass in wall * newscaster, request consoles * Bounty boards * Minor tweaks and fixes * map area tweak * Chem has a button * Removed unsafe windows * Shifts a couple of medbay rooms around * Fixed pipes and posters * makes map votable * removes accidental change * Revert "removes accidental change" This reverts commit58c1e2bf43. * Actually removes accidental change * wallgene * Moves incinerator somewhere safer * Minor tweaks * Minor fixes * Atmos shutters * Piping fixes and other tweaks * Bar shutters * Edits post feedback * Feedback 2: Electric boogaloo * Fixes mapping errors * Should fix broken check * Feedback 3: Tokyo Drift TODO: atmos command * atmos * Every atmos zone should have a scrubber and air * 3 windows had wrong floor * Major shift in layout and positioning of cargo and command - WIP * Improvements to piping * Disposals fix * Possibly ready for review * Minor lighting and camera tweaks * Exterior acces protection on a door * Fixed random extra wall * ty bai * Removed extra window in armory * tile color tweaks * Some improvements using feedback * Cargo shuttle no longer mercs a half dozen rocks * Tweaks after a walk through * Merge branch 'master' of https://github.com/yogstation13/Yogstation * Revert "Merge branch 'master' of https://github.com/yogstation13/Yogstation" This reverts commit9ef9d8940b. * Ice fishing asteroid ruin * No longer votable until it has been playtested * Remember Kilo ruin * Crashed shuttle asteroid ruin * More feedback from bai * AI Antechamber APC * Missing maint door added * "Gym Rat" Maint ruin * Renames mice in gym rat ruin * Minor tweaks * Moves an asteroid ruin * Expansion to south maints and asteroid, with santa ruin * Fixed medbay sec outpost * Fixed QM windows & toxins test distance * Adds the random donkpockets * Medbay tweaks * Removed a donksoft vendor * discord nitpicks * more discord suggestions * Cleans up medbay disposals a bit * Fixed stuff overlapping walls * gym rat tweak * Wiring tweak * cobwebs * Fixes typo in telepad * Jamie feedback * arrivals touch up * Update config/maps.txt * hotfix - missed igniter in toxins, gives paramed compact pick * Tweaks mineral spawn chance for asteroidstation * Start on hotfix 1 * hotfix 1 semifinal TODO: Fix the freeminer docking error * Add most suggestions Missing: connections to maint from hall * misaligned cam * more paintings * science showers * science oxy closets * Cuts a little more space from the edges * This medbay upday brought to you by Vael * Extra cam in atmos * Medbay, sec, and a small part of civillian get small wire loops * progress on playtest fix 2 * Playtest fix 2 final * Slightly shifts ice fishing ruin * atmos gas miners * Tweak to xmas ruin * second tweak to xmas ruin * Playtest fix 3 TODO: Robotics Maybe move vault * Robotics changes * Moved vault and tools * area fix * Minor tweaks * Minor tweaks * Fishing in bar beach * Tweaks to russian ruin * Fixes fishing in bar * playtest fix 4 * Atmos tweak * Arcade * Extra path to arcade * A few extra maint cams * misaligned cam in tool storage * Escape shuttle won't merc rocks in any situation * Playtest fix 5 * Several more extinguishers * playtest fix 6 * Adds some decals * tweaks to russian ruin * Ups mineral spawn chance slightly * Extra button for clerk shutters * minor tweaks * Playtest fix 7 * minor tweaks * more engi decals * tweaks russian loot * donkpocket->spawner * Playtest fix 8 * Roaches * Playtest fix 9 * Decal and lighting tweaks * Makes some bridge stuff more accessible * Power tweaks * admin has AI access * area tweak * Tools for the tool god * Backup power * backup power decals * backup power decals * lights and air for the backup power room * Replaced backup power with backup SMES * Cameras for backup SMES * missing bridge tile * decals * missed a few decals * missing button * chargers in meeting room * heads break room vendors accessible * sayonara to quarter tile decals * Command wire loop * Asteroid is votable in preparation for merge * Lowers minplayers from 35 to 25 * Update _maps/asteroidstation.json Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>