Big Map Refector #1170
Merged
Big Map Refector #1170
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
This was referenced Mar 21, 2024
DAKKA-WAAAGH
pushed a commit
to DAKKA-WAAAGH/fulpstation
that referenced
this pull request
Mar 22, 2024
Horatio22
pushed a commit
that referenced
this pull request
Mar 23, 2024
* Create Industrial.dmm * Update Industrial.dmm * Moves map to modules * Sets up the files * Not eyes apparently -- GLASSES of course * Adds some lights and such * Update Industrial.dmm * Update Industrial.dmm * I failed at making an emagged cleanbot, honkbot will do instead * Resolve conflict 1 * Prep for update * Moves .dmm files to proper location As per @Horatio22 * These walls lack opacity = 1 no longer * Resolve Conflict 2 * Removes old nanite relics from the game (#1168) * Removes old nanite relics from the game * Update tgstation.dme * forgot this * new fluff room * difffrent fluff room * Updates with master * Adds a second fulp Deathmatch arena (#1156) * adds heliocentric * Update deathmatch_loadouts.dm * Update deathmatch_maps.dm * Update heliocentric.dmm * Update heliocentric.dmm * Update deathmatch_maps.dm * fixes ctf * fixes * fix * am old an rusty * Phone webedit * Prep for update * TGU - 3/14/2024 (#1154) * TGU - 3/14/2024 * a * nanite source fix * Fixes Cargo * Fix polling mutating its target's plane and layer * Fixing cargo 2 --------- Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com> * Pubby Decal Refresh (#1160) * Changes many decals all over the station * Missed decal * More Tweaks, removes more yellowed hashes * More (surely) epic changes * Bridge touch up * removes helio's layer 1 cables in sm chamber (#1169) * removes helio's layer 1 cables in sm chamber * Update Heliostation.dmm * Update Heliostation.dmm * Big Map Refector (#1170) * Moves .dmm files to proper location As per @Horatio22 * These walls lack opacity = 1 no longer * Resolve Conflict 2 * Rebase, resend... * Update, resend... I love conflicts! --------- Co-authored-by: anettera <27014495+remove32@users.noreply.github.com> Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> Co-authored-by: Pepsilawn <reisenrui@gmail.com> Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Momo8289
added a commit
to Momo8289/fulpstation
that referenced
this pull request
May 26, 2024
* Nanites (fulpstation#1100) * Adds nanites * moves 2 uis to tsx * giving up * All tsx now * Nanites now feel more consistent * new nanite sound * Removes the public nanite chamber * defines & removes cloud sync * Update nanite_component.dm * Working HUDs * Storage nanitese * Armor * Update _programs.dm * less time * nanite decal * Machines can now be deconstructed * Ports my PR to make nanites take it into account * material amount * removes header comments * hopefully fixes tgui errors * Update Techweb.jsx * Update machines.dm * adds a worn icon state * maps nanites in fulp maps * Update SeleneStation.dmm * testmerge fixes * wat * Updates Pubbystation * Update PubbyStation.dmm * Update PubbyStation.dmm * a * Nanites don't give as much research points * Cloud controller now appears off when broken * fix UI error and annoying sound * removes hallucination * f * Fixes vassals keeping abilities post-BS death (fulpstation#1097) * Update antag_tip_integration.dm (fulpstation#1098) * recuperate works while in crit & fixes mesmerize (fulpstation#1099) * removes some copy paste from mentor stuff (fulpstation#1101) * brawn takes armor into account (fulpstation#1102) * Fixes contributor list (fulpstation#1105) * adds 2023 to the halloween beacon (fulpstation#1106) * adds 2023 to the halloween beacon i messed up and forgot to add this code * whoopsie its 23 not 22 thanks john 👍 * stupid file :( i hate it ok NOW it should be fixed (thanks kian) * Fixes archives of the kindred (fulpstation#1108) * Heliostation Patch 5 - Evacuation (fulpstation#1112) * Draft Amongus * polishes ray's work * 1 * Update Heliostation.dmm * Fixes * CI Fixes * Minor Change * Cable * I am seriously at my fucking limit --------- Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com> * Shrimp plushie (fulpstation#1109) * Shrimp plushie! Sound pending * Mapped into fulp maps, added to cargo orders * Shrimp sound and interaction * Hopefully fix pubby conflict * removed from pubby for a sec * i swtg * lol imagine if just moving it worked haha * pubby shrimp fr * Change job check * Name check now uses initial name * fixed typo * halloween 2024 (fulpstation#1110) Halloween costume in february -Adds ame-chan halloween costume -fixes 2023 halloween costumes (chai) -adds 2024 haloween costumes folder Co-authored-by: sylvia <sylvia-from-fulp-station@users.noreply.github.com> * Hopefully fixes selene armoury (fulpstation#1115) * Hopefully fixes selene armoury * Delete SeleneStation.dmm * Update PubbyStation.dmm (fulpstation#1117) * Posession now does revive the dead and turns them into temporary vassals (fulpstation#1113) * Makes the check for consciousness rack-specific * Not sure why I set it to false * Fixes malkavians whispering their revelations (fulpstation#1119) * Update TGS DMAPI (fulpstation#1103) Co-authored-by: tgstation-server <tgstation-server@users.noreply.github.com> * Nerfs pubby science and changes the prision a bit (fulpstation#1118) * Update PubbyStation.dmm * I hate you cable * woo ducts * Shutter moment * Heliostation cool awesome Arrivals (fulpstation#1116) * yea sure * let me cook * my cooking skills... * cooking * the meal is done * finishes cooking * solves shit * guh * m * i love dmm corruptions * converts to tgm * forgot vents * this shouldnt be here lol * Fixes a line for temperature adjustment (fulpstation#1114) * Nanite chambers can only put people in it (fulpstation#1122) * pubby atmos edit (fulpstation#1125) * pubby atmos edit proper n2 and o2 to pure outlets, air mix pipes are better now, layer manifolds on gas supply outlets. also flipped the direction of the science ordnance experiment thing cause it was the wrong way * deletes pubby 2.0 lol oops * fix * applied Guillaume's ideas * error fix * Syndicate Engineers & The Prototype Station (fulpstation#1121) * initial * removes a debug thing i left behind * misc fixes * but i fixed it anyway * the hand of god * did it again lmao * areas have icons now (and some tweaks) * kills a double wire and stray terminal * woe, check rerun be upon ye * Update TGS DMAPI (fulpstation#1126) Co-authored-by: tgstation-server <tgstation-server@users.noreply.github.com> * Batong now takes sprites from baton (fulpstation#1123) * Batong now takes sprites from baton * adds g to batong --------- Co-authored-by: Horatio22 <69338705+Horatio22@users.noreply.github.com> * admins get a tgui list instead of radial for clans (fulpstation#1134) * Makes all blood updates go through AddBloodVolume (fulpstation#1128) * Makes all blood updates go through AddBloodVolume * fixes issues Fixes indentation issues (curse you VSC) and accessor issue * Simplifies code Drastically simplifies the code because unlike Bubber's (where i'm porting these changes from), we don't really need half of these if statements and such. * Forgot a - sign * TGU: belated February edition (fulpstation#1129) * tgu * ok.. * they killed the fucking grab proc im not fixing this * fixes some map shit * huh * Merge remote-tracking branch 'tgstation/master' into tgu24 * this is weird af * idk what went on with this merge but ig its fixed * fixes windoors * this time for realsies passes * i promise now it does * fixes tgui + add boulder * Update beefman.dm (fulpstation#1138) * sdmm1 i missed you (fulpstation#1142) * Adds a Pubby Courtroom (fulpstation#1131) * Update PubbyStation.dmm * I hate you cables, i mean firelocks, force of habit * Update PubbyStation.dmm * Adds back soul * Stealing the free hammer * Nanite fix1 (fulpstation#1135) * fixes nanite sting and nanite spread * fix2 * Revert "fixes nanite sting and nanite spread" This reverts commit 54a5ba5. * fix3 * fix4 * fix5 * lol (fulpstation#1144) * Prototype Station Tweaks (fulpstation#1148) * initial_tweaks * for some reason this wasn't part of the PR * Update syndicate_engineer.dm * Selene cargo if it was awesome (fulpstation#1149) * selene 2 * Cameras * aesthetics * first linters fix * landmarks * all my homies hate atmospherics sanity * wrong wall * Update SeleneStation.dmm * conflict * test merge notices * Update SeleneStation.dmm * part 2 * linters * final commit * fixes powernet at 100, 125 * removes wall window in sec depot --------- Co-authored-by: Horatio22 <69338705+Horatio22@users.noreply.github.com> * Deathmatch? Pandamonium! (fulpstation#1151) * Create pandamonium.dmm * Update deathmatch_loadouts.dm * Update deathmatch_maps.dm * When you forget the forward slashes * Let's move the code... and push it over there! Made at @Horatio22's request concerning /tg/ update difficulties Reverts the two original .dm files * Further avoidance from errors with /tg/ code, sets the .dme up right * Removed .dmm from .dme, added new folders and moved two .dm files in * Paying the Linters off * Pathing?? * Undo * Update fulp_modules/mapping/deathmatch/code/deathmatch_maps.dm Thank you! Co-authored-by: anettera <windarkata@gmail.com> --------- Co-authored-by: anettera <windarkata@gmail.com> * Heliostation minor changes and additions (fulpstation#1146) * change area to Auxiliary Engine Construction and expands it this area is always used for making teslas and singulos * connect Aux Engine Construction to station power net and route atmos to engine pipe to Aux Engine Construction area * Replace normal walls in bridge with R-walls * add missing surgical tools to surgical rooms and remove bonesetter in medbay treatment center * Move cell charger in engi closer to the fab * arc mining lol adds a full refinery to mining * change atmos burn chamber a bit every other station's filter output is outputting to the can, Helio's filter output used to output to waste * can't varedit areas smh (furious) * fix 2 and the thing pepsi wanted * it had to be done * fix 4 * add connected conveyor lever to foundry * F * mining * fix errors and placeholders * more fixes * fix * fix double walls * fix * Lowers job positions across the board (fulpstation#1155) * Fixes nanite chamber visibility (fulpstation#1153) * Pubby additions and fixes (fulpstation#1147) * AI satellite change * add missing cable in perma * add foundry in place of warehouse * smol fix * remove beacon * add cell charger * better now * fix * f * adding shutters back * stoopid machine * better maybe * fix??? * cargo rework * cargo rework once more * fix * should look better * moved drone dispenser * fix? * fix! * Dmloadout equipfix (fulpstation#1161) * preprocessor early return for unit test * Makes round time actually work somewhat (fulpstation#1145) * possible permanent fix * Minor Helios disposal Fix (fulpstation#1165) * Update Heliostation.dmm * oops * Only Albino Gorillia has magic gorilla powers (fulpstation#1166) * gives nobraindamage felinids a name (fulpstation#1167) * Removes old nanite relics from the game (fulpstation#1168) * Removes old nanite relics from the game * Update tgstation.dme * forgot this * new fluff room * difffrent fluff room * Updates with master * Adds a second fulp Deathmatch arena (fulpstation#1156) * adds heliocentric * Update deathmatch_loadouts.dm * Update deathmatch_maps.dm * Update heliocentric.dmm * Update heliocentric.dmm * Update deathmatch_maps.dm * fixes ctf * fixes * fix * am old an rusty * Phone webedit * TGU - 3/14/2024 (fulpstation#1154) * TGU - 3/14/2024 * a * nanite source fix * Fixes Cargo * Fix polling mutating its target's plane and layer * Fixing cargo 2 --------- Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com> * Pubby Decal Refresh (fulpstation#1160) * Changes many decals all over the station * Missed decal * More Tweaks, removes more yellowed hashes * More (surely) epic changes * Bridge touch up * removes helio's layer 1 cables in sm chamber (fulpstation#1169) * removes helio's layer 1 cables in sm chamber * Update Heliostation.dmm * Update Heliostation.dmm * Big Map Refector (fulpstation#1170) * Deathmatch : Final Destination (fulpstation#1164) * Deathmatch : Final Destination My last map, an attempt at a more competitive version of Arena Station. * balance + cap's egun + hos energy bolas * more balance + pete gets macrobomb implant ~ nukie pistol starts on belt ~ tot bow starts on suit * finalized map * balance: bulldog is gone - Nuke ops gets c20r instead of bulldog based on feedback from DAKKA * challenger pack 1 Dakka's suggestion: Abductor Momo's suggestion: Tider * v2 following playtesting New classes from Service Department: Clown: Military grade prankster Mime: All mime acts, and a silenced pistol if they don't impress. Chef: Carp gloves and pizza bombs. Meat tower contained into one man. * nukie smg fixed * cap egun fixed * pete got ten remote signallers, attach to syndicate bomb to actually use it. * balance command now get bowman headsets and HOS gets a flashbang suggestion from axle brady (security main) * oops * balance adjustments Traitor - still has all their gear and gains another iconic trick while capping the revolver's potential. - speedloader + syndicate soap nukie - Nukie was underperforming despite the gear and also lacked any melee option at all. - methpen + stimpack + edagger Tider - oversight in class design meant tiders need to remove their gasmask to take their drugs, annoying. - stimpill + methpen Clown - horrid banana shoes are gone mime + hat * map changes made map smaller for faster loading, fixed floating over chasms, buffed mime experimental 8 player mode enabled * moved dm maps to maps folder * 8 players fix * fixes hole in the map --------- Co-authored-by: sylvia <sylvia-from-fulp-station@users.noreply.github.com> * removes unused signals (fulpstation#1174) * Fr (fulpstation#1175) * Selene Medbay Rework (fulpstation#1157) * Update SeleneStation.dmm * cables again * pipes this time * atmos sanity * area fix this time * adds fishing pole to paramed area * moves shutter control button * actually updates botany too whoops * oops a decal got deleted * gives botany a chem fridge for funsies * easy fix (fulpstation#1176) * Deathmatch but in an Industrial Park (fulpstation#1172) * Create Industrial.dmm * Update Industrial.dmm * Moves map to modules * Sets up the files * Not eyes apparently -- GLASSES of course * Adds some lights and such * Update Industrial.dmm * Update Industrial.dmm * I failed at making an emagged cleanbot, honkbot will do instead * Resolve conflict 1 * Prep for update * Moves .dmm files to proper location As per @Horatio22 * These walls lack opacity = 1 no longer * Resolve Conflict 2 * Removes old nanite relics from the game (fulpstation#1168) * Removes old nanite relics from the game * Update tgstation.dme * forgot this * new fluff room * difffrent fluff room * Updates with master * Adds a second fulp Deathmatch arena (fulpstation#1156) * adds heliocentric * Update deathmatch_loadouts.dm * Update deathmatch_maps.dm * Update heliocentric.dmm * Update heliocentric.dmm * Update deathmatch_maps.dm * fixes ctf * fixes * fix * am old an rusty * Phone webedit * Prep for update * TGU - 3/14/2024 (fulpstation#1154) * TGU - 3/14/2024 * a * nanite source fix * Fixes Cargo * Fix polling mutating its target's plane and layer * Fixing cargo 2 --------- Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com> * Pubby Decal Refresh (fulpstation#1160) * Changes many decals all over the station * Missed decal * More Tweaks, removes more yellowed hashes * More (surely) epic changes * Bridge touch up * removes helio's layer 1 cables in sm chamber (fulpstation#1169) * removes helio's layer 1 cables in sm chamber * Update Heliostation.dmm * Update Heliostation.dmm * Big Map Refector (fulpstation#1170) * Moves .dmm files to proper location As per @Horatio22 * These walls lack opacity = 1 no longer * Resolve Conflict 2 * Rebase, resend... * Update, resend... I love conflicts! --------- Co-authored-by: anettera <27014495+remove32@users.noreply.github.com> Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> Co-authored-by: Pepsilawn <reisenrui@gmail.com> Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com> * runtime begone (fulpstation#1181) * Selene Engineering tweaks and atmos remaster (fulpstation#1179) * Update SeleneStation.dmm * first fix * m * addressed review by Pepsilawn * added mix to port pump * fixed pipe dirs * fix and reverted sec outpost change * fixes * atmos sanity * review * minor fix * another minor fix * fix * review * maints airlock * tiles * tiles * Fixes heliostation SM (fulpstation#1184) * Update TGS DMAPI (fulpstation#1182) Co-authored-by: tgstation-server <tgstation-server@users.noreply.github.com> * Selene maintance (fulpstation#1185) * start * actul * switches to proper random arcades * chapal wall * cryo waste disposals fix * pipe fx * Update Heliostation.dmm (fulpstation#1186) * Changes to blood chair and dirtying (fulpstation#1189) * general nice stuff for mentors (fulpstation#1190) * general nice stuff for mentors * Update mentor_manager.dm * Update fulp_modules/features/mentors/mentor_state.dm * Update fulp_modules/features/mentors/mentor_clientprocs.dm Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> --------- Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> * Fixes wasted atmos turf processing on HelioStation (fulpstation#1198) * dirt dirt dirt * Delete Heliostation.dmm * Vassal fold ensures you're a revenge vassal (fulpstation#1196) * Fixes vassal folding * we gotta return it ourselves * fix to something else entirely * Update vassal_fold.dm Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> --------- Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> * Adds Protogens (fulpstation#1199) * adds them the cool awesome spec * tg edit * yup its done * Fulp code improvements (fulpstation#1192) * a * old comment * Move sounds * Healing nanites works better on Lavaland (fulpstation#1197) * Healing nanites works better on Lavaland * Update healing.dm * Adds Theia (formerly Fulpstation) Station (fulpstation#1107) * what * I have no idea what I'm doing christ almighty * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm unfucking things I fucked up earlier * Update Fulpstation.dmm bitden area fixed * Revert "Update Fulpstation.dmm" This reverts commit bb35cb4. * Revert "Update Fulpstation.dmm" This reverts commit 92882db. * Revert "Update Fulpstation.dmm" This reverts commit 782b5ae. * Revert "Update Fulpstation.dmm" This reverts commit 1728dd4. * Revert "Update Fulpstation.dmm" This reverts commit e835424. * Revert "Update Fulpstation.dmm" This reverts commit 80cb1b9. * Revert "Update Fulpstation.dmm" This reverts commit b4f9396. * Revert "Revert "Update Fulpstation.dmm"" This reverts commit 35d0ae0. * Adds cargo shuttle * fixes cargo shuttle linters issue maybe * gives engineering a hole engineering hole * attempting to fix upperbrig2 issue * attempt to fix upperbrig2 issue by adding " * makes it 1 z * puts commas in the json * delete random blank spaces * Update fulpstation.json * actually makes it 1 z lmao * fixes docking port, weird issues with atmos pipes getting deleted * wtf * Feedback response 1 Removes dead body placers, fixes wiring in disposals, removes walls from under airlocks in the bathroom and chapel, adds button to warehouse , fixing wiring in sci & meatroom, removes squidcloak, adds wardrobe vending drobe, fixes hole in AI upload, allows people to exit medbay and maints * googa and care's feedback * Update Fulpstation.dmm fix AI sats, added windoors and access restrictions * Fixies * Nobelium-XVIII's SM fixes Copy and pasted from Horatio22#2 to prevent merge conflicts * adds lights, fixes flashes, fixes tube to ai sat * adds " " on button ID fixes another string thing * mm * Update fulpstation.json no additional cqc area for chef fuck em * Update Fulpstation.dmm fixes some things * Update Fulpstation.dmm * Update Fulpstation.dmm what the fuck * Update Fulpstation.dmm * Update Fulpstation.dmm * tcomms * arrival shuttle dock * Update Fulpstation.dmm * Update Fulpstation.dmm fixes chapel holes, aligns the toxins pad * maybe fixes viro doors * fixes AI sat wiring, maybe fixes HoP buttons * Update Fulpstation.dmm * Update Fulpstation.dmm most areas have decals now * decals and stuff * Update Fulpstation.dmm ugly ass decals no one asked for * Update Fulpstation.dmm cable fixes * Update Fulpstation.dmm * Update Fulpstation.dmm fixes double pipes * Update Fulpstation.dmm fixes mapcheck issues * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Fix a bunch of errors * air alarm in space * tf * fixes shuttles for real * fixes problems with access and more errors * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Fix a bunch more errors * Update Fulpstation.dmm * /datum/unit_test/cable_powernets fixes these * add area kitchen hydro adds kitchen hydroponics area * maybe fucks up the arrival shuttle * maybe fucks up the rest of the shuttles lol * yeehaw * Update Fulpstation.dmm * Update Fulpstation.dmm * rework cargo removes dept disposal pipes, moves the trash conveyors. "Fixes" the cargo shuttle conveyor belts. * Update Fulpstation.dmm * Update Fulpstation.dmm * Update fulpstation.json * Update cargo_fulp.dmm * Update Fulpstation.dmm * cargo fixes maybe * Update Fulpstation.dmm * Update Fulpstation.dmm * map edits adds area * decals because idk why the shuttle is fucked * Update Fulpstation.dmm more decals because shuttles hard disposals hard I am monkey * fixes more errors * fix area, delete fulp cargo shuttle, replace it with helio in json * attempt at mail pipes * bad neighbor * atmos sanity * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * unfucks airlocks from last commit * fixes the rest of the issues maybe * adds station direction decals * fucking oops * areas * fix area maybe all issues done now please god please * puts new area in, gives new areas apc and atmos * adds nanites * what the fuck does it mean * if this doesn't fix it idk what will tbh * runtimes begone * fuck * Update map_templates.dm * Update Fulpstation.dmm * showers now work, maybe the last runtime * fix duct * Update fulpstation.json * does this fix the fucking map * fixes ducts * Update Fulpstation.dmm * Update Fulpstation.dmm * hh * totally not helio cargo shuttle * m * hooray * Update Fulpstation.dmm * feedback thread part 2 Fixes most of the issues in the feedback thread: -docking port -multiple backwards pipes -re-wires AI sat (maybe correctly, probably not) -many, many pipe/ wiring fixes -solar access -ai sat atmos -adds mech. cyborg chargers to engie -cyborg charger in bathroom -ATTEMPTS to fix some of the atmos dept issues (lol) -fixes cargo shuttle conveyor belts * Update Fulpstation.dmm * Update Fulpstation.dmm * Update Fulpstation.dmm * fixes of things and such * Update Fulpstation.dmm * ord updates removes pipes from windows in ai sta adds TTVs and other supplies to ord changes pipes in ord probably breaks everything * ai sat changes makes a second entrance for AI sat adds holopads to station adds teleport spawners to station * give CE tcomms paper gives captain a comms console fixes some pipes CE office now has tcomms paper fixes access issues on some security doors * fix pipes * adds lattices * deletes bad neighbor * adds space walk/ ai sat protection * fix bad neighbor again * yeah * Fixes * feedback from forums * 2.28 feedback fixes -perma changes -re-arranged kitchen -LOTS of cable fixes -fixes directions for robo and chapel items -access fixes * fixes cables and bad neighbors * execution chamber windows fixed * cables again * rec and arrival area changes - shortens hall near public mining -makes a public tunnel between fitness room and holodeck -adds MORE directional signs for evac seriously if you miss it there is nothing more I can do to help you * gives stamps * more fixes lights in lounge cable issues gives everyone stamps who needs them probably * yet more fixes, adds signs, labels some airlocks * makes ord work * fixes things, decals, tiles, shit is purple now * 2 lights 1 tile * forgot the floor * more decals while I wait for tests to work * wtf is up with that light idk * fix space * fuck off * gives ce an actual request console * lights and decals * Update Fulpstation.dmm * removes soul * even more soul * more soul * adds surgery tools * bad neighbor * black light * removes cell 3 doors * Update Fulpstation.dmm * Update Fulpstation.dmm * fixes windoors * Update Fulpstation.dmm * fucking windoors * christ * nav beacon attempt1 * cargo fixes (hopefully) * cargo changes * forum feedback, fixes error -bar lounge now is connected to power -fixes access issues with xenobio -moves buttons in turbine, med maints -renames turbine door -moves turbine computer -gives hydroponics a seed extractor * forum feedback 3.12 -adds more displays to AI sat -fixes crematorium button -gives HoP incredment counter * renames Fulp Station to Theia Station * correctly names dmm * decals * lowercase json * update the damn json please * Update Theiastation.json * stop making it fucking capital jesus h christ * ugh * Update theiastation.json * Throws science around * Update TheiaStation.dmm * why did you break my linters john * fixes * forum feedback 3.16.24 * fix quad wall * Science fixes reported from forums * Forum feedback 3.19.24 * Forum feedback 3.22 Finally adds bridge fireaxe Fixes large library paintings * theia fixes * comms fix * Update TheiaStation.dmm * adds another access side to atmos, fixes some r_walls * Revert "adds another access side to atmos, fixes some r_walls" This reverts commit 279cad0. * Revert "Merge branch 'fulpmap24' of https://github.com/Horatio22/fulpstation into fulpmap24" This reverts commit 51bf566, reversing changes made to 279cad0. * adds event spawners, moves whiteship dock/adds ert dock, removes useless chute outlet, fixes warden lightswitch * fixes conveyors * Xeniobio monkey box and cytology locker * adds secure storage btn * engi airlock cycles * rm space cameras * ad engi showers * morgue tools * fx solar smes in/out direction * ad camera brig entrence * ad cargo blast access * fix railings * Update areas.dm --------- Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Pepsilawn <reisenrui@gmail.com> Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com> Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> * April TGU: Virologist is gone (fulpstation#1200) * Initial merge * Map files * dme mon ami * Cult span renames * updatepaths * AltClick renamed to click_alt * beefman hair color stuff * bye bye beefman viro * get_all_gear * Updated mentor refresh verb * bloodsucker rack atom_deconstruct * removed LateInitialize from nanites machines * brain trauama now calls parent on_lose * readme * greyscale fulp edit * arrival sound fulp edit * tgui routes fulp edit * build.js fulp edit * fulpui-patches * Missed a couple of shuttles * tgui files * Map updates * tgui tweaks and screenshots * fixed typo * halloween beacon texture * Vault piggy banks * beacon icon fr * Selene cargo chat console * selene labour shuttle * Photobooths! * Moved photobooth button on selene * Theia updates * Reset maps.txt * Order consoles * Ports TG's #82906, fixes plasma cutters * Theia vault piggy bank * CLICK_ACTION_SUCCESS for coffin alt clicking * Atmos area is back (fulpstation#1202) * Fixes protogen features (fulpstation#1205) * fixes protogens * yup * Update TheiaStation.dmm (fulpstation#1206) * Update beefman.dm (fulpstation#1207) --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Nush-Kajul <83676900+Nush-Kajul@users.noreply.github.com> Co-authored-by: Ray <64306407+OneAsianTortoise@users.noreply.github.com> Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com> Co-authored-by: Kian <157846764+sylvia-from-fulp-station@users.noreply.github.com> Co-authored-by: sylvia <sylvia-from-fulp-station@users.noreply.github.com> Co-authored-by: unfoldedberet <106662180+unfoldedberet@users.noreply.github.com> Co-authored-by: A miscellaneous Fern <80640114+FernandoJ8@users.noreply.github.com> Co-authored-by: anettera <windarkata@gmail.com> Co-authored-by: tgstation-server <tgstation-server@users.noreply.github.com> Co-authored-by: Sadboysuss <96586172+Sadboysuss@users.noreply.github.com> Co-authored-by: Nobelium-XVIII <76599451+Nobelium-XVIII@users.noreply.github.com> Co-authored-by: Horatio22 <69338705+Horatio22@users.noreply.github.com> Co-authored-by: destrucktoid <39823128+destrucktoid@users.noreply.github.com> Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com> Co-authored-by: Pepsilawn <reisenrui@gmail.com> Co-authored-by: Cure221 <106662180+Cure221@users.noreply.github.com> Co-authored-by: pleonektein <127079361+pleonektein@users.noreply.github.com> Co-authored-by: DAKKA-WAAAGH <34065421+DAKKA-WAAAGH@users.noreply.github.com> Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> Co-authored-by: anettera <27014495+remove32@users.noreply.github.com>
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.
About The Pull Request
Moves all fulp maps together Like how tg does.
Why It's Good For The Game
Makes coding easier.