cca0c2bf8b
Merge pull request #62035 from GuardianDll/magi
...
[Magiclysm] few attunements fixes
2022-11-02 01:58:28 -05:00
300ec6db71
Merge pull request #62027 from bean-b/Hiking-pants-nomad
...
Added hiking pants to nomad jumpsuit recipe
2022-11-01 00:08:57 -05:00
ed924009ef
Xedra Evolved Note improvements ( #61936 )
...
Update effects.json
Update effects.json
Update effects.json
2022-10-31 19:07:31 -04:00
3a1e22a98e
Aquatic land-based specials no longer float ( #61981 )
...
* Add lower mapgen
* Linting
* More specials
* Delete duplicate mapgen placement
* Ubuntu test fix 1
* Ubuntu appeasement 2
* Ubuntu appeasement 3
* Ubuntu appeasement 4
2022-10-31 19:05:42 -04:00
1264425026
remove unused variables (nfc) ( #61997 )
2022-10-31 19:04:04 -04:00
2b50548882
deleted raw_tainted_leather from acid soaked hide recipe ( #61998 )
2022-10-31 19:02:43 -04:00
d4ae2557c1
simple vehicle/appliance description for look around extended descriptions ( #62002 )
...
Co-authored-by: mqrause <martin@qrause.de>
2022-10-31 19:02:09 -04:00
7e90e418ba
make KitchenMaster use pseudo_water_purifier instead of water_purifier ( #62005 )
2022-10-31 18:59:08 -04:00
0bc9a60593
Farm supply store improvements ( #62003 )
...
* spawn rate adjustments
* bash nesting, more item group adjustments
* animal food and riding gear shelves
* move item groups to better location
* lint JSON
* slight chance tweak
* unlooted variant 30% -> 25%
2022-10-31 18:58:47 -04:00
bda49dda7f
Shady Hills location updates ( #62007 )
...
* Update retirement_community.json
* Update retirement_community_palette.json
* Update TALK_RET_COMM.json
* Update nursing_home.json
* Update strip_mall_nested.json
2022-10-31 18:57:40 -04:00
aa10781d29
Merge pull request #62009 from andrei8l/trader-tweak-doc
...
npctrade: merchant tweaks and documentation
2022-10-31 18:56:57 -04:00
1585de65ea
ci: labeler already capable of sub-string searches ( #62022 )
...
Co-authored-by: casswedson <casswedson@users.noreply.github.com>
2022-10-31 18:50:17 -04:00
be159c383d
enchantments now can alter skills ( #61539 )
...
* enchantments now can alter skills
* test item
* Update src/character.h
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
* nolint
* Update character.cpp
* nolint
Co-authored-by: anothersimulacrum <anothersimulacrum@gmail.com>
2022-10-31 18:47:51 -04:00
1cc029eab9
add new magiclysm snippet ( #62023 )
...
* add new magiclysm snippet
* Apply suggestions from code review
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
2022-10-31 18:47:10 -04:00
b260361a46
creature: check ALL_SEEING before potential los ( #62031 )
2022-10-31 18:46:15 -04:00
64c04e51bd
Update Shapeshifter.json
2022-10-31 21:42:38 +01:00
8619b880cd
Update Permafrost_Mage.json
2022-10-31 21:42:00 +01:00
a32d0466a1
[Magiclysm] I am the storm that is approaching ( #61982 )
...
* Added more stormshaper spells
* Edit Windstrike to be in line with his new lvl
* typo, grammar
* some description changes, another attempt to fix typo
* spelling issues
* Everywhere i go, i see his help
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
* Update data/mods/Magiclysm/Spells/animist.json
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
* Terravolt - Teravolt
* Apply suggestions from code review
* Update data/mods/Magiclysm/items/spell_scrolls.json
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
* Update data/mods/Magiclysm/items/spell_scrolls.json
* restart_the_test
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
2022-10-31 15:27:42 -04:00
2c9a96ce58
Merge pull request #62026 from CleverRaven/tileset-updates
...
Routine tileset updates on 30 October 2022
2022-10-31 00:47:31 -05:00
d48e91fce1
doc/npc: document shop restocking behaviour
2022-10-31 06:27:48 +02:00
9183becfca
npc: add is_shopkeper()
2022-10-31 06:26:27 +02:00
5ffce6b176
npctrade: better trade zone fallback
...
use nearby furniture if possible
2022-10-31 06:26:27 +02:00
c725999ddd
Added hiking pants to nomad jumpsuit recipe
2022-10-30 21:20:47 -05:00
8e7b4a9f57
[Magiclysm] Mixed stuff ( #61951 )
...
* Update fluff.json
* Replace targets of Surge to ROBOT and CYBORG
* Revert fluff
* Add info about common fields
* Small tweaks
* add info about `message`
* Update data/mods/Magiclysm/Spells/attunements/Magnetism_Mage.json
Co-authored-by: Curtis Merrill <curtis.r.merrill@gmail.com>
2022-10-30 19:53:49 -04:00
63c5555b31
Merge pull request #61917 from Knut-Aage-Hofseth/Magiclysm_item-fixes
...
Magiclysm minor weight and volume fixes
2022-10-30 19:46:45 -04:00
4fab16e915
Routine tileset updates on 30 October 2022
2022-10-30 23:13:33 +00:00
71f17634cb
all tempered weapons use medium steel ( #62012 )
...
The jian and wakizashi previously used low-carbon steel, unlike everything else.
2022-10-30 18:49:46 -03:00
fa03493c68
Added hiking pants ( #61945 )
...
* Added hiking pants
* removed __filename from json
* also removed a comma, oops
* Update data/json/itemgroups/Clothing_Gear/clothing.json
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
* Update data/json/itemgroups/Clothing_Gear/clothing.json
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
* Update data/json/itemgroups/Clothing_Gear/clothing.json
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
* Update data/json/itemgroups/Clothing_Gear/clothing.json
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
* added spaces to spawn rate, slightly changed rates
* lint
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
2022-10-30 18:48:14 -03:00
f8e17c4708
[Magiclysm] Weapons adjustments ( #61481 )
...
* Update melee.json
* Update enchanted_melee.json
* Update weapons.json
* Update weapons.json
* Update melee.json
* Update enchanted_melee.json
* Update enchanted_belts.json
* Update enchanted_belts.json
* Update enchanted_belts.json
* Update enchanted_melee.json
* Update enchanted_melee.json
* Update enchanted_melee.json
* Update enchanted_melee.json
* Update swords_and_blades.json
* Delete swords_and_blades.json
* Update enchanted_melee.json
* Create swords_and_blades.json
* Update swords_and_blades.json
* Update enchanted_melee.json
* Update enchanted_belts.json
* Update data/mods/Magiclysm/items/enchanted_belts.json
Co-authored-by: Wishbringer <wishbringer@telia.com>
Co-authored-by: Wishbringer <wishbringer@telia.com>
2022-10-30 15:00:20 -04:00
354b859ec5
[Magiclysm] Attunements... again? ( #61228 )
...
* initial commit
* Revert one test thing i forgot to delete
* through
* Thunder pillars
* yknow what, its good enough even with only one spell, and i dont know how to fix the bug
* did i say "i dont want to fix it"? I lied
* Update data/mods/Magiclysm/Spells/attunements/Stormcaller.json
* add deactivate_condition and slightly improve the EoC of sun mage effect
* Update data/mods/Magiclysm/enchantments/Sun_Mage.json
Co-authored-by: Light-Wave <66904273+Light-Wave@users.noreply.github.com>
* Update data/mods/Magiclysm/Spells/attunements/Stormcaller.json
Co-authored-by: Light-Wave <66904273+Light-Wave@users.noreply.github.com>
* Edit ice age description
* Some cleaning, added an ability for pocket sun to trigger a sun buff EoC
* saturate
* Delete a covered version from EoC trigger
* Apply suggestions from code review
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
* Update data/mods/Magiclysm/Spells/attunements/Illusionist.json
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
* saturate
* moving attacks and monsters to their files instead of lefting everything in the attunement folders
Co-authored-by: Light-Wave <66904273+Light-Wave@users.noreply.github.com>
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
2022-10-30 14:58:53 -04:00
d95dc07773
Merge pull request #61993 from Night-Pryanik/magic
...
[Magiclysm] Fixed player spawning location for Wizard's Apprentice scenario
2022-10-30 14:37:27 -04:00
3bf0181862
Updated activity suit description to be more clear ( #61959 )
...
* Updated activity suit description to be more clear
* added a space
2022-10-30 13:51:53 -03:00
aa2a276467
Standardize hairstyle names ( #62010 )
...
Change all instances of "Hairstyle:" to "Hair:" in order to fix list ordering in chargen and save on UI space.
2022-10-30 10:48:09 +01:00
944a61d9fe
Merge pull request #61978 from MNG-cataclysm/cotton_bundle_fix
...
Fix cotton sheet bundles giving patches
2022-10-30 00:25:16 -05:00
be2f42b2e3
Merge pull request #61989 from casswedson/github-please-make-perms-easy
...
revert labeler to a working state
2022-10-29 15:16:31 -04:00
743cc4474a
fixes use action on drinkable mutagen ( #61956 )
2022-10-29 13:43:56 -04:00
e3d5181173
Merge pull request #61960 from irwiss/lgtm-fixes
...
Fix some warnings on LGTM
2022-10-29 13:38:58 -04:00
0933878e88
Aftershock and Dinomod Mutagen fixes ( #61963 )
...
* Mod Mutagen fixes
* Apply suggestions from code review
Co-authored-by: Knut-Aage-Hofseth <15341115+Knut-Aage-Hofseth@users.noreply.github.com>
Co-authored-by: Knut-Aage-Hofseth <15341115+Knut-Aage-Hofseth@users.noreply.github.com>
2022-10-29 13:38:42 -04:00
a76316024d
proper stats for container inventory menu ( #61974 )
...
Co-authored-by: mqrause <martin@qrause.de>
2022-10-29 13:38:08 -04:00
9fadbf6bc6
[Backrooms] Monster group nesting fix; slightly more emptiness ( #61975 )
...
* fix monster group nesting; backrooms more empty
* zombie pack size to 2
2022-10-29 13:37:34 -04:00
c0014e48ad
holster actor can only holster items that also fit in parent containers of the holster ( #61983 )
...
Co-authored-by: mqrause <martin@qrause.de>
2022-10-29 13:34:59 -04:00
f8de70cb11
Added pocket_data to active lightstrip ( #61994 )
2022-10-29 13:34:08 -04:00
2872fa4214
[Xedra Evolved] Misc ( #61995 )
...
* Add a supercoffee spell by KymasTuran
* and everything else
* NO_HANDS for blood boil
* why did i left this comments here? they are not necessary
* typo fixing
* Thank you Ferret
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: KymasTuran <111547422+KymasTuran@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
2022-10-29 13:33:59 -04:00
33f25451f8
Revert "auto labeler maintenance ( #61904 )"
...
This reverts commit 5e36b1a47e
2022-10-29 12:19:27 -05:00
aa9d54e308
Updated docs
2022-10-29 14:37:53 +04:00
1fbf8c8003
Added start point zone
2022-10-29 14:37:44 +04:00
7082ac9ff4
Merge pull request #61990 from CleverRaven/i18n
...
Routine i18n updates on 29 October 2022
2022-10-29 01:58:16 -05:00
06272b2dca
Routine i18n updates on 29 October 2022
2022-10-29 02:34:29 +00:00
deff4fc790
ignore liquids in tiles with LIQUIDCONT flag when picking up ( #61958 )
...
Co-authored-by: mqrause <martin@qrause.de>
2022-10-28 20:05:13 -04:00
06ab291b8c
[Magiclysm] Various fixes ( #61815 )
...
* Various magiclysm stuff fixes
* Revert some test stuff i forgot to delete
* Change the item volumes to sane levels
2022-10-28 19:56:34 -04:00
Angela Graves
Maleclypse
MNG-cataclysm
RipleyTom
ZigVert
mqrause
Victor Gomes
onura46
pshepjr
David Seguin
casswedson
Curtis Merrill
andrei
Anton Simakov
andrei
bean-b
casswedson
Sutremaine
bean-b
Dan1ss1mo
Ryan Aldrich
Knut-Aage-Hofseth
Anton Burmistrov
Brett Dong (BOT)