review changes

MARKERS.md

@@ -3,7 +3,7 @@
 Whenever you change a file not owned by this codebase you need to clarify which portions have been changed.
 If the markers described below don't have a description for the file type you're working with, don't add a marker yet and ask a reviewer if you need one and how it should be done.
 
-The following is the formatting for annotations per language type:
+The following is the annotation formatting per language:
 
 
 ### C#
@@ -12,15 +12,15 @@ Single line changes:
 
 ```csharp
 <Rest of the unchanged file above...>
-[Your code here. This can be entirely original or modified from the original file] // Parkstation-[TitleOfFeature] - Optional clarification of why this change was done
+[Your code here. This can be entirely original or modified from the original file] // Parkstation-[TitleOfFeature] // Optional clarification of why this change was done
 <Rest of the unchanged file below...>
 ```
 
 Multiple line changes:
 
 ```csharp
 <Rest of the unchanged file above...>
-// Parkstation-[TitleOfFeature]-Start - Optional clarification of why this change was done
+// Parkstation-[TitleOfFeature]-Start // Optional clarification of why this change was done
 [Your code here. This can be entirely original or modified from the original file]
 // Parkstation-[TitleOfFeature]-End
 <Rest of the unchanged file below...>
@@ -33,7 +33,7 @@ Any amount of lines changed:
 
 ```xaml
 <Rest of the unchanged file above...>
-<!-- Parkstation-[TitleOfFeature]-Start - Optional clarification of why this change was done -->
+<!-- Parkstation-[TitleOfFeature]-Start -- Optional clarification of why this change was done -->
 [Your code here. This can be entirely original, or modified from the original file]
 <!-- Parkstation-[TitleOfFeature]-End -->
 <Rest of the unchanged file below...>
@@ -47,15 +47,15 @@ Single line changes:
 
 ```yml
 <Rest of the unchanged file above...>
-[Your code here. This can be entirely original, or modified from the original file] # Parkstation-[TitleOfFeature] - Optional clarification of why this change was done
+[Your code here. This can be entirely original, or modified from the original file] # Parkstation-[TitleOfFeature] E Optional clarification of why this change was done
 <Rest of the unchanged file below...>
 ```
 
 Multiple line changes:
 
 ```yml
 <Rest of the unchanged file above...>
-# Parkstation-[TitleOfFeature]-Start - Optional clarification of why this change was done
+# Parkstation-[TitleOfFeature]-Start E Optional clarification of why this change was done
 [Your code here. This can be entirely original, or modified from the original file]
 # Parkstation-[TitleOfFeature]-End
 <Rest of the unchanged file below...>

README.md

@@ -15,11 +15,19 @@
 
 ## Contributing
 
-We are happy to accept contributions from anybody. Get in Discord if you want to help. We've got a [list of issues](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/issues) that need to be done and anybody can pick them up. Don't be afraid to ask for help in Discord either!
+We are happy to accept contributions from anybody.
+Get in Discord if you want to help.
+We've got a [list of issues](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/issues) that need to be done and anybody can pick them up.
+Don't be afraid to ask for help in Discord either!
 
-We are currently accepting translations of the game on our main repository. If you would like to translate the game into another language check the #contribution-help channel in our Discord.
+Before making a PR here, consider if the feature is specific to us, or if it would generally improve the codebase.
+Broader changes should be made on our upstream, [Einstein Engines](https://github.com/Simple-Station/Einstein-Engines), where many of the same maintainers manage the code.
+If you're familiar with someone here, feel free to request a review from them in particular over there.
 
-If you make any contributions, please make sure to read the markers section in [MARKERS](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/MARKERS.md)
+[Einstein Engines](https://github.com/Simple-Station/Einstein-Engines) is also accepting translations.
+If you would like to translate the game into another language check the #contributor-general channel in their Discord.
+
+If you make any contributions, please make sure to read the markers section in [MARKERS](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/MARKERS.md).
 Any changes made to files belonging to our upstream should be properly marked in accordance to what is specified there.
 
 
@@ -28,12 +36,14 @@ Any changes made to files belonging to our upstream should be properly marked in
 Refer to [the Space Wizards' guide](https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html) on setting up a development environment for general information, but keep in mind that Parkstation is not the same and many things may not apply.
 We provide some scripts shown below to make the job easier.
 
-### Build dependencies
+### Build Dependencies
 
-> - Git
 > - DOTNET SDK 8.0 or higher
-> - python 3.7 or higher
 
+### Recommended Tools
+
+> - Git (needed)
+> - Python 3.7 or higher
 
 ### Windows
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml

@@ -8,6 +8,6 @@
     EpinephrineChemistryBottle: 3
     Syringe: 5
     Portafib: 1 # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml
-    ClothingEyesGlasses: 5 # Parkstation NearsightedTrait
+    ClothingEyesGlasses: 5 # SimpleStation14 NearsightedTrait
     ClothingEyesHudMedical: 2
     ClothingEyesEyepatchHudMedical: 2

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -82,7 +82,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
-    - GlassesNearsight # Parkstation NearsightedTrait
+    - GlassesNearsight # SimpleStation14 NearsightedTrait
 
 - type: entity
   parent: ClothingEyesBase