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

Updates #51

Merged
merged 73 commits into from
Feb 25, 2020
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
e7631de
🍅 Add batch time to ketchup in recipe_food.json
pjf Feb 21, 2020
218eecf
Permit making candles from lard
l29ah Feb 21, 2020
c070b99
Magazine name to object
snipercup Feb 21, 2020
897818d
Ammo name to object
snipercup Feb 22, 2020
9dc476d
Bionic name to object
snipercup Feb 22, 2020
0479cf2
bionic_item name to object
snipercup Feb 22, 2020
164a32e
Update Spike and Makeshift Knife recipe to be more reasonable. (#38033)
Feb 22, 2020
a4ad844
Fix an issue preventing Luo (beggar) from being recruited.
culithir Feb 17, 2020
42d9e25
Fix remote vehicles teleporting when folding (#37974)
saurocyte Feb 22, 2020
cc186e6
add purse to bride and ballroom dancer professions
jkraybill Feb 22, 2020
244457c
Merge pull request #38216 from snipercup/Bionic-name-to-object
ZhilkinSerg Feb 22, 2020
df20fd2
Merge pull request #38205 from l29ah/candle-lard
ZhilkinSerg Feb 22, 2020
f0e6614
Merge pull request #38215 from snipercup/Ammo-name-to-object
ZhilkinSerg Feb 22, 2020
de2abc2
Merge pull request #38213 from snipercup/Magazine-name-to-object-2
ZhilkinSerg Feb 22, 2020
bd5b9fb
Merge pull request #38217 from snipercup/bionic_item-name-to-object
ZhilkinSerg Feb 22, 2020
a000b0b
Merge pull request #38198 from pjf/ketchup_bulk
ZhilkinSerg Feb 22, 2020
d9c6079
Moved more string consts into single file (#38220)
Ramza13 Feb 22, 2020
a70217c
Merge pull request #38223 from jkraybill/38207
ZhilkinSerg Feb 22, 2020
9a78ab5
Grammar/Spelling (#38006)
klorpa Feb 22, 2020
12fd768
#38201, #37504 tweaked canning ratios
jkraybill Feb 22, 2020
9df131e
linted
jkraybill Feb 22, 2020
9c05bbe
reduced calories of canned fruit
jkraybill Feb 22, 2020
cbd994a
Merge pull request #38226 from jkraybill/37504
Rivet-the-Zombie Feb 22, 2020
52a776f
Disable grenade_lethality test for sanitizer CI
jbytheway Feb 22, 2020
e0855b3
Add dark_craftable bool to construction
Feb 22, 2020
58ad188
Make spots dark craftable
Feb 22, 2020
d2634f5
Disallow bashing liquids
Feb 22, 2020
5c80905
Routine i18n updates on 22 Feb 2020 (#38230)
BrettDong Feb 22, 2020
ed471cc
Disable all starve tests on clang sanitizer test
jbytheway Feb 22, 2020
07c7ec0
Disable vehicle efficiency on the gcc asan build
jbytheway Feb 22, 2020
14a261e
Merge pull request #38239 from Fris0uman/dark_build
kevingranade Feb 22, 2020
9015618
Don't stale 0.E content frozen PRs (#38245)
anothersimulacrum Feb 22, 2020
5231875
Merge pull request #38241 from Fris0uman/liquid_bash
Rivet-the-Zombie Feb 23, 2020
4987742
Moved more string consts into single file (#38237)
Ramza13 Feb 23, 2020
4e3f9e1
fix spelling error (#38231)
curstwist Feb 23, 2020
087338b
item_groups penultimate (#38240)
LilShiningMan Feb 23, 2020
585fbbe
Make the boat hull crafting time a little more real (#38253)
l29ah Feb 23, 2020
4c48fc6
adds newspaper item groups (#38246)
cosmiccoincidence Feb 23, 2020
73d7992
fix laundromat
curstwist Feb 23, 2020
f00a2f8
Simplify shadowcasting types
jbytheway Feb 23, 2020
4c70a18
Separate caches for light and vision transparency
jbytheway Feb 23, 2020
9528517
Add a test for crouching vision
jbytheway Feb 23, 2020
95cfdc4
Increase the fishing quality of the pro fishing rod (#38257)
l29ah Feb 24, 2020
1d6cc0e
BIONIC_ITEM name to object (#38273)
snipercup Feb 24, 2020
e55bd75
Ammo name to object (#38274)
snipercup Feb 24, 2020
d850c6e
Magazine name to object (#38278)
snipercup Feb 24, 2020
abdf29a
Generic name to object (#38277)
snipercup Feb 24, 2020
92b0b2c
Bionic name to object (#38279)
snipercup Feb 24, 2020
f29c9d2
Include JSON formatter binary in release.
damien Feb 24, 2020
1c29e3d
Even more gcc warning options (#38222)
jbytheway Feb 24, 2020
a8d43e7
Merge pull request #38283 from curstwist/fix-laundromat
ZhilkinSerg Feb 24, 2020
875d138
Decreasing how many Zombie brides and priests there are. (#38291)
TimPollard Feb 24, 2020
8793567
Fix dark craftable PR (#38243)
Fris0uman Feb 24, 2020
d10f828
add random town name string (#38242)
cosmiccoincidence Feb 24, 2020
865e12c
Disable more tests for sanitizer CI (#38232)
ZhilkinSerg Feb 24, 2020
f8c79aa
Move some description function to Character (#38236)
Fris0uman Feb 24, 2020
bd3524c
Merge pull request #38280 from jbytheway/crouching_affects_lighting
Rivet-the-Zombie Feb 24, 2020
6cc80b3
Translated fertilizer name for "ran out of fertilizer" message (#38261)
jkraybill Feb 24, 2020
dc64c6e
Converting multi-cooker to another item when it is filled with a dish…
eilaattwood Feb 24, 2020
7ddabba
Merge pull request #38288 from damien/add-json-formatter-to-dist
ZhilkinSerg Feb 24, 2020
a31826a
Fix translation of vehicle owner
Aloxaf Feb 24, 2020
dbe55a1
container name to object, volume to string (#38281)
snipercup Feb 24, 2020
95e95eb
Ammo name to object 3 (#38302)
snipercup Feb 24, 2020
58d1d9f
bionic name to object (#38305)
snipercup Feb 24, 2020
66e62f9
gun name to object (#38306)
snipercup Feb 24, 2020
06b484f
Tool name to object (#38307)
snipercup Feb 24, 2020
b03e1f5
Vitamins name to object (#38308)
snipercup Feb 24, 2020
01b7e6f
Gun name to object
snipercup Feb 24, 2020
700e579
Lamp oil now has an 80% time-saving at 4 units. 🪔
pjf Feb 24, 2020
7f8d1db
Ammo name to object
snipercup Feb 24, 2020
839d8b3
Merge pull request #38310 from snipercup/Ammo-name-to-object
ZhilkinSerg Feb 24, 2020
9c7257d
Merge pull request #38309 from snipercup/Gun-name-to-object-2
ZhilkinSerg Feb 24, 2020
b54b890
Merge pull request #38301 from Aloxaf/fix_veh_owner_trans
ZhilkinSerg Feb 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BIONIC_ITEM name to object (CleverRaven#38273)
snipercup authored Feb 24, 2020
commit 1d6cc0e83fc3f8f1aa04a39ea93eff5e0b379ea9
42 changes: 21 additions & 21 deletions data/json/items/bionics.json
Original file line number Diff line number Diff line change
@@ -258,7 +258,7 @@
"id": "bio_digestion",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Expanded Digestive System CBM",
"name": { "str": "Expanded Digestive System CBM" },
"looks_like": "bio_int_enhancer",
"description": "This module contains three synthetic stomachs and industrial-grade intestines. Not only will these extract much more nutrition from food, but also increase the user's resistance to foodborne illness, and occasionally allow the digestion of rotten food.",
"price": 550000,
@@ -268,7 +268,7 @@
"id": "bio_ears",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Enhanced Hearing CBM",
"name": { "str": "Enhanced Hearing CBM" },
"looks_like": "bio_int_enhancer",
"description": "While this bionic is active, the user's hearing will be drastically improved, allowing them to hear ten times better than the average person. Additionally, high-intensity sounds will be automatically dampened before they can damage their hearing.",
"price": 500000,
@@ -279,7 +279,7 @@
"id": "bio_emp",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Directional EMP CBM",
"name": { "str": "Directional EMP CBM" },
"looks_like": "bio_int_enhancer",
"description": "Small parabolic EMP field generators that are mounted in the palm of the user's right hand. These can be used to instantly fire a wide, but short-ranged blast which will disable electronics and robots.",
"price": 720000,
@@ -289,7 +289,7 @@
"id": "bio_emp_armgun",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "EMP Projector CBM",
"name": { "str": "EMP Projector CBM" },
"looks_like": "bio_int_enhancer",
"description": "A ranged EMP generator system that is implanted in the user's right arm and hand. The system fires precise, single-target pulses that require time to aim. Extremely effective against electronic targets but mostly useless otherwise.",
"price": 220000,
@@ -299,7 +299,7 @@
"id": "bio_ethanol",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Ethanol Burner CBM",
"name": { "str": "Ethanol Burner CBM" },
"looks_like": "bio_int_enhancer",
"description": "A reactor that burns alcohol as fuel in an extremely efficient reaction. It can store up to 500ml and accepts ethanol, methanol and denatured alcohol as fuel.",
"price": 120000,
@@ -319,7 +319,7 @@
"id": "bio_eye_enhancer",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Diamond Cornea CBM",
"name": { "str": "Diamond Cornea CBM" },
"looks_like": "bio_int_enhancer",
"description": "A set of diamond corneas which greatly enhance the user's vision, granting a +2 bonus to perception.",
"price": 800000,
@@ -341,7 +341,7 @@
"id": "bio_face_mask",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Facial Distortion CBM",
"name": { "str": "Facial Distortion CBM" },
"looks_like": "bio_int_enhancer",
"description": "Through controlled application of electrochemical impulses, this bionic module lets the user alter their facial structure so as to subtly affect the reactions of others. This grants a bonus to all social interactions.",
"price": 850000,
@@ -352,7 +352,7 @@
"id": "bio_faraday",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Dielectric Capacitance System CBM",
"name": { "str": "Dielectric Capacitance System CBM" },
"looks_like": "bio_int_enhancer",
"description": "A network of miniature piezoelectric capacitors, implanted throughout the body to protect from external electrical discharge.",
"price": 5000,
@@ -363,7 +363,7 @@
"id": "bio_fingerhack",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Fingerhack CBM",
"name": { "str": "Fingerhack CBM" },
"looks_like": "bio_int_enhancer",
"description": "A miniature electrohack, surgically embedded in a finger of the right hand. This is an all-purpose hacking unit used to override control panels and the like, but not computers. Computer proficiency is important, and a failed use may cause damage.",
"price": 350000,
@@ -374,7 +374,7 @@
"id": "bio_flashbang",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Flashbang Generator CBM",
"name": { "str": "Flashbang Generator CBM" },
"looks_like": "bio_int_enhancer",
"description": "A combination of LEDs and speakers that create a flash and sound comparable to a flashbang grenade, deafening and blinding nearby enemies.",
"price": 720000,
@@ -385,7 +385,7 @@
"id": "bio_flashlight",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Cranial Flashlight CBM",
"name": { "str": "Cranial Flashlight CBM" },
"looks_like": "bio_int_enhancer",
"description": "A small, but powerful LED flashlight that is mounted between the eyes.",
"price": 20000,
@@ -492,7 +492,7 @@
"id": "bio_laser",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Finger-Mounted Laser CBM",
"name": { "str": "Finger-Mounted Laser CBM" },
"looks_like": "bio_int_enhancer",
"description": "A small, high-powered laser that is embedded in the fingertip. This long range weapon is not incredibly damaging, but is very accurate, and has the potential to start fires.",
"price": 720000,
@@ -514,7 +514,7 @@
"id": "bio_lighter",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Finger Lighter CBM",
"name": { "str": "Finger Lighter CBM" },
"looks_like": "bio_int_enhancer",
"description": "Powerful fire starters which extend from the tip of both hands' index fingers.",
"price": 130000,
@@ -525,7 +525,7 @@
"id": "bio_lockpick",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Fingerpick CBM",
"name": { "str": "Fingerpick CBM" },
"looks_like": "bio_int_enhancer",
"description": "An electronic lockpick that is embedded in a fingertip. This automatic system will quickly unlock all but the most advanced key locks without any skill required on the part of the user.",
"price": 350000,
@@ -536,7 +536,7 @@
"id": "bio_magnet",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Electromagnetic Unit CBM",
"name": { "str": "Electromagnetic Unit CBM" },
"looks_like": "bio_int_enhancer",
"description": "A powerful electromagnet that is implanted into the user's right hand, allowing them to indiscriminately pull all nearby magnetic objects towards them. Unlucky bystanders might be injured or killed by flying objects.",
"price": 200000,
@@ -558,7 +558,7 @@
"id": "bio_memory",
"copy-from": "bionic_general",
"type": "BIONIC_ITEM",
"name": "Enhanced Memory Banks CBM",
"name": { "str": "Enhanced Memory Banks CBM" },
"looks_like": "bio_int_enhancer",
"description": "A set of highly-advanced quantum storage drives used to enhance memory. While active, they increase the rate that the user learns skills, and give them near-perfect memory of skills and terrain.",
"price": 1000000,
@@ -732,7 +732,7 @@
"id": "bio_razors",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Fingertip Razors CBM",
"name": { "str": "Fingertip Razors CBM" },
"looks_like": "bio_int_enhancer",
"description": "A set of ten double-edged, four centimeter long razor-sharp claws that are implanted underneath the fingernails. These will deal a small amount of unarmed slashing damage whenever the user's fingertips are uncovered.",
"price": 450000,
@@ -808,7 +808,7 @@
"id": "bio_shock",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": "Electroshock Unit CBM",
"name": { "str": "Electroshock Unit CBM" },
"looks_like": "bio_int_enhancer",
"description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock the user's opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.",
"price": 550000,
@@ -1062,7 +1062,7 @@
"id": "bio_dis_shock",
"copy-from": "bionic_general_faulty",
"type": "BIONIC_ITEM",
"name": "Faulty Electric System",
"name": { "str": "Faulty Electric System" },
"description": "This CBM is a mess of naked wire and burnt resistors.",
"weight": "700 g",
"difficulty": 5
@@ -1071,7 +1071,7 @@
"id": "bio_drain",
"copy-from": "bionic_general_faulty",
"type": "BIONIC_ITEM",
"name": "Electrical Drain",
"name": { "str": "Electrical Drain" },
"description": "This CBM was wired incorrectly and would drain power from any system connected to it.",
"weight": "900 g",
"difficulty": 5
@@ -1150,7 +1150,7 @@
"id": "bio_sleepy",
"copy-from": "bionic_general_faulty",
"type": "BIONIC_ITEM",
"name": "Endocrine Enervator",
"name": { "str": "Endocrine Enervator" },
"description": "This malfunctioning bionic causes fatigue by altering the unfortunate user's brain chemistry.",
"weight": "100 g",
"difficulty": 11