forked from buffyuwu/LoneStar
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update autolathe.dm #29
Open
cornercube
wants to merge
128
commits into
master
Choose a base branch
from
cornercube-ghettolathe
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
…ing. (#297) * Removes Stimpaks and Super Stimpaks Toxin Healing, Adds Lipolicide like effect as well. * Adds in (commented out) Heavy-Duty Sheath * Update recipes_clothing.dm * Update belt.dm * Update code/modules/fallout/reagents/medicines.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/modules/fallout/reagents/medicines.dm Co-authored-by: Loorey <loorey@disroot.org> * adds blurring effect to poultice and bitters, reduces toxins of super stims. * properly applies eyeblur for bitters upon use instead of when using superstims too Co-authored-by: Loorey <loorey@disroot.org>
…Buffout + other chem changes (#299) * rrraaaa * rrrr * tea fix * ree * Teastuff * Escobarrrrrrrr * medunex * booze fix * recipe conflct * ree * juice effects * fixes * ? * rrrr * er * air * duplicate defines * wooper * ree * to feel * to become * nerf * gonna need all the fries * super stimtweaks * hot sauce * conflux * rr * minor tweaks * plastic autolathe fix
* multi-z shit * update * added legion watchtowers upon request * adds other dir stairs * Update stairs.dm * Update stairs.dmi
* amoguis * Update ncr.dm * Update ncr.dm
* rrraaaa * rrrr * tea fix * ree * Teastuff * Escobarrrrrrrr * medunex * booze fix * recipe conflct * ree * juice effects * fixes * ? * rrrr * er * air * duplicate defines * wooper * ree * to feel * to become * nerf * gonna need all the fries * super stimtweaks * hot sauce * conflux * rr * minor tweaks * plastic autolathe fix * Update recipes_medicine.dm
…er because you can still stack them for some reason (#318)
* blood * Revert "blood" This reverts commit 514fee2. * small
* Update legion.dm * Fixes dual wielded shotguns Dedwiitated wam for the server * general nerfs and buffs change of guns with corners opinions. * Nerfs MEDX a bit * Buffs service rifle Co-authored-by: Scheveningen <oneonethreeeight@outlook.com>
…RGE PLEASE) (#316) * byebye * Update Dungeons.dmm * Update code/modules/arousal/arousal.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/modules/arousal/arousal.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/modules/arousal/arousal.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/modules/arousal/arousal.dm Co-authored-by: Loorey <loorey@disroot.org> * shitadel * Update code/modules/arousal/arousal.dm Co-authored-by: Loorey <loorey@disroot.org>
* makes bitter/poultice blur work as intended, increases ease of healing burn wounds and debriding infections * adjusts nutrition drain to work correctly on stims
* shix * cool beans cool beans
* ararat * es * Revert "es" This reverts commit 410567c. * alyeak
* adds heavy-duty sheath and recipe for it * should enable ranger capes to hold .45 speedloaders(?) * adds legholster and twin sheath to crafting * fixes old leather strips being better than most Legion armor * sets armor values to 0 on armor parent * adds 25 wound armor at base
* Update wvm.dm * Update wvm.dm * Update wvm.dm * Update wvm.dm * Update wvm.dm * Update wvm.dm * Update wvm.dm * Update wvm.dm * Update wvm.dm Co-authored-by: Scheveningen <oneonethreeeight@outlook.com>
* gunslinger vex bottom text * stupid fucking ' * remove el booko * adds nightstalker vex helmet because funny * muh spathas * adds immunes, removes some slavemaster things * undoes the loadout thing so I can just focus on the off-duty role * enables immune spawns hopefully? * Update code/__DEFINES/jobs.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/modules/jobs/job_types/legion.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/modules/jobs/job_types/legion.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/modules/jobs/job_types/legion.dm Co-authored-by: Loorey <loorey@disroot.org> * Update code/__DEFINES/jobs.dm Co-authored-by: Loorey <loorey@disroot.org> * should make them display in the job list correctly, also increases them to 5 Co-authored-by: Loorey <loorey@disroot.org>
* Update f13factionarmor.dm * Update f13armor.dm * Update armor.dm * Update f13armor.dm * Update f13armor.dm * Update suit.dm * Update suit.dm * Update followers.dm * Update suit.dm * Update suit.dm * Update suit.dm * Update f13factionhead.dm * Update f13lootdrop.dm * Update f13lootdrop.dm * Update uniform.dm * Update suit.dm * Update automatic.dm * Update oasis.dm * Update recipes_weapon_and_ammo.dm * Update automatic.dm * Update helmet.dm * Update armor.dm * Update oasis.dm * Update f13lootdrop.dm * Update f13factionarmor.dm * Update rifle.dm * Update oasis.dm * Update plasmaf13.dm * Update f13factionarmor.dm * Update f13factionarmor.dm * Update f13factionarmor.dm * Update belt.dm * Update followers.dm * Update beams.dm * remove line armor * Update oasis.dm Co-authored-by: Scheveningen <oneonethreeeight@outlook.com>
* ararat4 * sproutning * r * er
…rojectiles) (#326) * click * fix * fex * Update arrow.dm * move code * bracket * ararat4
* Update shotgun.dm * Update shotgun.dm
Whitelist only, suggest only letting people be supermutants through a narrative reasons. Fully functional but Very basic, needs sprite works done for helmets Left comments with TODOs. Don't wear normal clothes, don't spawn in Super Mutant Armor unless you change the base armor back down to 10-20. Extra health assumably doesn't work, as I didn't notice it. Again bare minimum to get people wanting to make Supers playable, you can run around as a naked super. Tested, works if follow instructions thus whitelist. First pr gang.
* Update armor_plate.dm * Update minigun.dm * Update laser.dm * Update automatic.dm * Update automatic.dm * Update beams.dm * Update recipes_tailoring.dm * Update raider.dm * Update beams.dm * Update beams.dm * Update automatic.dm * Update f13armor.dm * Update recipes_weapon_and_ammo.dm * Update bos.dm * Update beams.dm * Update laser.dm * Update automatic.dm * Update automatic.dm * Update smg.dm * Update f13factionarmor.dm * Update automatic.dm * Update automatic.dm * Update automatic.dm * Update automatic.dm * Update minigun.dm * Update laser.dm * Update smg.dm * Update smg.dm * Update automatic.dm * Update automatic.dm * Update automatic.dm Co-authored-by: Scheveningen <oneonethreeeight@outlook.com>
* smithbalance * Update finished_items.dm * err * Update finished_items.dm
* salvag * Update guncrafting.dm
* buffoutroughout * Update item_attack.dm
* speer * to err is to human * mat
* powerfisting * disrfactor * ap
* Pre-built Forts * Fixed gatehouse * Update Pahrump-Surface-2.dmm * Update Pahrump-Surface-2.dmm * Update Pahrump-Surface-2.dmm * Update Pahrump-Surface-2.dmm
* Converts Oasis Sheriff's Office to Oasis PD * Update landmarks.dm * Update hats.dmi * Update f13factionhead.dm * Update oasis.dm * Update landmarks.dm * Fixed Spawning Tribal Chief had the same spawn name. Since Tribal faction doesn't exist, they get renamed. * Another Fix Tribal Chief spawn if someone ever messes with it, and I accidentally removed the Chief's hat for some reason. * Fixes Hat * Update oasis.dm * Update oasis.dm
* rreee * arrr * Update shields.dm * Update legion.dm * oops
Made the survival kit craftable in the misc section of the crafting menu for 5 cloth.
* speer * to err is to human * mat * grrr * arrrrgh * fixes stg21
Co-authored-by: Nero <nerocavalier@gmail.com> Co-authored-by: Scheveningen <oneonethreeeight@outlook.com>
This reverts commit 84cff01.
* Adds Orator (WIP) * I forgot to add the damn armor * I am tired, I forgot to set the clothing right
This reverts commit 86a034f.
* barbecue sauce - "Ahm I gehtin ah moar.. Sweet tangy, Byte?" * Khansecondstorymergeconflictkhamp Khansecondstorymergeconflictkhamp This merge conflict will have khamp with TWO stories with basically two new pets. * Update Pahrump-Surface-2.dmm * 0 * Update Pahrump-Above-3.dmm * Update Pahrump-Above-3.dmm * More * Update Pahrump-Surface-2.dmm * removes the accidental two ghouls * blazaam bottle but its empty * accidental wrong floor tile below door * bugs bad * bye random metal table from top of khamp * fix for bonfire * Update Pahrump-Above-3.dmm * more beans for fridge so if someone doesnt cook we wont instantly die.
Co-authored-by: Scheveningen <oneonethreeeight@outlook.com>
* arrrr * arrr * forgor💀 * hm * arc * Update automatic.dm * lol. lmao * mods * aagh
* Update fortune13.dme * Revert "Update fortune13.dme" This reverts commit fa61351. * Update eyebot.dm
… fix (#462) * Plasma Cannon (ready for PR) * Updated faction recipes to include the plasma musket for some roles Head Knight, Senior Knight, Knight, NCR LO, and Shopkeeper all start with technophreak. This means they're unable to get the recipe from reading Dean's Electronics. This fixes that. Other roles with technophreak are locked out, both to make the gun somewhat less common, and due to rustwalkers and legion producing the plasma cannon being a bit weird (they'll be getting their own new weapon soon) * Add files via upload * Update legion.dm * trailing new lines * trailing newlines fix (again)
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
Why It's Good For The Game
Pre-Merge Checklist
Changelog
🆑
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl: