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

merge main upstream to my fork to update my main branch after resizing again #7

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Some new textures, thanks to Chunnyluny! Also added a tiny paste-disp…
…enser
emipa606 committed Mar 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit c7c285483ef3e94143eb7dcb6f87fa9ffe50e4b6
3 changes: 3 additions & 0 deletions 1.2/Defs/ThingsDefs/Buildings.xml
Original file line number Diff line number Diff line change
@@ -313,6 +313,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny electrically-powered stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricStoveMini/TWB_ElectricStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
@@ -352,6 +353,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny wood-fueled stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1.2,1.0)</drawSize>
<texPath>Things/Buildings/TWB_FueledStoveMini/TWB_FueledStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
@@ -483,6 +485,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricSmelterMini/TWB_ElectricSmelterMini</texPath>
</graphicData>
<constructEffect>ConstructMetal</constructEffect>
3 changes: 3 additions & 0 deletions 1.3/Defs/ThingsDefs/Buildings.xml
Original file line number Diff line number Diff line change
@@ -315,6 +315,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny wood-fueled stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1.2,1.0)</drawSize>
<texPath>Things/Buildings/TWB_FueledStoveMini/TWB_FueledStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
@@ -357,6 +358,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny electrically-powered stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricStoveMini/TWB_ElectricStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
@@ -485,6 +487,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricSmelterMini/TWB_ElectricSmelterMini</texPath>
</graphicData>
<constructEffect>ConstructMetal</constructEffect>
66 changes: 66 additions & 0 deletions 1.4/Defs/ThingsDefs/Buildings.xml
Original file line number Diff line number Diff line change
@@ -316,6 +316,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny wood-fueled stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1.2,1.0)</drawSize>
<texPath>Things/Buildings/TWB_FueledStoveMini/TWB_FueledStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
@@ -358,6 +359,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>A tiny electrically-powered stove with an attached countertop for preparing meals.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricStoveMini/TWB_ElectricStoveMini</texPath>
<shaderType>CutoutComplex</shaderType>
</graphicData>
@@ -486,6 +488,7 @@
<thingClass>Building_WorkTable_HeatPush</thingClass>
<description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</description>
<graphicData>
<drawSize>(1,1)</drawSize>
<texPath>Things/Buildings/TWB_ElectricSmelterMini/TWB_ElectricSmelterMini</texPath>
</graphicData>
<constructEffect>ConstructMetal</constructEffect>
@@ -548,4 +551,67 @@
</statBases>
<inspectorTabs Inherit="False" />
</ThingDef>
<ThingDef ParentName="BuildingBase">
<defName>TWB_NutrientPasteDispenser</defName>
<label>tiny nutrient paste dispenser</label>
<description>A tiny machine that synthesizes edible nutrient paste from organic feedstocks placed in adjacent hoppers. It consumes less ingredients and time than any other meal production method - but nobody likes eating nutrient paste. Accepts raw food, but not rough plant matter like hay.</description>
<thingClass>Building_NutrientPasteDispenser</thingClass>
<graphicData>
<texPath>Things/Buildings/TWB_NutrientDispenserMini/TWB_NutrientDispenserMini</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<color>(232,255,191)</color>
<shaderType>CutoutComplex</shaderType>
<drawSize>(1.1,1.1)</drawSize>
</graphicData>
<altitudeLayer>Building</altitudeLayer>
<passability>Impassable</passability>
<blockWind>true</blockWind>
<fillPercent>1</fillPercent>
<uiIconScale>0.7</uiIconScale>
<statBases>
<WorkToBuild>2700</WorkToBuild>
<MaxHitPoints>75</MaxHitPoints>
<Flammability>0.5</Flammability>
</statBases>
<building>
<isMealSource>true</isMealSource>
<wantsHopperAdjacent>true</wantsHopperAdjacent>
<nutritionCostPerDispense>0.4</nutritionCostPerDispense>
<soundDispense>DispensePaste</soundDispense>
<forceShowRoomStats>true</forceShowRoomStats>
<buildingTags>
<li>Production</li>
</buildingTags>
<destroySound>BuildingDestroyed_Metal_Small</destroySound>
</building>
<comps>
<li Class="CompProperties_Power">
<compClass>CompPowerTrader</compClass>
<basePowerConsumption>75</basePowerConsumption>
</li>
<li Class="CompProperties_Flickable" />
<li Class="CompProperties_Breakdownable" />
</comps>
<size>(1,1)</size>
<costList>
<Steel>75</Steel>
<ComponentIndustrial>1</ComponentIndustrial>
</costList>
<placeWorkers>
<li>PlaceWorker_PreventInteractionSpotOverlap</li>
</placeWorkers>
<socialPropernessMatters>true</socialPropernessMatters>
<interactionCellOffset>(0,0,-1)</interactionCellOffset>
<hasInteractionCell>true</hasInteractionCell>
<terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
<designationCategory>Production</designationCategory>
<uiOrder>2130</uiOrder>
<constructEffect>ConstructMetal</constructEffect>
<canOverlapZones>false</canOverlapZones>
<constructionSkillPrerequisite>5</constructionSkillPrerequisite>
<researchPrerequisites>
<li>NutrientPaste</li>
<li>TWB_TinyWorkBenchs</li>
</researchPrerequisites>
</ThingDef>
</Defs>
6 changes: 4 additions & 2 deletions About/About.xml
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ https://steamcommunity.com/sharedfiles/filedetails/?id=1546657623

