Merge branch 'master' of https://github.com/Simple-Station/Parkstatio…

…n-Friendly-Chainsaw into upstream-sync-6

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
 

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -177,7 +177,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
@@ -284,7 +284,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

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

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

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