Open
Conversation
…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 binoculars.dm * Update binoculars.dm
* Update fortune13.dme * Revert "Update fortune13.dme" This reverts commit fa61351. * Update good.dm * Update traits.dm * Update traits.dm * Update drug_events.dm * Update food.dm * Update good.dm * Update drinks.dm * Update traits.dm * Update drinks.dm * Update drinks.dm * Update drinkingglass.dm * Update bottle.dm * Update drinkingglass.dm * Update drinks.dm * Update drinks.dm * Update drinks.dm * Update drinks.dm * Update drinks.dm * Update drinks.dm * Update drinks.dm * Update bottle.dm * Update good.dm * Update code/datums/traits/good.dm Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com> * Update code/modules/fallout/reagents/drinks.dm Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com> * Update good.dm * Update drinks.dm * Update drinks.dm * Update alcohol.dm Co-authored-by: lolman360 <22850904+lolman360@users.noreply.github.com>
* Second Floor to the Bank * Small fixes
* ax * ree * forgor * oops * rebuild test * Oh if ound it * grass-touched pull request of the plains +1
* Removes minesweeper #15232 Citadel-Station-13/Citadel-Station-13#15232 * Update misc.dm
* Auto Guns Makes certain lootable guns utilize full auto * Spread Adjustments Increases the spread for most guns. Values subject to change upon live testing Co-authored-by: Scheveningen <oneonethreeeight@outlook.com>
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
12 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
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: