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

Mansion Scenario #51975

Closed
wants to merge 372 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
372 commits
Select commit Hold shift + click to select a range
08256f0
Allow mixing of liquids with different freshness levels (#52077)
ferociousdork Oct 4, 2021
bd20267
Update data/json/items/armor/suits_protection.json
Drew4484 Oct 4, 2021
d40f368
Update data/json/items/armor/suits_protection.json
Drew4484 Oct 4, 2021
7d9eec3
Merge pull request #52078 from Hymore246/remove-tec-counter
Rivet-the-Zombie Oct 4, 2021
3527105
Merge pull request #52086 from Fris0uman/sprite_time
ZhilkinSerg Oct 4, 2021
b0ff3a5
Merge pull request #52075 from NetSysFire/patch-9
ZhilkinSerg Oct 4, 2021
78fecd8
Merge pull request #52058 from Fris0uman/hide_yo_hair_2
ZhilkinSerg Oct 4, 2021
0503602
Add option to toggle display of piece of armor on player sprite (#52054)
Fris0uman Oct 4, 2021
4bd80ae
Merge pull request #52032 from mythosmod/SheetFix
ZhilkinSerg Oct 4, 2021
beccae5
Merge pull request #51053 from MalteT/fix/rendering-on-wayland
ZhilkinSerg Oct 4, 2021
cd0be9d
Upgraded prisoner transport bus (#51891)
faefux Oct 4, 2021
566e562
Compact Vehicle Parts (#51225)
RatElemental Oct 4, 2021
17a7ee3
Scrollable (#51909)
Ramza13 Oct 4, 2021
a24cb49
Add more bolt-turning tools (#51936)
wapcaplet Oct 4, 2021
dc30d53
Use bipod when shooting from prone (#51472)
ildifa Oct 4, 2021
8dac601
Merge pull request #51947 from ferociousdork/fix_effect_iterator_inva…
ZhilkinSerg Oct 4, 2021
ceea045
Merge pull request #52002 from jim-huynh/crafting_with_none_fix
ZhilkinSerg Oct 4, 2021
b5d92bc
Merge pull request #51981 from dseguin/cards_for_all
ZhilkinSerg Oct 4, 2021
0a447f9
Merge pull request #52030 from Ramza13/eoc_fixes
ZhilkinSerg Oct 4, 2021
cbd8876
Merge pull request #52085 from Ramza13/portal_snippets
ZhilkinSerg Oct 4, 2021
4365cca
Fix some debug / error messages
jbytheway Oct 4, 2021
776ab04
Fix global eoc reactivation and loading. (#52083)
Ramza13 Oct 4, 2021
3fe0ed6
Base camp expansion storehouse wood (1/8) (#52091)
PatrikLundell Oct 4, 2021
d9d6448
52080 fix flashlight and eink tablet don't brake underwater (#52092)
leemuar Oct 4, 2021
9577d14
Support alternative joins in mutable specials
jbytheway Oct 5, 2021
abc56ee
Use alternative joins in mutable microlab
jbytheway Oct 5, 2021
be4b381
Update data/json/items/armor/suits_protection.json
Drew4484 Oct 5, 2021
bd11358
Document alternative joins
jbytheway Oct 5, 2021
f6422ec
Defer screenshot until debug menu is closed
dseguin Oct 5, 2021
72a291a
Reset weariness from debug needs
dseguin Oct 5, 2021
2f54703
Update lab_floorplans.json (#52096)
mythosmod Oct 5, 2021
594fd67
Merge pull request #52048 from KonH/remove_DURABLE_MELEE_on_cudgel
Rivet-the-Zombie Oct 5, 2021
ba748dd
Remove unused field
jbytheway Oct 5, 2021
2412562
clang-tidy
dseguin Oct 5, 2021
63d6375
Weakpoint (Part 8): A framework for weak point proficiencies (#52081)
Joshua-Chin Oct 5, 2021
41c96f0
Add parsing for damage required flag (#52124)
Joshua-Chin Oct 5, 2021
f22da47
Updated to_hit (#52076)
TealcOneill Oct 6, 2021
b8420df
Read additional coverage values from json
dseguin Oct 3, 2021
4c62bd5
Display extra coverage in-game
dseguin Oct 3, 2021
eb6ff58
Fix formatting of coverage info
dseguin Oct 3, 2021
587b8f6
Fix iteminfo_test.cpp for new coverage format
dseguin Oct 3, 2021
87e3b02
Mitigate crits from characters (melee and ranged)
dseguin Oct 4, 2021
30b7ca4
Merge pull request #52104 from dseguin/debug_fixes
Rivet-the-Zombie Oct 6, 2021
aee37cd
Reduce wheel wrench requirements for bicycles, tricycles, scooters, w…
wapcaplet Oct 6, 2021
208638b
Compute text changes between base commit and head commit of a pull re…
BrettDong Oct 6, 2021
01d2848
rationalize glare protection
nornagon Oct 6, 2021
2a239b9
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Drew4484 Oct 6, 2021
2f3cc34
Update weight/volume/material cost
Drew4484 Oct 6, 2021
3ad1969
Update weight/volume/material cost
Drew4484 Oct 7, 2021
eb0705c
Weakpoints (Part 9): More Documentation (#52055)
Joshua-Chin Oct 7, 2021
215b2a4
Forge Library (#52062)
Maleclypse Oct 7, 2021
e3d6d2a
Maple harvesting fixes (#52099)
ferociousdork Oct 7, 2021
9c0a675
Martial Arts Balance Update: Aikido (#52102)
Hymore246 Oct 7, 2021
1719eef
Merge pull request #52103 from jbytheway/mutable_special_alternate_joins
kevingranade Oct 7, 2021
5926bf0
iuse.cpp: remove part obsoleted by the sound code describing noises (…
NetSysFire Oct 7, 2021
8dcc245
storehouse 2 in wad with warehouse shelves (#52107)
PatrikLundell Oct 7, 2021
c18f56b
Base camp expansion storehouse 2 rammed earth (3/8) (#52108)
PatrikLundell Oct 7, 2021
05dd828
Base camp expansion storehouse 2 rock (4/8) (#52110)
PatrikLundell Oct 7, 2021
0dc886b
Base camp expansion storehouse 2 mi-go resin (5/8) (#52111)
PatrikLundell Oct 7, 2021
127a8d0
Updating toolbox size. (#52118)
emarinier Oct 7, 2021
ed47bab
Revise invalid field error: unexpected value format (#52125)
wapcaplet Oct 7, 2021
decef41
Remove extra item copies (#52132)
Maleclypse Oct 7, 2021
90e904e
Verify font can be rendered successfully at runtime (#52133)
BrettDong Oct 7, 2021
62b4b5f
Random chat quips (#52134)
dseguin Oct 7, 2021
0ad6d86
Base camp expansion storehouse 2 metal (6/8) (#52137)
PatrikLundell Oct 7, 2021
18bb8e7
Enable GitHub Actions problem matchers in MSVC build (#52138)
BrettDong Oct 7, 2021
09f6fd6
fix spell (#52139)
Saicchi Oct 7, 2021
47f0ab1
Base camp expansion storehouse 2 log (7/8) (#52140)
PatrikLundell Oct 7, 2021
3b6db1b
Base camp expansion storehouse 2 concrete (8/8) (#52141)
PatrikLundell Oct 7, 2021
afefcdc
Fix infection message (#52145)
radekrudak Oct 7, 2021
644c2ec
"Smelly" and "Weak Scent" now are conflicting mutations (#52152)
anoobindisguise Oct 7, 2021
8cdc540
Merge pull request #51471 from Night-Pryanik/balrog-mine
Rivet-the-Zombie Oct 7, 2021
0953a04
Avoid time rewind in npc test (#52156)
BrettDong Oct 7, 2021
baf0ddb
Update Lines for XL Chestrig and Normal Tacvest
Kantonine Oct 7, 2021
1fed054
Flag correction for tacvest and xl chestrig
Kantonine Oct 7, 2021
f9b75af
Update suits_protection.json
Drew4484 Oct 7, 2021
e3cc593
Move generated slimespring quotes to snippets
dseguin Oct 7, 2021
36a285d
Martial Arts Balance Update: Crane Kung Fu
Hymore246 Oct 7, 2021
fe3486b
Added a Paranormal Investigator Profession (#52041)
emarinier Oct 7, 2021
2eec511
Only print the dissect message when something is learned.
Joshua-Chin Oct 7, 2021
cb13e79
Don't use lazy evaluation in practice_dissect
Joshua-Chin Oct 7, 2021
63d0034
Fix road mapgen to check the correct neighbours
jbytheway Oct 8, 2021
10db8a6
Add test case
Joshua-Chin Oct 8, 2021
2316144
spider, troglobite samples
Maleclypse Oct 8, 2021
2c8846e
Fix for window and fence tiles in house29.json (CleverRaven#52112)
Oct 8, 2021
13e83fe
Update hints.json (#51398)
cincident Oct 8, 2021
fcc7878
Small bipod description update
ildifa Oct 5, 2021
10f9006
Merge pull request #52164 from dseguin/more_slimespring_snippets
ZhilkinSerg Oct 8, 2021
895d044
Merge pull request #52170 from bxNice/House29Fix
ZhilkinSerg Oct 8, 2021
286fce8
Merge pull request #52114 from ildifa/Update_bipod_desc
ZhilkinSerg Oct 8, 2021
1b3be1b
Merge pull request #52168 from jbytheway/fix_road_mapgen
ZhilkinSerg Oct 8, 2021
fb322de
Merge pull request #52167 from Hymore246/MABU-crane
Rivet-the-Zombie Oct 8, 2021
d233c4f
Resume shipping Terminus TTF font
BrettDong Oct 8, 2021
d043003
Merge pull request #52171 from BrettDong/font
ZhilkinSerg Oct 8, 2021
cd31f25
Performance "Seamless loading of gzipped JSON/txt files (data and map…
int-ua Oct 8, 2021
85c57b0
Rummaging mod
993499094 Oct 8, 2021
cc2375f
Human Skull (#52097)
faefux Oct 8, 2021
767dd86
base camp expansion workshop 2 in wood (1/8) (#52158)
PatrikLundell Oct 8, 2021
7e4edb2
Update data/json/items/armor/suits_protection.json
Drew4484 Oct 8, 2021
9f59a73
Update data/json/items/armor/suits_protection.json
Drew4484 Oct 8, 2021
1944d5c
Update data/json/recipes/armor/suit.json
Drew4484 Oct 8, 2021
018ab86
More notes
jbox144 Oct 9, 2021
835969b
reptile
Maleclypse Oct 9, 2021
c78de8b
Update data/json/snippets/survivor_notes.json
jbox144 Oct 9, 2021
f79ea80
Update data/json/snippets/survivor_notes.json
jbox144 Oct 9, 2021
ebe5ade
Update data/json/snippets/survivor_notes.json
jbox144 Oct 9, 2021
06c4363
Merge pull request #52179 from jbox144/patch-1
Rivet-the-Zombie Oct 9, 2021
3b1abf4
Don't try to show and construct menu
AMurkin Oct 9, 2021
bca48c8
Added looks_like and land_use_code to secret lab entrance
Night-Pryanik Oct 9, 2021
945ae33
Colorize relics in inventory in pink
Night-Pryanik Oct 9, 2021
9cb1082
Merge pull request #52169 from Joshua-Chin/weakpoints-bugfix
kevingranade Oct 9, 2021
0203a7d
Routine i18n updates on 09 October 2021 (#52180)
kevingranade Oct 9, 2021
e0282d1
Clarified messages about setting timer of c4 (#52193)
Night-Pryanik Oct 9, 2021
b2da777
Base camp expansion workshop 2 wad (2/8) (#52181)
PatrikLundell Oct 9, 2021
89b35ac
Base camp expansion workshop 2 rock (3/8) (#52183)
PatrikLundell Oct 9, 2021
57ac72f
Base camp expansion workshop rammed earth and migo resin (4-5/8) (#52…
PatrikLundell Oct 9, 2021
c1c5cd0
Add descriptions to electrical motors
wapcaplet Oct 9, 2021
a484de0
Update achievements.json
ClipClopBoom Oct 9, 2021
8c411b2
Save player view offset
RoyBerube Oct 9, 2021
edb31fd
Feline and Lupine
Maleclypse Oct 10, 2021
042b093
Update mutagens.json
Maleclypse Oct 10, 2021
9ec4b07
Add next weather dialog effect (#52194)
Ramza13 Oct 10, 2021
fbfc6a8
Apply suggestions from code review
Maleclypse Oct 10, 2021
c17298f
Merge pull request #52196 from ClipClopBoom/tailor_10_name_change
Rivet-the-Zombie Oct 10, 2021
2bd8920
Update data/json/items/armor/suits_protection.json
Drew4484 Oct 10, 2021
8ac05a0
Add support for dynamic predecessor mapgen
jbytheway Oct 9, 2021
1060d48
Merge pull request #51983 from Maleclypse/Mutagen-Recipe-ingredients
kevingranade Oct 10, 2021
a0cdf82
Allow harvestable plants to be autoforaged (#52207)
dseguin Oct 10, 2021
09fe2dd
Only run pull translations workflow in CleverRaven repository (#52219)
BrettDong Oct 10, 2021
5cdbf32
Update utility.json
ISuckM8 Oct 10, 2021
3d436ed
helipad.json: Use a barbed wire fence instead of a regular chainlink one
NetSysFire Oct 10, 2021
3fd93fd
Update BrownLikeBears 2021-10-10
Oct 10, 2021
422d86a
Update Chibi-Ultica 2021-10-10
Oct 10, 2021
eadd2c7
Update MSX 2021-10-10
Oct 10, 2021
362042b
Added bird watching profession
Inglonias Oct 10, 2021
d24e7ee
Linted the file properly
Inglonias Oct 10, 2021
4da6987
Fix exodii quadruped spell
casswedson Oct 10, 2021
c7a9672
Removed matches
Inglonias Oct 10, 2021
be1d6c7
Gave the bird watcher a messenger bag
Inglonias Oct 10, 2021
8e054d7
Base camp expansion workshop 2 metal (6/8) (#52214)
PatrikLundell Oct 11, 2021
37cde74
Base camp expansion workshop 2 log (7/8) (#52216)
PatrikLundell Oct 11, 2021
e6ae64b
Base camp expansion workshop 2 concrete (8/8) (#52217)
PatrikLundell Oct 11, 2021
d6d1c37
Merge pull request #52233 from casswedson/fix-exodii-quad-spell
ZhilkinSerg Oct 11, 2021
a592ddf
Merge pull request #52225 from Fris0uman/tile1010
ZhilkinSerg Oct 11, 2021
79ab698
Merge pull request #52224 from NetSysFire/helipad-barbedwire
ZhilkinSerg Oct 11, 2021
27a351f
Change Five-Seven to Five-seveN (#52211)
Faalagorn Oct 11, 2021
67f4100
Merge pull request #52205 from RoyBerube/camera-center
ZhilkinSerg Oct 11, 2021
59555dd
Merge pull request #52197 from AMurkin/fix-crashing-related-recipes
ZhilkinSerg Oct 11, 2021
7c90e4c
Merge pull request #52192 from Night-Pryanik/color-relics-in-pink
ZhilkinSerg Oct 11, 2021
f6e4aa0
Change P32 to P-32 and P3AT to P-3AT (#52189)
Faalagorn Oct 11, 2021
f441cd0
Merge pull request #52204 from wapcaplet/w-motor-desc
ZhilkinSerg Oct 11, 2021
59c33df
Merge pull request #52208 from jbytheway/mapgen_can_rely_on_predecessor
ZhilkinSerg Oct 11, 2021
c7fa6fb
Merge pull request #52174 from BrettDong/rummaging
ZhilkinSerg Oct 11, 2021
5598778
oversize tag added to xlnomex_socks
Chroniclerope Oct 11, 2021
a5ce89e
added "OVERSIZE" tag to xl_gloves_fur
Chroniclerope Oct 11, 2021
8256058
Merge pull request #52232 from Inglonias/birding
Rivet-the-Zombie Oct 11, 2021
e57535c
Add missing translation in aiming UI
BrettDong Oct 11, 2021
96c5b0f
Traverse all strings in MO translation document to detect memory acce…
BrettDong Oct 11, 2021
6de5bab
Fix compile errors on LLVM/Clang 13 (#52247)
BrettDong Oct 12, 2021
8137b74
Merge pull request #52243 from BrettDong/ranged-i18n
ZhilkinSerg Oct 12, 2021
e793b87
Merge pull request #52249 from CleverRaven/asan
ZhilkinSerg Oct 12, 2021
eb8a140
Add descriptions to combustion engines in vehicle screen (#52235)
wapcaplet Oct 12, 2021
48aa839
Added military flight suit and helmet to itemgroups (#49215)
faefux Oct 12, 2021
4922087
Merge pull request #52241 from Chroniclerope/patch-3
ZhilkinSerg Oct 12, 2021
982eb94
Merge pull request #52239 from Chroniclerope/patch-2
ZhilkinSerg Oct 12, 2021
e5c16c9
Mopping zone (#52228)
Saicchi Oct 12, 2021
509c380
Merge pull request #52191 from Night-Pryanik/hide-secret-lab-entrance
ZhilkinSerg Oct 12, 2021
7e4ae3e
Merge pull request #52223 from ISuckM8/survivor-belt-clip
ZhilkinSerg Oct 12, 2021
7afb487
Merge pull request #52163 from Kantonine/master
Rivet-the-Zombie Oct 12, 2021
fb79bab
Changed Military Pilot profession clothes. (#52127)
faefux Oct 12, 2021
a933dd5
fragile television
Entity-y Oct 12, 2021
a551506
Expand coverage names in '+' menu
dseguin Oct 12, 2021
76a2f8f
Few food recipe fixes and balances (#52198)
atealein Oct 13, 2021
553de93
Add fried meat (#52238)
anoobindisguise Oct 13, 2021
1d946db
Merge pull request #52146 from nornagon/glare-1
Rivet-the-Zombie Oct 13, 2021
ed863fe
add new magiclysm snippets (#52260)
KorGgenT Oct 13, 2021
95019f2
Fix items with different mods getting stacked together (#52252)
dseguin Oct 13, 2021
452a0c6
Merge pull request #52060 from dseguin/crit_protection
kevingranade Oct 14, 2021
5ff0afc
Merge pull request #52257 from Entity-y/fragile-television
Rivet-the-Zombie Oct 14, 2021
b8ea90a
Added length to bone. (#52272)
arijust Oct 14, 2021
03cf2de
Changed needed anti-glare quality to 1.
arijust Oct 14, 2021
b4c2b06
Add indefatigable and fleet footed to marathon runner (#52256)
Entity-y Oct 15, 2021
7b9c619
Make heavy duty flashlight work underwater. (#52275)
arijust Oct 15, 2021
b99f41a
Correct #52244 (#52248)
Mysteriou85 Oct 15, 2021
8e55e5a
Martial Arts Balance Update: Dragon Kung Fu (#52177)
Hymore246 Oct 15, 2021
0f004cf
Added length to chopsticks. (#52269)
arijust Oct 15, 2021
0ed1f9c
Merge pull request #52035 from Drew4484/master
Rivet-the-Zombie Oct 15, 2021
0f3412d
basecamp workshop expansion 2 added glassblower in wood only (1/1, 2 …
PatrikLundell Oct 15, 2021
422f4c3
Routine i18n updates on 16 October 2021
BrettDong Oct 16, 2021
6bfc6d5
Update tools.json
Maleclypse Oct 16, 2021
9165bc5
Add optional json field "season" to sound effects
dseguin Oct 16, 2021
bd7911a
Martial Arts Balance Update: Karate (#52305)
Hymore246 Oct 16, 2021
5e7b1b3
Merge pull request #51133 from Night-Pryanik/return-of-the-nuke
kevingranade Oct 16, 2021
a7ddd60
Merge pull request #52307 from Maleclypse/Add-parabolan-wool-to-encha…
kevingranade Oct 16, 2021
a11ff22
Merge pull request #52306 from CleverRaven/i18n
Rivet-the-Zombie Oct 16, 2021
8c4046a
Added a recipe to practice throwing. (#52297)
Inglonias Oct 16, 2021
f116852
First
Venera3 Oct 16, 2021
b870101
Track NPC storable volume when trading (#52261)
dseguin Oct 17, 2021
c9d5870
Merge pull request #52292 from arijust/antiglare_fix
Rivet-the-Zombie Oct 17, 2021
7fc9bee
Give the poor dummies eyes
Venera3 Oct 17, 2021
92fa878
Support mismatched available joins
jbytheway Oct 17, 2021
98ec008
Document trick for testing mutable specials
jbytheway Oct 17, 2021
d1de0e6
Astyle
Venera3 Oct 17, 2021
6785be7
Add in monsters and various json for portal storms. (#52326)
Ramza13 Oct 17, 2021
5c41748
Add omitted translation calls (#52289)
BrettDong Oct 17, 2021
2cfe3b2
Traders ignore e-cash
casswedson Oct 17, 2021
25c1655
Fix a typo
casswedson Oct 17, 2021
bbedf1d
Update Armor doc with new coverage fields (#52309)
dseguin Oct 17, 2021
29cb04b
Vacuum sealer manual
Maleclypse Oct 18, 2021
83a8554
Merge pull request #52337 from casswedson/danger-ahead
Rivet-the-Zombie Oct 18, 2021
4c7bbb8
Update BrownLikeBears 2021-10-18
Oct 18, 2021
dea52ff
Update MSXotto+ 2021-10-18
Oct 18, 2021
6a91c6d
Update Chibi-Ultica 2021-10-18
Oct 18, 2021
acd45c1
Add SPELL to the list of tilset ids
Oct 18, 2021
10566ab
Update MSX again
Oct 18, 2021
9480e16
Update magic academy's roof
casswedson Oct 19, 2021
ed38099
Battery acid is only in Lead Acid Batteries (#51932)
tenmillimaster Oct 19, 2021
cc04604
add "looks_like" to some weapons (#52349)
ildifa Oct 19, 2021
8e9913d
Hacksaw bar cutting (#52341)
jharg42 Oct 19, 2021
e806a25
Update robofac_robots.json (#52340)
linonetwo Oct 19, 2021
8d6c0ef
Update guns.json (#52338)
Maleclypse Oct 19, 2021
8b2d564
Add new weather type: Portal storms (#50685)
Ramza13 Oct 19, 2021
32962b5
Martial Arts Balance Update: Leopard Kung Fu (#52315)
Hymore246 Oct 19, 2021
b8102df
Retrieve base commit hash from test merge message in Text Changes Ana…
BrettDong Oct 19, 2021
0b954ab
Add more missing translations
BrettDong Oct 15, 2021
443f6ef
Merge pull request #52319 from Venera3/limb_blind
Rivet-the-Zombie Oct 19, 2021
88db81c
Merge pull request #52343 from Fris0uman/tileset
ZhilkinSerg Oct 19, 2021
378d7ea
Merge pull request #52352 from Fris0uman/table_speel
ZhilkinSerg Oct 19, 2021
3c9011b
Merge pull request #52356 from BrettDong/i18n-fix
ZhilkinSerg Oct 19, 2021
e76f202
Merge pull request #52353 from casswedson/magic-roof
ZhilkinSerg Oct 19, 2021
6ba91f5
Merge pull request #52335 from casswedson/nerf-cash-card
ZhilkinSerg Oct 19, 2021
1c8c303
Use ellipsis character consistently (#52128)
casswedson Oct 19, 2021
bca58f6
Merge pull request #52331 from jbytheway/document_mutable_special_test
ZhilkinSerg Oct 19, 2021
9fdac39
Merge pull request #52325 from jbytheway/mismatched_available_joins_bug
ZhilkinSerg Oct 19, 2021
737c767
Fix some grammar (#52346)
NetSysFire Oct 19, 2021
dc31c55
Merge pull request #52308 from dseguin/seasonal_sound
ZhilkinSerg Oct 19, 2021
4eb6051
Add new diagonal movement with mod + arrow keys option: Diagonal Lock…
dan-kest Oct 19, 2021
54ad164
Add post-damage absorption enchantments ( jsonize light and hollow bo…
Saicchi Oct 19, 2021
732faf4
Unload containers into tile key (#52201)
Saicchi Oct 19, 2021
667fe73
Add effect add/remove scheduling (#51952)
Kribylet Oct 19, 2021
2972a26
basecamp workshop 2 glassblower rest of construction materials (2/2) …
PatrikLundell Oct 19, 2021
157f88a
Merge pull request #52339 from Maleclypse/Vacuum-sealer-manual
ZhilkinSerg Oct 19, 2021
1b9b5b9
Mansion Scenario
Termineitor244 Sep 29, 2021
b91d3a0
JSON lint
Termineitor244 Sep 29, 2021
ce2fd74
Maids and Fancy Ferals
Termineitor244 Sep 30, 2021
44c5491
Mission
Termineitor244 Sep 30, 2021
3007e68
Update zombies.json
Termineitor244 Sep 30, 2021
70adb00
Update zombies.json
Termineitor244 Oct 1, 2021
6b800d9
Update data/json/monsters/feral_humans.json
Termineitor244 Oct 19, 2021
4819b14
Merge branch 'Mansion-Start' of https://github.com/Termineitor244/Cat…
Termineitor244 Oct 19, 2021
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
Update utility.json
  • Loading branch information
ISuckM8 authored Oct 10, 2021
commit 5cdbf32d7a948118b7fe5ebc103cf6a046596b69
9 changes: 8 additions & 1 deletion data/json/items/armor/bespoke_armor/utility.json
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"id": "survivor_belt_notools",
"type": "ARMOR",
"name": { "str": "survivor belt" },
"description": "A custom-built leather belt covered with pouches, with a sheath to carry a smaller blade and a holster to carry a pistol. Durable and carefully crafted to be comfortable to wear. Activate to sheathe/draw a weapon.",
"description": "A custom-built leather belt covered with pouches, with a sheath to carry a smaller blade, a holster to carry a pistol and a loop for holding larger tools. Durable and carefully crafted to be comfortable to wear. Activate to sheathe/draw a weapon.",
"weight": "1549 g",
"volume": "2250 ml",
"price": 15000,
@@ -74,6 +74,13 @@
"max_contains_weight": "2 kg",
"max_item_length": "30 cm",
"moves": 50
},
{
"max_contains_volume": "2 L",
"max_contains_weight": "6 kg",
"max_item_length": "90 cm",
"moves": 50,
"flag_restriction": [ "BELT_CLIP" ]
}
],
"use_action": { "type": "holster", "holster_prompt": "Store item", "holster_msg": "You put your %1$s in your %2$s" },