- Reworked all graphics based on the vanilla benches and multi-textures
- Added a tiny brewery
- Added a tiny simple research bench
- Added support for [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2574489704]Simple FX: Smoke[/url]
- Replaced the patch with c# logic, now all recipes will be cloned from the larger benches
- Added tiny workbenches of [url=https://steamcommunity.com/sharedfiles/filedetails/?id=1880253632]Vanilla Furniture Expanded - Production[/url] if loaded
@@ -62,10 +63,11 @@ These textures aren't up to 1.0 quality, and I'm a lazy person who made them all
[list]
[*] See if the the error persists if you just have this mod and its requirements active.
[*] If not, try adding your other mods until it happens again.
[*] Post your error-log using [url=https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib[/url] and command Ctrl+F12
[*] Post your error-log using [url=https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib[/url] or the standalone [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2873415404]Uploader[/url] and command Ctrl+F12
[*] For best support, please use the Discord-channel for error-reporting.
[*] Do not report errors by making a discussion-thread, I get no notification of that.
[*] If you have the solution for a problem, please post it to the GitHub repository.
[/list]
[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2387981423]Last updated 2023-08-07[/url]</description>

[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2387981423][img]https://img.shields.io/github/v/release/emipa606/TinyWorkbenchs?label=latest%20version&amp;style=plastic&amp;color=9f1111&amp;labelColor=black[/img][/url]</description>
</ModMetaData>
3 changes: 3 additions & 0 deletions About/Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog for TinyWorkbenchs

1.4.5 - Some new textures, thanks to Chunnyluny! Also added a tiny paste-dispenser


1.4.4 - Added a tiny research-bench


2 changes: 1 addition & 1 deletion About/Manifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>TinyWorkbenchs</identifier>
<version>1.4.4</version>
<version>1.4.5</version>
<dependencies />
<incompatibleWith />
<loadBefore />
2 changes: 1 addition & 1 deletion About/ModSync.xml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<ModSyncNinjaData>
<ID>3b55fe60-bf16-410e-b0fa-91f9da742a9d</ID>
<ModName>Tiny Workbenchs (Continued)</ModName>
<Version>1.4.4</Version>
<Version>1.4.5</Version>
<SaveBreaking>False</SaveBreaking>
<Host name="Github">
<Owner>emipa606</Owner>
102 changes: 60 additions & 42 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,71 @@
# TinyWorkbenchs

![Image](https://i.imgur.com/buuPQel.png)

Update of Alaestors mod
https://steamcommunity.com/sharedfiles/filedetails/?id=1546657623

- Reworked all graphics based on the vanilla benches and multi-textures
- Added a tiny brewery
- Added support for https://steamcommunity.com/sharedfiles/filedetails/?id=2574489704]Simple FX: Smoke
- Replaced the patch with c# logic, now all recipes will be cloned from the larger benches
- Added tiny workbenches of https://steamcommunity.com/sharedfiles/filedetails/?id=1880253632]Vanilla Furniture Expanded - Production if loaded
- Added tiny workbenches of https://steamcommunity.com/sharedfiles/filedetails/?id=2877699803]Vanilla Helixien Gas Expanded if loaded


Update of Alaestors mod
https://steamcommunity.com/sharedfiles/filedetails/?id=1546657623

- Reworked all graphics based on the vanilla benches and multi-textures
- Added a tiny brewery
- Added a tiny simple research bench
- Added support for https://steamcommunity.com/sharedfiles/filedetails/?id=2574489704]Simple FX: Smoke
- Replaced the patch with c# logic, now all recipes will be cloned from the larger benches
- Added tiny workbenches of https://steamcommunity.com/sharedfiles/filedetails/?id=1880253632]Vanilla Furniture Expanded - Production if loaded
- Added tiny workbenches of https://steamcommunity.com/sharedfiles/filedetails/?id=2877699803]Vanilla Helixien Gas Expanded if loaded

![Image](https://i.imgur.com/pufA0kM.png)




[table]
[tr]
[td]https://dsc.gg/mlie]![Image](https://i.imgur.com/zdzzBrc.png)
[/td]
[td]https://github.com/emipa606/TinyWorkbenchs]![Image](https://i.imgur.com/kTkpTOE.png)
[/td]
[/tr]
[tr]
[td]![Image](https://i.imgur.com/WjDSfUn.png)
[/td]
[td]![Image](https://i.imgur.com/Be8E2qJ.png)
[/td]
[/tr]
[/table]

![Image](https://i.imgur.com/Z4GOv8H.png)

# Notice Of Abandonment

*This mod is no longer maintained; it won't be receiving updates or fixes.*
Know of a suitable replacement? Leave a link in the comments!




----
Mod Version: 1.0.0

Adds 1x1 versions of a few workbenchs. They have a workspeed penalty (70% base speed), take longer to build, and are more fragile. But they use less space.

[u]**Load this near the bottom of your modlist!**[/u] This will reduce compatibility issues and allow Tiny Workbenchs to include recipes added to the vanilla workbenchs by other mods (in theory).



Inspired by (and ripping off) https://steamcommunity.com/sharedfiles/filedetails/?id=1331181010andsearchtext=Small+Workbenches]Voyager's "Small Workbenches" which was under an MIT license.

These textures aren't up to 1.0 quality, and I'm a lazy person who made them all single rotated textures instead of proper muli-graphics. If anyone would like to contribute their fancy art skillz to this mod, I'll credit them accordingly.

*This mod is no longer maintained; it won't be receiving updates or fixes.*
Know of a suitable replacement? Leave a link in the comments!
----
Mod Version: 1.0.0
Adds 1x1 versions of a few workbenchs. They have a workspeed penalty (70% base speed), take longer to build, and are more fragile. But they use less space.
[u]**Load this near the bottom of your modlist!**[/u] This will reduce compatibility issues and allow Tiny Workbenchs to include recipes added to the vanilla workbenchs by other mods (in theory).
Inspired by (and ripping off) https://steamcommunity.com/sharedfiles/filedetails/?id=1331181010andsearchtext=Small+Workbenches]Voyager's "Small Workbenches" which was under an MIT license.
These textures aren't up to 1.0 quality, and I'm a lazy person who made them all single rotated textures instead of proper muli-graphics. If anyone would like to contribute their fancy art skillz to this mod, I'll credit them accordingly.
![Image](https://i.imgur.com/PwoNOj4.png)



- See if the the error persists if you just have this mod and its requirements active.
- If not, try adding your other mods until it happens again.
- Post your error-log using https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib or the standalone https://steamcommunity.com/sharedfiles/filedetails/?id=2873415404]Uploader and command Ctrl+F12
- For best support, please use the Discord-channel for error-reporting.
- Do not report errors by making a discussion-thread, I get no notification of that.
- If you have the solution for a problem, please post it to the GitHub repository.


- See if the the error persists if you just have this mod and its requirements active.
- If not, try adding your other mods until it happens again.
- Post your error-log using https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib and command Ctrl+F12
- For best support, please use the Discord-channel for error-reporting.
- Do not report errors by making a discussion-thread, I get no notification of that.
- If you have the solution for a problem, please post it to the GitHub repository.


https://steamcommunity.com/sharedfiles/filedetails/changelog/2387981423]Last updated 2023-08-07
https://steamcommunity.com/sharedfiles/filedetails/changelog/2387981423]![Image](https://img.shields.io/github/v/release/emipa606/TinyWorkbenchs?label=latest%20version&style=plastic&color=9f1111&labelColor=black)

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.