Skip to content
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 armor.dm #36

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open

Update armor.dm #36

wants to merge 37 commits into from

Conversation

cornercube
Copy link
Owner

About The Pull Request

Why It's Good For The Game

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

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:

spackcorp and others added 30 commits March 24, 2022 21:59
* Update ncr.dm

* Update legion.dm

* Update ncr.dm

Co-authored-by: Scheveningen <[email protected]>
* Adds more Skirts to the loadout screen

* Fixed a small error
* Paladin Capes

* Update mantle.dmi

* Optional Ranger Ponchos
Added a OD rate to miners salve so people cant abuse it by injecting 1000 units.

Changed the desert ranger load out to Arizona Rangers, Lore friendly since the Desert rangers merged with the NCR rangers.
* Update arrow.dm

* Update recipes_primal.dm

* Update arrow.dm
* die legion die

* Revert "die legion die"

This reverts commit 419d950.

* Update survivalkit.dm

* Update survivalkit.dm

* xander tea bottle

* adds them to legion and ncr

* adds papers

* survival kit changes

* Update survivalkit.dm

Co-authored-by: Nero <[email protected]>
Co-authored-by: Scheveningen <[email protected]>
…aster, Exploding Arrows, More fixes to technophreak recipe lockout (#483)

* Yumi beta edition

* plascannon back sprite, yumi sprite, explosive arrow

* stuff

* PR finished

* Update bow.dm

* Update arrow.dm

removed redundant line that I forgot to take out

* Update ballistic.dmi

* update

* fixed missing sprites for plasma cannon

No clue how or why this happened but it did. Thankfully I still had the originals so I tossed them back in the file.

* Update ammo.dmi

cornercube asked for it
Added
TRAIT_MUTATION_STASIS So unstable Mutagen doesn't affect them
TRAIT_TOXINLOVER Stops healing from normal means, Stimpacks will hurt.
TRAIT_LONGPORKLOVER Doesn't feel upset for eating human
TRAIT_HARD_YARDS Doesn't get slowed down by tiles
TRAIT_GIANT Is a Giant
TRAIT_STUNIMMUNE Can't just beat them with batons
TRAIT_RESISTHEAT Self explanatory TRAIT_PUSHIMMUNE Can't just be pushed out of the way they're Super mutants
TRAIT_TASED_RESISTANCE Can't just tase them

Got rid of speedmod as it wasn't working the right way.

Would like instead of Toxin lover to just disable Metabolism in general or greatly slow it down.
* Changes Ironfists to Big Leagues on Dead Horses.

* Great Khan Loadouts

* Revert "Changes Ironfists to Big Leagues on Dead Horses."

This reverts commit ed93f87.

* Roses in vendor and seeds sprites

* Chiken Ranch + Khan Back to the Stone Age PR

* Update Pahrump-Surface-2.dmm

* Update Pahrump-Surface-2.dmm

* iloveroomtimes

* olifigureout

* error fix

* Update Pahrump-Surface-2.dmm

* portsarefun

* okaybetter

* less khan food at start.

* REMOVES THE CHEESE

* Update Pahrump-Underground-1.dmm

* khanbug

* gas mask in back

* is that toolbox ammo empty?! with bug fixes

* Update Pahrump-Surface-2.dmm

* remove two and keep one

* rolling papers for sunny day

* rise of communist spider so it isnt so hidden and fix up of Khan back

* Update Pahrump-Surface-2.dmm

* ammobox was horrible idea, doesnt fit and wont unless it is coded to fit.
* Added More loadout options.

Added a new subcategory to the Uniforms section for loadouts. This new category only contains clothes and items that are for the wasteland (and related to FO13 instead of normal SS13)

* Added new category
oh my god why was this not locked
* Fixes

blah

* penis

* update

* last fix

* ACTUAL LAST UPDATE

* WT Balance

Noticed the WT could be used with Ballistic shields leading to 98% damage reduction combined with power armor while firing. This wasn't a good thing. As compensation the WT can no longer be shot with one hand, but will have less of a move speed delay while deployed.
* Update f13factionarmor.dm

* Update f13onehanded.dm

* Update ncr.dm
…492)

* First test

* Adds mantle and toga to loadouts

* Delete neck.dm

* Revert "Delete neck.dm"

This reverts commit 89a6e28.

* Reverts alot of shit because I made a mistake

* No merge conflicts, I hope

* really this is the path

* lastest fixes

* fixes and changes helmets a little

* Update legion.dm

* Update legion.dm

* Update legion.dm

* Gives Orator an Automag

* sprite fixes + adjustable tunic

* Update uniform.dmi

* misc sprite fixes

Co-authored-by: Eluxor <[email protected]>
Moved the items from the highpop list to the low pop one aswell so people have access to all the fun stuff on the down times.
* Update fortune13.dme

* Revert "Update fortune13.dme"

This reverts commit fa61351.

* Update recipes_tailoring.dm

* Update wasteland.dm

* Update f13armor.dm

* Update recipes_tailoring.dm

* Update wasteland.dm

* Update f13armor.dm

* Update f13armor.dm

* Update f13armor.dm

* Update f13armor.dm

* Update head.dm

* Update recipes_tailoring.dm

* Update f13armor.dm

* Update f13armor.dm

* Update f13lootdrop.dm

* Update recipes_tailoring.dm

* Update f13suits.dm

* Update ammo.dmi

* Update energy.dmi

* Update energy.dmi

* Update energy.dmi

* Update energy.dmi

* Update food.dm

* Update recipes_wastefood.dm

* Update food.dm

* Update recipes_wastefood.dm

* Update food.dm

* Update f13factionhead.dm
* Update minigun.dm

* Does the same for gatling laser

* better gatling sound

* Energy weapons can reload with click instead of alt click

* Beefier gatling laser sounds

* Update laser.dm

* Gatling Laser 180 shots now (fuck you pots)
* Update fortune13.dme

* Revert "Update fortune13.dme"

This reverts commit fa61351.

* Update food.dm

* Update recipes_wastefood.dm

Co-authored-by: Scheveningen <[email protected]>
* Update medicine_reagents.dm

* Update medicine_reagents.dm
* Added a round ID counter thingie to the notes

(Hopefully)

* Added a comma
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.