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

Small tweaks #68393

Merged
merged 11 commits into from
Oct 2, 2023
Merged

Small tweaks #68393

merged 11 commits into from
Oct 2, 2023

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Sep 29, 2023

Summary

None

Purpose of change

Few stuff that occured on discord and that i find pretty easy to fix

Describe the solution

lorica segmentata is in armor category now
radiation badge mention it doesn't turn back to neutral state
calf zombifies into small cocoon
small update of t_bulk_tank and 55gal_drum because i spend my time calculating it's dimensions
fix #68388

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Armor / Clothing Armor and clothing astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 29, 2023
@github-actions github-actions bot added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 30, 2023
@github-actions github-actions bot added the Vehicles Vehicles, parts, mechanics & interactions label Oct 2, 2023
@github-actions github-actions bot added Code: Tests Measurement, self-control, statistics, balancing. <Bugfix> This is a fix for a bug (or closes open issue) labels Oct 2, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 2, 2023
@Maleclypse Maleclypse merged commit e3edded into CleverRaven:master Oct 2, 2023
@GuardianDll GuardianDll deleted the random branch October 2, 2023 15:35
detahramet pushed a commit to detahramet/Cataclysm-DDA that referenced this pull request Nov 6, 2023
* lorica segmentata is armor

* tweak rad badge description

* Update data/json/items/armor/jewelry.json

Co-authored-by: Karol1223 <[email protected]>

* calf zombifies into small cocoon

* make t_bulk_tank work like tank, update disassembly recipe for 55gal_drum

* no keg_capacity because it's terrain

* fix vehicle heaters prevent full deconstruction

* fixing vehicle tests because additional vehicle weigh

* and again

* alcohol wipes are countable

---------

Co-authored-by: Karol1223 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Code: Tests Measurement, self-control, statistics, balancing. Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Vehicle heaters prevent full deconstruction
3 participants