Branch: master
-
Integrated toolset description now matches bionic abilities (#31228)
* Description changed to reflect incomplete set of tools * Drill now states "hand drill" to clarify quality
-
-
Some activities not allowed when dark now, sorry. (#31206)
* its too dark * disallow (some) butchery (some) vehicle work and construction when dark * only allowed dismembering in the dark
-
-
-
weather_data: change most calls from weather_data( weather_type )
OrenAudeles committedJun 8, 2019 Most calls don't require the name, and generally access a single member. Changed these calls to just acquire the member, rather than acquiring the fully translated weather_datum. Calls requiring the name alongside additional members still use weather_data( weather_type ).
-
weather_data: add individual member accessors for weather_datum
OrenAudeles committedJun 8, 2019 -
-
-
Merge pull request #31240 from curstwist/add-roofs-to-s_garage-buildings
add roofs to garages
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request #31241 from AMurkin/astyle-fix
activity_handlers.cpp astyle fix
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
-
and update ground floors
-
-
Add new Vehicle: Limousine (#31198)
* Add Limousine definition and similar spawn as RV * Change item group used for batteries in Limousine * Change hatches for windshield+curtain in Limousine Also, adds some Door Motors to remotely control everything * Change box on recharge station to Trunk and add trunk doors to access it Someone mentioned that Limousine should have a trunk and they are right but I didn't like how it looked with another row of tiles for the trunks So I went for a creative solution that is a bit hybrid: I added the Trunk doors, but added a single trunk tile on the recharge station (which was a box before). This make it functional, it has the trunk door tiles look but doesn't compromise length. Also I think it looks much better. And the vehicle still have x2.5 more length than widith. * Lower spawn rate of Limousine on cities
-
* Canned food fixes * Fixed mushroom in veggy recipes
-
Enforce astyle on tool sources (#31233)
* Astyle tools/format/format.cpp * Enforce astyle on more files The tools sources were not covered by astyle checks. Make them be. It looks like they used to be but the Makefile was not updated at some point when the files moved. Rearrange how the Makefile works to make similar mistakes less likely to occur in the future. Also, use ':=' assignment in some Makefile variables for better efficiency.
-
Merge pull request #31236 from nexusmrsep/dissect_msg
Fix for the wrong message about suspected bionics.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request #31235 from curstwist/add-bathrooms-to-gambling-halls
added bathrooms to gambling halls
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
-
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
-
-
-
Merge pull request #31189 from CleverRaven/mutagen-chem
Require chemistry tools to craft mutagens
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request #31131 from I-am-Erk/refugee-nunez-expand
Refugee Dialogue Project: Nunez family
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request #31175 from KorGgenT/weight
unclamp stored kcal and add weight descriptions
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request #31174 from ZhilkinSerg/ui-overmap-notes-list
Modernize map notes UI
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Anesthetic cost depends on surgery duration (#31161)
* One charge of anesthetic is 1ml * operation consume 2ml of anesthetic per min of operation * menu displays volume of anesthetic required * allows to make anesthetic by 540ml increment
-
Unfinished construction activity (#31157)
changed construction to do_turn() partial construction
-
-
Correct zombie revive rate for 1st
kevingranade committedJun 8, 2019 -
Correct vitamin rates for 1s turns
kevingranade committedJun 8, 2019