removed some floating things #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
N3X15
pushed a commit
that referenced
this pull request
Oct 27, 2013
Fully catching up. It'll undo some minor stuff like the DNA scanner having cable coils again but I'll sort it out over time.
d3athrow
pushed a commit
that referenced
this pull request
Jul 30, 2014
- All money accounts now generate properly. For the ones who still don't know the database is in the room right before the AI core. For now. Closes #25 - Filled research outpost's hydrophonics crate with goodies. Closes #3 - Changed the abandoned ship's medical hardsuit to a red space suit. Closes #9 - Added 3 defibs and chargers to medbay. Closes #13 - Added a few lightswitches in reported areas. Closes #47
d3athrow
pushed a commit
that referenced
this pull request
Jan 15, 2015
d3athrow
pushed a commit
that referenced
this pull request
Jan 17, 2015
d3athrow
pushed a commit
that referenced
this pull request
Feb 6, 2015
ghost
mentioned this pull request
gbasood
pushed a commit
that referenced
this pull request
May 2, 2016
* Initial Commit All CanPass replaced with cross, all CheckExit replaced with uncross * Commit #2 Cross() argment turf/target now has a standard value of src.loc, the basis for this is the fact that Cross() should technically only be called with a default value by Move() code when moving to a new turf thus everything on it the target turf should be the src.loc * Commit #3 All move code has now been unhacked, all of it is functional except for border objects which still retain none of their original functionality * Commit #2 Cross() argment turf/target now has a standard value of src.loc, the basis for this is the fact that Cross() should technically only be called with a default value by Move() code when moving to a new turf thus everything on it the target turf should be the src.loc * Commit #2 Cross() argment turf/target now has a standard value of src.loc, the basis for this is the fact that Cross() should technically only be called with a default value by Move() code when moving to a new turf thus everything on it the target turf should be the src.loc (reverted from commit fdee8c8b687a4d1f305bdc5f5e1a59ebeacb4702) * Fuck me * Okay Redo * Hello, I am finished
ghost
mentioned this pull request
ghost
referenced
this pull request
in vgstation-snowmap-team/vgstation13
Dec 22, 2016
* wolves, and point handling * wolf pointing, removes hitler * Removes nonsense
ghost
referenced
this pull request
in vgstation-snowmap-team/vgstation13
Dec 23, 2016
* wolves, and point handling * wolf pointing, removes hitler * Removes nonsense
PJBot
pushed a commit
that referenced
this pull request
May 29, 2017
Snowmap pr 2 to start the map part
N3X15
added a commit
that referenced
this pull request
Jul 1, 2017
MSO can't read this so make fun of him (Charsettings fix #3)
ihadtoregisterforthis
pushed a commit
to ihadtoregisterforthis/fork4
that referenced
this pull request
Jul 3, 2017
* SNOWPLANES? * snow map vgstation-coders#2 * it sort of works (not really) * we'll call this a prototype * committing so I can remove other changes later * snowmap prototype 2/11/2016 - practically ready for an open beta edition * more stuff, more sprites, more items, we're getting there * before I uncheck the error handler * AAAAAAAAAAAAAAAAA * it works now * Edits the map to be more terrestrial: Added paramedic stations/security stations/EVA stations to each map. Removed grilles from taxi. Still a bunch of shite to do eg belt hell but we're getting there Also tweaked spawn chance because reasons * snowboot * Coats (vgstation-coders#2) * Take these, good luck * oops * According to all known laws of aviation, there is no way a bee should be able to fly. Its wings are too small to get its fat little body off the ground. The bee, of course, flies anyway because bees don’t care what humans think is impossible. Yellow, black. Yellow, black. Yellow, black. Yellow, black. Ooh, black and yellow! Let’s shake it up a little. Barry! Breakfast is ready! Coming! Hang on a second. Hello? - Barry? - Adam? - Oan you believe this is happening? - I can’t. I’ll pick you up. Looking sharp. Use the stairs. Your father paid good money for those. Sorry. I’m excited. Here’s the graduate. We’re very proud of you, son. A perfect report card, all B’s. Very proud. Ma! I got a thing going here. - You got lint on your fuzz. - Ow! That’s me! - Wave to us! We’ll be in row 118,000. - Bye! Barry, I told you, stop flying in the house! - Hey, Adam. - Hey, Barry. - Is that fuzz gel? - A little. Special day, graduation. Never thought I’d make it. Three days grade school, three days high school. Those were awkward. * define * bugfixes * fixes conflicts * fixed bugs and made hoods work better * do ah look lahk ah know what "ay-tomic" is? * bugfixes shadowfixes added like seven different coats, ian now can wear scarves * mapchanges - snaxi is now united * wolves, and point handling (vgstation-coders#3) * wolves, and point handling * wolf pointing, removes hitler * Removes nonsense * ice ice baby procedural generation is the best buzzword new snow map doors map now has proper z level names not working right now ice smoothing is being a !!bitch!! * glaciers now smooth glaciers no longer eat up the pipes between stations (this will cause some fuck ups with smoothing but uh yeah) you now slip on rivers todo - skis - snowshoes - spiked boots * Moves ores to overlays, adds snow roid sprites (vgstation-coders#5) * Moves ores to overlays, adds snow roid sprites * Fixes gibtonite, re-approaches some mine surprises * Wendigos added, skifree yeti added, wendigo meat and transformation added (vgstation-coders#4) * DEER, and leather stuff * Adds xeno spears, xenohide, fixes bugs * alright dragonbro over to you for tonight I'm going to sleep * Fixes wendigos, and wolves * if it works it works who cares why * snowmap bugfixes and optimisations * zzz * Revamp in working state no work in progress saving wip Most issues fixed. Fishing half way through overhaul to include minigame Turned spaces into tabs. fucking atom REEEEEEEEEE Clownfish and clownburger added. All fishing code done. Carp and normal fish recipes updated and ready. Carpmeat changed to subtype of fish_fillet. WIP. Rods mostly done. Basic fish and bait added. * removes bluespace ponds to be atomic * fixes issues - bluespace pond back in the code but not able to be got anywhere * does the easy things * renames it taxi outpost adds map cleaning things * OK THIS WILL FIX IT FOR REAL * fixes EVERYTHING but it's not ready to merge because I reckon we can squeeze some last minute features in * whoops forgot to fix this * underground mining stuff * adds lobby music courtesy of aceedex * bugfixes mining underground optimisations (now it actually runs instead of grinding to a halt) there are runtimes aaaa oh well will fix tomorrow * fixes so that JSG can host it some missing features
ihadtoregisterforthis
pushed a commit
to ihadtoregisterforthis/fork4
that referenced
this pull request
Jul 3, 2017
* Fixes bug where lobby music wouldn't load from christmas songs Fixes bug where balaclava would appear underneath the snowcoat * Fixes vgstation-coders#13055
ihadtoregisterforthis
pushed a commit
to ihadtoregisterforthis/fork4
that referenced
this pull request
Jul 3, 2017
…tion-coders#14643) * Fixes shopkeepers * Fixes logic * Attempt vgstation-coders#3
ihadtoregisterforthis
pushed a commit
to ihadtoregisterforthis/fork4
that referenced
this pull request
Jul 3, 2017
* wolves, and point handling * wolf pointing, removes hitler * Removes nonsense
ihadtoregisterforthis
pushed a commit
to ihadtoregisterforthis/fork4
that referenced
this pull request
Jul 3, 2017
…wmap-PR-2 Snowmap pr 2 to start the map part
d3athrow
pushed a commit
that referenced
this pull request
Jul 4, 2017
* Fixes shopkeepers * Fixes logic * Attempt #3
d3athrow
pushed a commit
that referenced
this pull request
Jul 4, 2017
MSO can't read this so make fun of him (Charsettings fix #3)
brndd
referenced
this pull request
in brndd/vgstation13
Jul 29, 2018
All asteroid turfs around the station are now special turfs that don't spawn ores or xenoarchaeology artifacts, and produce a simulated asteroid turf when mined (simulated turfs work with atmospherics), allowing players to dig to expand the station.
brndd
referenced
this pull request
in brndd/vgstation13
Aug 6, 2018
All asteroid turfs around the station are now special turfs that don't spawn ores or xenoarchaeology artifacts, and produce a simulated asteroid turf when mined (simulated turfs work with atmospherics), allowing players to dig to expand the station.
jknpj
pushed a commit
that referenced
this pull request
Aug 7, 2018
* Uploading maps. Updated RoidstationBD.dmm to add Courtroom/Central Sec Checkpoint. Also includes revisions to overall layout. Library fine-tuned. Brig added, making good progress but needs the basic infastructure (wiring, pipes, lights) and some elements still missing. Added Science division and much of the Z-Level for the station, including the Perma and Voxpost. Also now includes a more finalized Sec. Further revision to Sci Updating file name - also added Cargo and fleshed out Mining/Xenoarch/Sci. Filled in Arrivals and Science BurntFork's medbay included in Roidstation.dmm file. Added areas. Updated Sec Airlock (thanks SonixApache). This is the version with Medbay as well. Updated the Gulag. Added Engineering, cut outs for tcomms, AI Core, Upload, and incorporated Medbay, Dorms, and Chapel. Most areas are now defined. Fleshed out engineering some more - added SME, AME, Atmos, and parts of Auxiliary Engineering. Added AI Core, Upload, Vault, Tcomms, Xenobiology. Now sealed and ready for testing. Added EVA, Janitor's Closet, Vacant Office, multiple outer roids, Theater. Started to define roids as areas. Added some supplies to EVA. Added wiring for a good chunk of the station. Finished off most of the wiring, added cameras, marked all roids as areas, added syndieship docking spots - still need auxiliary docking at Arrivals or Escape. To do: Piping (Air supply, Disposals, and Scrubbers) Playtest for cameras Redesigned Security, corrected wiring. Also includes numerous fixes by BurntFork. Added Auxiliary Docking Ports. Added mining waystations, numerous bugfixes from playtest. Choppiness should be gone thanks to DamianQ. Will need to go through and see if any nudged objects need to be readjused. More bugfixes. More piping. Added David, the best Goliath on the Roid. Added door to the MoMMI nest. Wiring and piping is now 90% complete. This version is ready for playtesting. Still needed: Disposals and thorough QA testing. Playtest-capable map Adds simulated asteroid turfs and xenoarch exemption for mineral sites. (#1) Playtest Map (Upload Attempt 1) Updated Maps. RoidStationTEST is playtestable and should feature Ghetto Engineering and numerous bugfixes as well as working atmos. Incl. bugfixes and replaced pipes from today's playtest. Updating Taxi file Updated filenames (Roidstation is now the default map) and also fixed Taxistation's missing component. Lots more fixes to vents. Virology is now rebuilt. Updated .dm file to reflect map name change. added Magmaws to the TEG. Backup Map Revert "Backup Map" This reverts commit 7b800af. More vent fixes and started to flesh out disposals. Grudgingly expanded HoP office by 1 row of tiles due to lack of space. Added Custodial Closet to Arrivals Hall. Magmaws in TEG. This file should work now. Numerous fixes from tonight's playtest. Expanded TEG/Hydroponics slightly. Medbay Redesigned to please the insolent, unruly peasants. Medbay rework complete. Engineering slightly renovated. Fixed some pipes, confirmed that Mining/Sci doors work. Includes fixes for Privacy Shutters Updated files for the rad-shielded Morgue in Medbay. Redesigned telecomms. Also includes a few fixes to pods and some other small fixes. Disposals piping should be mostly done now. Probably fucked up, but it's there. Some fixes to Disposals. This is the latest file. Fixed a bug in the Xenoarcheology file that was messing up the compilation. Thanks to Burneddi, Disposals should now be complete. Still pending testing. I've gone through and fixed our problem with vox tiles in maintenance and replaced them all wholesale, so our air problems should be fixed. Disposals fixes, ran the map through the map merger (#2) ...unfortunately the map merger doesn't do its magic the first time it's ran, so this commit is still unnecessarily huge. Fix maintenance tunnels and asteroid turfs (#3) All asteroid turfs around the station are now special turfs that don't spawn ores or xenoarchaeology artifacts, and produce a simulated asteroid turf when mined (simulated turfs work with atmospherics), allowing players to dig to expand the station. Cosmetic medbay fixes Fixes to maintenance and science. Connects the disconnected science maintenance tunnels to the main maintenance tunnel. Moves science shuttle down slightly and creates a shuttle bay for it. Add an intercom to the RD office. Fixed broken piping and wiring into the borer hatching room. Added xenobio containment areas to the xenobio containment cells (there were only 6 areas but 7 cells, so two cells are merged into one area). Removed superfluous mulebot delivery port Moved a misplaced AI screen in the science shuttle bay and added some clutter to the maintenance nearby. Further work on the science area maintenance. Xenobiology has been moved closer to the main station, and is now connected by a makeshift maintenance tunnel. This means it no longer needs separate power or atmospherics (through its scrubbers still feed directly into space rather than the main scrubber system). Fleshed out maintenance a little more. Made ghetto surgery a bit prettier. Revert "Minor ghetto surgery tweaks" Adding custom areas include. Added a new include, /roidstation/areas.dm, to roidstation.dm This include defines custom areas for use on Roidstation when the Boxstation area template doesn't quite match our layout. Finished most of the work for this target. Committing before starting work on maintenance airlock permissions. Fixed access requirements on maintenance and exterior airlocks. For the most part, at least. fixed some broken piping in secure storage Permabrig solars. Xenobio solars removed as they are now redundant and would always be in shadow anyway. The permabrig solars should get light from the south for about a third of the day or so, which hopefully is enough to power it because no engineer is going to go all the way out there, and turning on the pacmans is below security. Permabrig solars area fix. Manually merged the ghetto surgery change. Added missing newline to the end of areas.dm piping fixes and stuff More fixes. Pipes STILL fucked. More pipes work. they still fucked tho. Merged in atmos area, wizden+syndieshuttle changes from botched repo. Pending bridge rework(?), and fixing atmosia. Atmospherics overhaul. Engineering fixes. Miscellaneous fixes. Oh boy. Removed leftover mapping copypaste shit. Smoking is now allowed behind the O2 and plasma tanks in atmos. fixed some air alarm freqs in the crashed vox ship south of atmos Moved gas miners one tile further back as QoL change for engineers. Fixed missing fire/air alarms, APCs, etc. all around the station. Should be all of them. Miscellaneous window-related fixes all over. Pipes fixed, finally. Misc. fixes all around the station. Various toilet-related fixes. Cameras are officially DONE. Fixed up some minor shit like areas while I was at it. Manually merged #19047. Fixed some hallway door names. Added RoidStation to mapmerger scripts. Changed .gitattributes to not convert line endings in .bat files. Fixed SME and TEG coolant loops (Osseus) added two can dispensers to secure storage. removed one from atmospherics. Removed some unnecessary changes. Reverting the STUBBORN vgstation13.dme Removing camera.dm from PR. Merge pull request #4 from GeneralVeers25/Roidgym Roidgym Reverted box bridge reworks. Reverted box bridge reworks for real this time. Removed the leftover atmospherics pipes used as mapping aid. * Removed unnecessarily modified files from this PR. * - Removed misplaced air alarm from Paramedic station. - Removed misplaced defib charger from Paramedic station. - Fixed sofas in the hallway next to chapel. - Added an extra light to the Bar backroom. - Moved Cargo bay camera slightly. - Removed duplicate AI cards and adjusted AI card positions. - Fixed access on brig medbay windoor. - Added extra lights to MoMMI nest. - Fixed area definitions on Z-3. - Dave, who was called David, is now a Dave. - Fixed a bunch of orphaned and misplaced vents and scrubbers. - Fixed several instances of disposals pipes running underneath walls where they didn't have to. - Rerouted some disposals pipes to utilize the aft port maintenance tunnels. Adds davids and Dave, roidstation's mascot. (#19026) * Tweaks robot access, again. * Adds davids and Dave, roidstation's mascot. * Revert "Tweaks robot access, again." This reverts commit 7d458f0. * New desc by @DrSlimes * Adds dave to the blacklisted mob list * Copypasted over the clown roid from Box because there was no bananium on the map. It's on Z-6. * Made the disposals external disposals pipe not run inside the roid while I was at it. * Updated Hydroponics to include the Ranch and made some more minor fixes to maint. Added external airlocks to Engineering. * Replaced an airlock in engineering with a prettier one. * added a bunsen burner to chemistry
Closed
Kurfursten
pushed a commit
that referenced
this pull request
Jun 1, 2019
ClearedUnit
pushed a commit
to ClearedUnit/vgstation13
that referenced
this pull request
Jun 7, 2019
…Edge Регулярное обновление билда в действии.
jknpj
pushed a commit
that referenced
this pull request
Nov 3, 2019
Kurfursten
pushed a commit
that referenced
this pull request
Dec 11, 2019
jknpj
pushed a commit
that referenced
this pull request
Jan 20, 2021
…sion rework, Deconversion, & Holy Implants (#28613) * ahhh BSOD * fucking finally * ezrrazfazgdsfggds * dsqdqsdqsdqs * ah yes of course * soulstone shard pizza slicer * tweaks * derp * fix * cult chap stuff * soundcheck * arf * wake up git * kurf review feedback
beesil
pushed a commit
to beesil/vgstation13
that referenced
this pull request
May 3, 2021
…coders#3: Conversion rework, Deconversion, & Holy Implants (vgstation-coders#28613) * ahhh BSOD * fucking finally * ezrrazfazgdsfggds * dsqdqsdqsdqs * ah yes of course * soulstone shard pizza slicer * tweaks * derp * fix * cult chap stuff * soundcheck * arf * wake up git * kurf review feedback
ghost
mentioned this pull request
Closed
jwhitak
pushed a commit
to jwhitak/vgstation13dilt
that referenced
this pull request
Nov 4, 2023
testing vg 35326 (Dilt cargo UI)
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.
No description provided.