-
Notifications
You must be signed in to change notification settings - Fork 92
Minor mod with various bugfixes. #37
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
Open
8Z
wants to merge
18
commits into
Whales:master
Choose a base branch
from
8Z:master
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 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
Conflicts: game.cpp itype.h itypedef.cpp melee.cpp mtypedef.cpp npc.cpp npc.h player.cpp
Conflicts: newcharacter.cpp player.cpp
…e, some construnctions, craft recipes, locations, more typos, etc.
Conflicts: game.cpp itypedef.cpp
…ions, slighly rearranged status info (everything can be seen now), fixed skills display at @-screen, etc.
wrong item letter after crafting completion, typos
Conflicts: calendar.cpp crafting.cpp game.cpp map.cpp map.h output.cpp ranged.cpp Added no_npc and ent/esc to options, removed wristwatch item.
…lished parking lots, zombie pheromone now dissapears when all its charges are used.
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.
game::examine()
game::draw_ter() (territory display)
PF_INFRARED,bio_infraredandbio_scent_visionmap::drawsq().#sgame::look_around() ('x'-action)
game::target() (aiming)
draw_ter()refresh(w_status)Mutations
PF_HOOVESwas mentioned twice inmutation_data.cppbreak;afterMUTCAT_CATTLEinmutation_data.cpp!PF_HUNGER&PF_THIRSThaven't any effects, so I added them.PF_HUNGERwithPF_LIGHTEATER(both metabolism-related).PF_COMPOUND_EYESfits better to insect and cephalopod categories, spiders actually have eyes differ from insect's ones.PF_COMPOUND_EYES( -2 perception, -10% attack movecost, +2 dodge, leads to Myopic)PF_SPIDER_EYES_MAIN(same +1 perception, while not wearing glasses)PF_SPIDER_EYES_SECONDARY(+30% damage to head)PF_COMPOUND_EYESandPF_SPIDER_EYES_MAINcancel each other.Bionics
bio_lighter) can be used as lighter when there is no common lighter (consumes 0-3 power).bio_purifier) consumes charges every time whenplayer::resist()called and have 20% chance to suppress asthma attack.bio_heatsinkfrom blocking "smoke infection" from raging fires.Construction
able_digfunction (pits overwriting traps without that).t_pit_spikedcan be filled as regular pit now.iuse::crowbarandiuse::hammer.Crafting
construction.cpp(+indicators)Map
New items
iuse
p->use_charges(itm_lighter, 1)for meth.Misc
itypedef.cpp, from forum thread (up to this post), and other.DI_SPORES,DI_WEBBED,DI_SLIMED,DI_METH,DI_ADRENALINE)MF_ELECTRONICbecome redundant with new species parameter, so it was replaced/removed.sound()to the begging ofgame::flashbang(), so it should be heard before deafness come.t_pit_spiked.game::pickup()while onboard (to made onground items under vehicle trunk inaccessible while riding car).query_yn()to a new line.unboard_vehicle()togame::teleport()no_npcto options.string_input_popup()