Compacted NCR Base#1
Open
Wateronix wants to merge 562 commits into
Open
Conversation
* Import CM ice walls. Commented out old icewalls * removed ice floor base turf * Uncomments the old ice/rock sprites * Indentation fixed Pressed spacebar by accident. oops * Squashed commit of the following: commit e56d5b458d5db3321f1a872e0a3126def210e38c Merge: 57dcce1a32 976e48b Author: ZAB909 <88751965+ZAB909@users.noreply.github.com> Date: Sat May 28 22:30:21 2022 +1000 Merge branch 'master' of https://github.com/fortune13-ss13/thewasteland commit 57dcce1a32bdfc262d7f4d3bb2418f06ae648fd8 Author: EgorDinamit <53223414+EgorDinamit@users.noreply.github.com> Date: Sat May 28 08:14:36 2022 +0400 Thirst/hunger update, v2. (#509) * simple thirst & hunger mechanics: UPDATED Now there's no need to cry * Update! * up * recipe tweak commit ed1b8da4761ab8eb885261e62e696c932d45d8bb Author: Turly <96830917+Refined1@users.noreply.github.com> Date: Sat May 28 03:54:33 2022 +0200 Detroit Bugfix (Now with other shit) (#522) * Xarnatadidnothingwrong * Update wasteland.dm * I<3Zyy Co-authored-by: PhoronRestructurantHuman <64915031+PhoronRestructurantHuman@users.noreply.github.com> commit 858621b9b44241586a4936e0c6ad4488a5d6a29f Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Sat May 28 04:53:22 2022 +0300 Yeah get rolled (#526) commit 23a3a4e8c098d84fd831e023457a2374e92ed0f8 Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Sat May 28 04:52:52 2022 +0300 Removes the slowdown hyperbuff on the null rod variant (#524) commit b6ab7664e3c24e74ead22e6c724ea7421c6462a5 Author: XElectricX <XElectricX@users.noreply.github.com> Date: Fri May 27 11:29:49 2022 -0400 Kitchen and farm layouts improved (#520) commit 623c006944b891aee5484afe4f0cd2ea5d8b6378 Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Fri May 27 18:29:41 2022 +0300 Fixes utility vest and slave stips sprites?? Based? (#519) * Based? * And slave strips commit 044a9c4d2f86a4884c7071d660a34f4c880d14ad Author: CocaColaTastesGood <47264839+CocaColaTastesGood@users.noreply.github.com> Date: Fri May 27 08:29:27 2022 -0700 Update wmv_buyer.dm (#518) commit 13e28445747f04a71a314ef8c69f9df335d787e1 Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Fri May 27 18:14:29 2022 +0300 Fixes rad-storm warning (#517) * I think this fixes the without warning rad storms * Also removes the acid rain thing I put down in the hopes that that is buggin' out the casings * Puts back the weather_act_turf check, removing it didn't seem to work, so if someone else can make it work, hooray commit ff19916f0d753131a44463f01d755987b0939d7e Author: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Fri May 27 11:14:18 2022 -0400 bedsheet hotfix (#516) commit c0de08def17929934ab819de7a7c52fcaa00de0c Author: AllCorruptingWyrm <93557430+AllCorruptingWyrm@users.noreply.github.com> Date: Fri May 27 11:13:24 2022 -0400 Godfathers Armory (#513) * Loadout WIP * fixes the vendor, jobs, boss loadouts * throwing star fix * Doctors aren't allowed to have guns, admins aren't supp- * removes dupe loadout, vendor comment * Adjusts Brass Gun damage values, tycho * fixes a missing / * had some compile errors, we should be good after this * forgot a =, var issues * bug testing... * downgraded revolver fix+used sprite * revolver fix * adjust explosive costs for review * boss loadouts * throwing star adjustments, cost changes. * baseline map fix, machinery fix, etc, its a nerf * oops * wrong shelves?? somehow? commit 7b7b115c31182503263b7ad208c03159df72ee95 Author: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Thu May 26 08:48:46 2022 -0400 Preacher Loadouts (#514) * Oorah preacher loadouts * Update wasteland.dm * Update wasteland.dm commit c479ad7a55906c2a1e7aa1f93a2ad321fc414022 Author: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Thu May 26 08:48:34 2022 -0400 The bedsheet PR (#512) commit 976e48b Author: EgorDinamit <53223414+EgorDinamit@users.noreply.github.com> Date: Sat May 28 08:14:36 2022 +0400 Thirst/hunger update, v2. (#509) * simple thirst & hunger mechanics: UPDATED Now there's no need to cry * Update! * up * recipe tweak commit c1937cf Author: Turly <96830917+Refined1@users.noreply.github.com> Date: Sat May 28 03:54:33 2022 +0200 Detroit Bugfix (Now with other shit) (#522) * Xarnatadidnothingwrong * Update wasteland.dm * I<3Zyy Co-authored-by: PhoronRestructurantHuman <64915031+PhoronRestructurantHuman@users.noreply.github.com> commit 29358e7 Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Sat May 28 04:53:22 2022 +0300 Yeah get rolled (#526) commit 0bccfb0 Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Sat May 28 04:52:52 2022 +0300 Removes the slowdown hyperbuff on the null rod variant (#524) commit ec93336 Author: XElectricX <XElectricX@users.noreply.github.com> Date: Fri May 27 11:29:49 2022 -0400 Kitchen and farm layouts improved (#520) commit 16735fd Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Fri May 27 18:29:41 2022 +0300 Fixes utility vest and slave stips sprites?? Based? (#519) * Based? * And slave strips commit 6d35b7a Author: CocaColaTastesGood <47264839+CocaColaTastesGood@users.noreply.github.com> Date: Fri May 27 08:29:27 2022 -0700 Update wmv_buyer.dm (#518) commit 41b0a5b Author: BadAtThisGame <79063506+BadAtThisGame302@users.noreply.github.com> Date: Fri May 27 18:14:29 2022 +0300 Fixes rad-storm warning (#517) * I think this fixes the without warning rad storms * Also removes the acid rain thing I put down in the hopes that that is buggin' out the casings * Puts back the weather_act_turf check, removing it didn't seem to work, so if someone else can make it work, hooray commit 5cdfe04 Author: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Fri May 27 11:14:18 2022 -0400 bedsheet hotfix (#516) commit eabdb8f Author: AllCorruptingWyrm <93557430+AllCorruptingWyrm@users.noreply.github.com> Date: Fri May 27 11:13:24 2022 -0400 Godfathers Armory (#513) * Loadout WIP * fixes the vendor, jobs, boss loadouts * throwing star fix * Doctors aren't allowed to have guns, admins aren't supp- * removes dupe loadout, vendor comment * Adjusts Brass Gun damage values, tycho * fixes a missing / * had some compile errors, we should be good after this * forgot a =, var issues * bug testing... * downgraded revolver fix+used sprite * revolver fix * adjust explosive costs for review * boss loadouts * throwing star adjustments, cost changes. * baseline map fix, machinery fix, etc, its a nerf * oops * wrong shelves?? somehow? commit b5915e1 Author: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Thu May 26 08:48:46 2022 -0400 Preacher Loadouts (#514) * Oorah preacher loadouts * Update wasteland.dm * Update wasteland.dm commit f4f2616 Author: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Thu May 26 08:48:34 2022 -0400 The bedsheet PR (#512)
* water purification station * mapping update
* water-stuff-3 * Buffs reagents that cause thirst Don't eat salt, lads * fix mapping mistake
no more funny superfortress............... Co-authored-by: panzer1944 <76075239+panzer1944@users.noreply.github.com>
* Enclave changes, Balance changes oh boy time for screaming * oops oops
* Legion oops I fucked up setting up the new vex loadout in my rush. This should allow it to be selected at round start. * fuck * Update f13factionarmor.dm
* outline/skeleton of * More polish and changes. * still making edits egor * bigly changes * other changes and prettyification * oops, forgot a " * other silly fixes * I made too many duplicates, oops * polish, lights, etc, one secret (not an item) * adjustments, removes the secret, alas, fine for merge? * final commit, light adjustments, etc * limiters pls
* Update granters.dm * Update granters.dm
* The wastelanding * bruh
* ncr veteran ranger removal sorry, boys, but 18 yr old female veteran rangers aren't lore accurate. * NCR no longer has farming or water No one ever did the sharecropper farm quest in FNV anyways. * NCR must actively pay taxes There is a new need meter similar to thirst and hunger for this now.
…543) * squashes armory bugs and removes all elders clothing and pipboy in the elders office. * Update Pahrump-Underground-1.dmm
* ya * Update slotmachine.dm * linters + small changes
* What is inheritance * Refactor loading bench * Minor stuff * Examine
* C4 fix * Removes the indestructible flag given they are already indestructible
* ff * Update stack.dm
I don't know how to update my PR
Respawn timer set to 20 minutes
Welcome to Fargo Outpost. This took a week's work but I hope its worth it.
Legion Base Fix, Enclave Fort Hazard, Brotherhood Fargo Outpost
* i'm tired BoS(s) unfucks * forgot about initiates :) * some fixes yesah
Area changes in the north bunker dungeons, moved loot out of the actual dense rock walls and onto the ground, fixed up the walls and floors in the enclave bunker and gave them an airlock instead of a barricade on their outer wall side.
something about mall's aer9
…rgetting-to-make-doors-correctly inshallah
Small cleanup
let there be light - Adam Sandler once
legate bag moment
Funny blueprint from NCR deserter loadout
gives legion legate a bag
Sets possible transfer amounts for small flask
* Roofing Fix + North Office + Tweaking Oasis Store * Endzone Added a bit to the centcomm station. * little bit of dirt added just a tiny bit of dirt * note name instead of johnson & johnson its consumer softproducts now * trader deleted deleted the trader machine outside the oasis shop * ncr rep dummy replaces generic bust with cool ncr armor mannequin in the representative's office * showcase update changed the mech display in the bos bunker to be another armor display stand
* timer change. Everyones malding, server pop dropped, more news at 10. Respawn timer down to 10 mins. See if that changes things(?) * you didn't see anything.
* deletes sludge, zombie powder and ghoul powder * just another * Return Teslium for now
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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
My proposed changes to the NCR Base:
-farm is moved back into the camp and is open air now, praise the sun
-toilets and showers are more compacted
-cafeteria is smaller, removed the sealed booze as you cant drink it anyways, as well as tables that i thought would be unlikely to be used
-removed the reinforced walls round to the rock, if Gilia isnt protected, why should Miller be?
Why It's Good For The Game
Decreasing the sprawl of the base and making it a tid bid more pretty.
Pre-Merge Checklist
Changelog
🆑
tweak: tweaked the NCR base and moved a few things
/:cl: