Frontiersman Distillery Ruin #2907
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Map Change
|
|
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
FalloutFalcon
requested changes
Apr 24, 2024
| @@ -512,7 +512,7 @@ | |||
| matching_container = 1 | |||
|
|
|||
| else | |||
| if(cached_my_atom.type == C.required_container) | |||
| if(typesof(C.required_container)) | |||
There was a problem hiding this comment.
This currently just returns a list of types but has the (unwanted?) side effect of allowing sub types. buttt since your not comparing it against your cached item it returns true if anything is in required_container. Change this to (cached_my_atom.type in C.required_container) This compares the type against the types in your list
but also required_container is not yet a list
var/obj/item/reagent_containers/required_container = null // the exact container path required for the reaction to happen
ORRRR if you want to be lazy
just do
(cached_my_atom.type in typesof(C.required_container))
this means that any subtypes of an item works (this is currently fine but strict types are probally better here
and your moonshine react goes from
required_container = list(/obj/structure/fermenting_barrel,
/obj/structure/fermenting_barrel/distiller)
to
required_container = /obj/structure/fermenting_barrel
since distiller is a subtype of barrel and typesof grabs the "main" type and any subtypes it works
There was a problem hiding this comment.
Sorry if i got something wrong when i first explained this to you
| @@ -512,7 +512,7 @@ | |||
| matching_container = 1 | |||
|
|
|||
| else | |||
| if(cached_my_atom.type == C.required_container) | |||
| if(typesof(C.required_container)) | |||
There was a problem hiding this comment.
is this how you do this?
Suggested change
| if(typesof(C.required_container)) | |
| if(cached_my_atom.type in typesof(C.required_container)) |
| results = list(/datum/reagent/consumable/ethanol/moonshine = 10) | ||
| required_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5) | ||
| required_catalysts = list(/datum/reagent/consumable/enzyme = 5) | ||
| required_container = list(/obj/structure/fermenting_barrel, |
There was a problem hiding this comment.
I dont know how to grab multiple lines here but. this is all you need
Suggested change
| required_container = list(/obj/structure/fermenting_barrel, | |
| required_container = /obj/structure/fermenting_barrel |
|
I should remove window spawners. Please don't use them in your maps =). Also update your mines to the new ones if you haven't already (the image shows the old ones( |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Co-authored-by: Theos <[email protected]> Signed-off-by: goober3 <[email protected]>
FalloutFalcon
approved these changes
Jun 26, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
rye-rice
requested changes
Jul 11, 2024
|
Bump |
Co-authored-by: Theos <[email protected]> Signed-off-by: goober3 <[email protected]>
|
hi, this PR is fixed now. sorry for the delay. could someone like and hit the merge button please. |
rye-rice
approved these changes
Jul 23, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Jul 27, 2024
## hey look it's a new ruin <details><summary>The Ruin</summary>    </details> ## and another <s>pill</s> subshuttle  ## About The Pull Request This PR adds a new ruin to rockplanets featuring a group of New Frontiersman bootleggers based out of a pre-ICW era Nanotrasen research facility. A new type of bottle crate for moonshine bottles has been added, as well as a new subtype of Frontiersmen, without need for air. Moonshine now requires a fermenting barrel or distillery to be produced. Thank you to @FalloutFalcon for providing the code that makes this work, as well as refactoring bottle crates to make them work with variables. <details><summary>Threats</summary> ``` - Melee Frontiersman (x3) - Revolver Frontiersman (x4) - Rifle Frontiersman Trooper (x4) - Rifle Frontiersman - Frontiersman Officer - Mi-go (Dog) - Explosive Mines (x5) ``` </details> <details><summary>Major Loot</summary> ``` - Moonshine Jugs (x31) - Moonshine Keg - Moonshine Vat - Regular Medkit - Bicaridine Bottles (x2) - Common Machine Boards (x2) - Common Computer Board - Drink Dispenser - Booze Dispenser - SRM Distiller - Autolathe - Uranium PACMAN Generator - ~4000 credits - Hydroponics Trays (x2) - .357 Revolver (x2) - HP Shadow - .45 Speedloader - .357 Speedloader (x2) - Commander - Stetchkin Pistol - Empty Commander Magazine (x2) - AP 9mm Ammo Box - Stetchkin Magazine (x2) - Mosin Rifle (x3) - Mosin Clip (x2) - Armor Vest (x3) - SWAT helmet (x2) ``` </details> ## Changelog 🆑 goober3, FalloutFalcon add: A new Frontiersman-themed rockplanet ruin. add: Frontiersmen now have subtypes with oxygen masks. tweak: Moonshine can now only be brewed via fermenting barrels & distillers. code: Drinks recipes can now have multiple required containers. /🆑 --------- Signed-off-by: goober3 <[email protected]> Co-authored-by: Theos <[email protected]>
FalloutFalcon
pushed a commit
to FalloutFalcon/ShiptestF
that referenced
this pull request
Aug 30, 2024
## hey look it's a new ruin <details><summary>The Ruin</summary>    </details> ## and another <s>pill</s> subshuttle  ## About The Pull Request This PR adds a new ruin to rockplanets featuring a group of New Frontiersman bootleggers based out of a pre-ICW era Nanotrasen research facility. A new type of bottle crate for moonshine bottles has been added, as well as a new subtype of Frontiersmen, without need for air. Moonshine now requires a fermenting barrel or distillery to be produced. Thank you to @FalloutFalcon for providing the code that makes this work, as well as refactoring bottle crates to make them work with variables. <details><summary>Threats</summary> ``` - Melee Frontiersman (x3) - Revolver Frontiersman (x4) - Rifle Frontiersman Trooper (x4) - Rifle Frontiersman - Frontiersman Officer - Mi-go (Dog) - Explosive Mines (x5) ``` </details> <details><summary>Major Loot</summary> ``` - Moonshine Jugs (x31) - Moonshine Keg - Moonshine Vat - Regular Medkit - Bicaridine Bottles (x2) - Common Machine Boards (x2) - Common Computer Board - Drink Dispenser - Booze Dispenser - SRM Distiller - Autolathe - Uranium PACMAN Generator - ~4000 credits - Hydroponics Trays (x2) - .357 Revolver (x2) - HP Shadow - .45 Speedloader - .357 Speedloader (x2) - Commander - Stetchkin Pistol - Empty Commander Magazine (x2) - AP 9mm Ammo Box - Stetchkin Magazine (x2) - Mosin Rifle (x3) - Mosin Clip (x2) - Armor Vest (x3) - SWAT helmet (x2) ``` </details> ## Changelog 🆑 goober3, FalloutFalcon add: A new Frontiersman-themed rockplanet ruin. add: Frontiersmen now have subtypes with oxygen masks. tweak: Moonshine can now only be brewed via fermenting barrels & distillers. code: Drinks recipes can now have multiple required containers. /🆑 --------- Signed-off-by: goober3 <[email protected]> Co-authored-by: Theos <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
hey look it's a new ruin
The Ruin
and another
pillsubshuttleAbout The Pull Request
This PR adds a new ruin to rockplanets featuring a group of New Frontiersman bootleggers based out of a pre-ICW era Nanotrasen research facility.
A new type of bottle crate for moonshine bottles has been added, as well as a new subtype of Frontiersmen, without need for air.
Moonshine now requires a fermenting barrel or distillery to be produced. Thank you to @FalloutFalcon for providing the code that makes this work, as well as refactoring bottle crates to make them work with variables.
Threats
Major Loot
Changelog
🆑 goober3, FalloutFalcon
add: A new Frontiersman-themed rockplanet ruin.
add: Frontiersmen now have subtypes with oxygen masks.
tweak: Moonshine can now only be brewed via fermenting barrels & distillers.
code: Drinks recipes can now have multiple required containers.
/🆑