From e12a472bb7838c44a3904c1463288e20332fbca4 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sun, 2 Jun 2024 17:01:48 -0700 Subject: [PATCH 1/2] fix script names in README building section --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7387e8c096..ac3fdbd329 100644 --- a/README.md +++ b/README.md @@ -50,19 +50,17 @@ We provide some scripts shown below to make the job easier. > 1. Clone this repository > 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal -> 3. Run the `Scripts/bat/run1buildDebug.bat` -> 4. Run the `Scripts/bat/run2configDev.bat` if you need other configurations run other config scripts -> 5. Run both the `Scripts/bat/run3server.bat` and `Scripts/bat/run4client.bat` -> 6. Connect to localhost and play +> 3. Run the `Scripts/bat/buildAllDebug.bat` +> 4. Run both the `Scripts/bat/runQuickServer.bat` and `Scripts/bat/runQuickClient.bat` +> 5. Connect to localhost and play ### Linux > 1. Clone this repository > 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal -> 3. Run the `Scripts/sh/run1buildDebug.sh` -> 4. Run the `Scripts/sh/run2configDev.sh` if you need other configurations run other config scripts -> 5. Run both the `Scripts/sh/run3server.bat` and `scripts/sh/run4client.sh` -> 6. Connect to localhost and play +> 3. Run the `Scripts/sh/buildAllDebug.sh` +> 4. Run both the `Scripts/sh/runQuickServer.bat` and `Scripts/sh/runQuickClient.sh` +> 5. Connect to localhost and play ### MacOS From bc40b68f590876287aa480783b070dde9823c6d0 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sun, 2 Jun 2024 17:05:18 -0700 Subject: [PATCH 2/2] correct our yml codebase comments --- Resources/Prototypes/Entities/Objects/Materials/materials.yml | 4 ++-- .../Nyanotrasen/Entities/Objects/Materials/materials.yml | 2 +- Resources/Prototypes/Nyanotrasen/Species/Oni.yml | 2 +- Resources/Prototypes/Recipes/Reactions/food.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 1e5815d5be..d30702e3d7 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -176,7 +176,7 @@ layers: - state: durathread_3 map: ["base"] - scale: 1, 1 # Parkstation-SmallerMaterials - Durathread looks fine normally + scale: 1, 1 # Parkstation-SmallerMaterials # Durathread looks fine normally - type: Appearance - type: Construction graph: Durathread @@ -283,7 +283,7 @@ sprite: /Textures/Objects/Misc/monkeycube.rsi state: cube color: "#8A9A5B" - scale: 1, 1 # Parkstation-SmallerMaterials - Biomass looks fine normally + scale: 1, 1 # Parkstation-SmallerMaterials # Biomass looks fine normally - type: GuideHelp guides: - Cloning diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml index 7b9ebdcb14..77fb560723 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml @@ -9,7 +9,7 @@ layers: - state: bluespace_3 map: ["base"] - scale: 1, 1 # Parkstation-SmallerMaterials - Bluespace looks fine normally + scale: 1, 1 # Parkstation-SmallerMaterials # Bluespace looks fine normally - type: Appearance - type: Material - type: PhysicalComposition diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index 1d711d8c95..ca78131816 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -1,7 +1,7 @@ - type: species id: Oni name: species-name-oni - roundStart: false # Parkstation - Maybe + roundStart: false # Parkstation # Maybe prototype: MobOni dollPrototype: MobOniDummy markingLimits: MobOniMarkingLimits diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 364370cc9e..c02943fb54 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -169,7 +169,7 @@ - !type:CreateEntityReactionEffect entity: FoodMeatMeatball -# Parkstation-ChocolateMilk - That's not how you make a chocolate bar.. +# Parkstation-ChocolateMilk # That's not how you make a chocolate bar.. # - type: reaction # id: CreateChocolate # impact: Low