Merge pull request #168 from HasangerGames/dev

Dev

README.md

@@ -42,6 +42,8 @@ pnpm install
 To start a local development server, run:
 
 ```shell
+git checkout dev 
+# This switches to the `dev` branch of the wiki with all the new changes
 pnpm dev
 ```
 
@@ -70,4 +72,4 @@ git submodule init
 git submodule update
 pnpm install
 pnpm dev
-```
+```

app/(wiki)/(prose)/meta/writingarticles/page.mdx

@@ -3,6 +3,7 @@ import TimeLink from "@/components/links/TimeLink";
 import Removed from "@/components/articles/notices/Removed";
 import CommitLink from "@/components/links/CommitLink";
 import DevWeapon from "@/components/articles/notices/DevWeapon";
+import Mode from "@/components/articles/notices/Mode.tsx";
 import Gallery from "@/components/articles/gallery/Gallery.tsx";
 import SuroiItemImage from "@/components/articles/SuroiItemImage.tsx";
 
@@ -40,10 +41,16 @@ There are a couple [MDX](https://mdxjs.com/docs/what-is-mdx/) / [JSX](https://le
 ### `<Event />`
 
 Shows a small banner at the top of the page like the one on the [USAS-12 Article](/weapons/guns/usas12) notifying readers
-that this item is only available in a specific event. See below:
+that this it is only found in a specific event. See below:
 
 <Event />
 
+### `<Mode />`
+
+Shows a small banner at the top of the article that is only found in a specific mode. See below:
+
+<Mode />
+
 ### `<CommitLink sha="Git SHA Hash" />`
 
 Shows a link to a commit on the GitHub repo. Useful for linking to the commit that introduced a feature.

app/(wiki)/buildings/articles/house.md → app/(wiki)/(prose)/removed_content/house/page.mdx

@@ -1,4 +1,5 @@
-<Removed />
+# House
+
 The **House** was a building added in the [v0.9.0](https://github.com/HasangerGames/suroi/releases/tag/v0.9.0) "Behind Closed Doors" update on July 30th, 2023. It was later removed from spawning on the map in the v0.11.0 "Making Waves" update on October 22nd, 2023 and completely removed in the v0.17.0 "Just the Two of Us" update on April 1st, 2024. It had a decent amount of loot for early games.
 
 # Areas
@@ -35,6 +36,7 @@ The Garage contains a Bookshelf, [Regular Crate](/obstacles/regular_crate), [Bar
 # Trivia
 
 - The Garage has an oil stain on the floor, possibly suggesting a car or other vehicle had been there before.
+- The House was removed because the developers decided that the layout of it made it hard to navigate and was generally a badly designed structure in terms of gameplay. It was replaced with the Green House in [v0.17.0](https://github.com/HasangerGames/suroi/releases/tag/v0.17.0).
 
 # History
 

app/(wiki)/(prose)/removed_content/page.mdx

@@ -4,4 +4,7 @@ This special page contains a list of all content no longer existing in the curre
 
 ## Weapons
 - [940 Pro](/removed_content/940_pro)
-- [Barrett M95](/removed_content/barrett_m95)
+- [Barrett M95](/removed_content/barrett_m95)
+
+## Buildings
+- [House](/removed_content/house)

app/(wiki)/buildings/[item]/page.tsx

@@ -28,7 +28,6 @@ export const BuildingMetaArticles = [
       "port_warehouse_blue"
     ],
     fileName: "port_meta" // For some reason using `port` crashes my browser
-    // 109 says: LLLLLLLLLLLLLLLL
   },
   {
     title: "Armory",
@@ -37,7 +36,8 @@ export const BuildingMetaArticles = [
       "armory_center",
       "armory_vault",
       "armory_inner_vault",
-      "armory"
+      "armory",
+      "bombed_armory"
     ],
     fileName: "armory_meta" // Same as port
   },

app/(wiki)/buildings/articles/barn.md

@@ -1,3 +1,5 @@
+<Mode />
+
 The **Barn** is a medium-sized building added in the [v0.20.0](https://github.com/HasangerGames/suroi/releases/tag/v0.20.0) "Open Season" update on October 27th, 2024. It contains a good amount of loot, but is a dangerous structure due to the lack of solid cover.
 
 # Location & Spawning

app/(wiki)/buildings/articles/blue_house.md

@@ -1,5 +1,3 @@
-# Blue House
-
 The Blue House is a variant of the classic [Red House](/buildings/red_house) and is the newest house to be added in the game, being added in the [v0.19.0](https://github.com/HasangerGames/suroi/releases/tag/v0.19.0) "High Caliber Negotiations" update on September 22nd, 2024.
 # Location & Spawning
 

app/(wiki)/buildings/articles/cargo_ship.md

@@ -35,7 +35,7 @@ The Vault, located in the bow of the Cargo Ship, is the most valuable area of th
 # Trivia
 
 - Despite clearly having stairs into the Control Room, the stairs don't lead to another layer.
-  - The Control Room is treated as an indoor area on the map, similar to [Small Houses](/buildings/small_house).
+  - The Control Room is treated as an indoor area on the map, similar to buildings such as the [Red House](/buildings/red_houses).
 
 # History
 - [v0.15.0](https://github.com/HasangerGames/suroi/releases/tag/v0.15.0)

app/(wiki)/buildings/articles/construction_site.md

@@ -1,5 +1,5 @@
 
-The **Construction Site** is a building added in [v0.19.0](https://github.com/HasangerGames/suroi/releases/tag/v0.19.0) "Back in the Saddle" update alongside the Birthday Event. The site is a relatively small structure with moderately good loot.
+The **Construction Site** is a building added in [v0.18.0](https://github.com/HasangerGames/suroi/releases/tag/v0.18.0) "Back in the Saddle" update alongside the Birthday Event. The site is a relatively small structure with moderately good loot.
 
 # Location and Spawning
 

app/(wiki)/buildings/articles/containers.md

@@ -2,7 +2,7 @@ The **Container** is a building added in the [v0.11.0](https://github.com/Hasang
 
 # Location & Spawning
 
-Up to twelve Containers spawn in random positions on the map. Many Containers can also spawn as part of the [Port](/buildings/port) structure.
+Up to twelve Containers spawn in random positions on the map. Many Containers can also spawn as part of the [Port](/buildings/port) structure. Containers can be blue, green, yellow, red, or silver. Silver and red containers can only be found at the Port and don't have an entrance, which means you can't enter them.
 
 # Loot & More
 
@@ -17,7 +17,7 @@ Containers always contain one ground loot item on its floor.
 - If you see a player inside a Container with one exit, you can fire bullets into the Container with a high-DPS weapon. Your opponent won't be able to see you because they have their scopes disabled when inside a Container.
   - This usually kills your opponent because the interior of a Container also reflects bullets, making them harder to dodge.
   - However, don't get too close, as your opponent could rush you.
-    - You can also be hit by your own bullets.
+  - You can also be hit by your own bullets if you aren't careful.
 
 # History
 

app/(wiki)/buildings/articles/green_house.md

@@ -1,5 +1,3 @@
-# Green House
-
 The Green House is a building added in the [v0.17.0](https://github.com/HasangerGames/suroi/releases/tag/v0.17.0) "Just the Two of Us" update on March 31st, 2024. It drops decent loot, especially with the recent buff of the [HP-18](/weapons/guns/hp18).
 # Location & Spawning
 

app/(wiki)/buildings/articles/hay_sheds.md

@@ -1,3 +1,5 @@
+<Mode />
+
 The **Hay Shed** is a small building added in the [v0.20.0](https://github.com/HasangerGames/suroi/releases/tag/v0.20.0) “Open Season” update on October 27, 2024. It only spawns on the Harvest and Halloween maps.
 
 # Location & Spawning

app/(wiki)/buildings/articles/headquarters.md

@@ -43,6 +43,7 @@ In the black space between the Lounge and the Executive Office, there is a hidde
 [View Loot Chances](/loot/tier_aegis_golden_crate)
 
 # Tips
+- Papas24, the developer who added the Headquarters into the game, didn't know about the object placer tool for buildings and calculated the positions of all of the obstacles, hitboxes, and stair colliders from scratch.
 - As the game's currently largest single building in normal mode, the Headquarters usually had a lot of players converging on it.
 - The Headquarters includes a lot of areas suitable for CQC weapons like SMGs and shotguns.
  - LMGs can be useful in certain areas such as the cubicles for destroying cover.

app/(wiki)/buildings/articles/lodge.md

@@ -1,4 +1,5 @@
-<Event />
+<Mode />
+
 The **Lodge** was a building added in the [v0.20.0](https://github.com/HasangerGames/suroi/releases/tag/v0.20.0) "Open Season" update on October 28th, 2024. The lodge spawns once per map and only on the Harvest and Halloween maps. It contains a Gun Mount containing the [M590M](/weapons/guns/m590m), a rare and powerful shotgun that fires FRAG-12 rounds.
 
 # Areas

app/(wiki)/buildings/articles/outhouse.md

@@ -1,3 +1,5 @@
+<Mode />
+
 The **Outhouse** is a small building added alongside the Harvest Map in the [v0.20.0](https://github.com/HasangerGames/suroi/releases/tag/v0.20.0) "Open Season" update on October 27th, 2024. 
 
 # Location & Spawning

app/(wiki)/buildings/articles/plumpkin_bunker_meta.md

@@ -1,3 +1,5 @@
+<Mode />
+
 The **Plumpkin Bunker** is a large bunker added alongside the Harvest Map in the [v0.20.0](https://github.com/HasangerGames/suroi/releases/tag/v0.20.0) "Open Season" update on October 27th, 2024. It has a multitude of different rooms, two puzzles, and is the only place where the [Plumpkin](/obstacles/plumpkin) can be found.
 
 # Location & Spawning

app/(wiki)/buildings/articles/port_meta.md

@@ -2,43 +2,81 @@ The **Port** is a very large structure added in the [v0.11.0](https://github.com
 
 # Location & Spawning
 
-One Port attempts to spawn per map, always at the edge of the map. - Very rarely, a Port can fail to spawn on a map.
+One Port attempts to spawn per map, always at the edge of the map. However, a Port can fail to spawn on a map in very rare circumstances.
 
 # Areas
+## Entrance
+The Entrance to the Port contains a [Barrier](/obstacles/barrier) with a [Shed](/buildings/shed) next to it. Adjacent to the Shed is a [Porta Potty](/buildings/porta_potty).
 
-## Ships
+## Port Warehouses
+Two Port Warehouses spawn at opposite sides of the Port. They are special variants of the [Warehouse](/buildings/warehouse) that have a different layout and roof design. All Port Warehouses contain the following:
 
-Main article: [Cargo Ship](/buildings/cargo_ship), [Oil Tanker](/buildings/oil_tanker).
-On the outer edge of the Port, the Ships spawn in the water.
+- A [Flint Crate](/obstacles/crates) near a [Regular Crate](/obstacles/crates), a [Super Barrel](/obstacles/super_barrel), and two [Barrels](/obstacles/barrel) at one end of the building. The Flint Crate is sometimes replaced by a regular crate.
+- A [Forklift](/obstacles/forklift) with three Regular Crates behind it and two Barrels with two [Boxes](/obstacles/box) near them at the center of the building.
+- A Forklift, a Super Barrel, and a Regular Crate at the other end of the building.
 
-## Port Warehouses
+One of the Port Warehouses is colored blue while the other is colored red. Two [Dumpsters](/obstacles/dumpster), a Flint Crate that is sometimes replaced with a Regular Crate, and a Forklift with a Flint Crate can be found on the outside of the Blue Port Warehouse.
 
-Main article: [Port Warehouse](/buildings/port_warehouse).
+## Containers
+Four groups of six [Containers](/buildings/containers) can be found scattered throughout the Port. These Containers are usually the blue, green, and yellow Containers found scattered around the map but can also be silver or red, which are container colors exclusive to the Port. Silver and red Containers are inaccessible and never have any openings.
 
-## Port Shed
+One group of Containers spawns inland of the Blue Port Warehouse, two groups can be found in the center of the Port, and one group can be found underneath the Crane at the far end of the Port. The group of Containers found near the Blue Port Warehouse also has a Barrel and a Super Barrel near it as well as several crates which can be [AEGIS Crates](/obstacles/crates), Flint Crates, Normal Crates, or Grenade Crates.
 
-Main article: [Port Shed](/buildings/port_shed).
-A Port Shed spawns towards the center of the Port, alongside a lowered [Barrier](/obstacles/barrier).
+## Parking Lot
+The Parking Lot can be found at the far end of the Port near the Crane. It contains two [Trucks](/obstacles/trucks) that both have [Trailers](/obstacles/trailer) attached to them, two Forklifts with one having a Barrel and the other having a Regular Crate, three Boxes, and three Regular Crates. One of the Regular Crates is sometimes replaced with a [Grenade Crate](/obstacles/grenade_crate). 
 
 ## Crane
+The Crane can be found at the far end of the Port next to the Parking Lot. A group of Containers and two Barrels that are sometimes replaced by Super Barrels can be found right underneath the Crane. A Porta Potty, two Regular Crates, two AEGIS Crates, a Forklift with a Regular Crate and Box, and a Grenade Crate can also be found nearby.
 
-Main article: [Crane](/buildings/crane).
-A crane always spawns parallel to the Cargo Ship and contains a large amount of loot underneath it.
-
-## Other
+## Secret Area
+Next to the Porta Potty near the Shed and inland of the Red Port Warehouse is the the Secret Area. It contains three [Sandbags](/obstacles/sandbags), three Barrels, two Super Barrels, and two crates which can either be Flint Crates or AEGIS Crates. 
 
-- The Port contains a large number of Containers in various locations. They are useful for getting some basic weapons, armor, and healing items to engage other players.
-- In one of the corners opposite the Port Warehouses, there are multiple [Trucks](/obstacles/truck) and [Trailers](/obstacles/trailer), which make for effective cover.
-- [Bollards](/obstacles/bollard) spawn along the border with the ocean.
-- A line of [Porta Potties](/buildings/porta_potty) spawns near the trucks.
-  - These are great for getting tons of healing items early in a game.
+## Ship
+The Ship can be found offshore of the Port and is connected to the Port through two walkways near the Crane. There are two types of ships that both have an equal chance of spawning: the [Cargo Ship](/buildings/cargo_ship) and the [Oil Tanker](/buildings/oil_tanker).
 
 # Tips
 
-- Be careful as there are often many players at the port looking for loot.
-  - Unless you spawn close to the Port early-game, don't bother heading for the Port as it will likely already be looted by the time you arrive.
+## Looting the Port
+- The first thing you should go for when entering the Port should be the Flint and Aegis Crates that spawn in the structure as these crate will provide you with basic equipment such as [armor](/equipment/armor) and common [weapons](/weapons). Don't immediately rush for the loot on the Ship as you could easily be ambushed who have more gear than you.
+  - One of the best places to start is to break a hole in the [Fence](/obstacles/fence) near the Secret Area as this will instantly give you access to two crates that are either Flint or AEGIS Crates. Just make sure no other players spot you so nobody blows up the Barrels and Super Barrels nearby.
+  - If you enter in from the side with the Blue Port Warehouse, you can also start by looting the two AEGIS Crates near the Crane.
+
+<Gallery
+  images={[
+    {
+      url: "/img/articles/buildings/port/starting_point_1.png",
+      author: "1092384",
+      caption: "The Secret Area",
+    },
+    {
+      url: "/img/articles/buildings/port/starting_point_2.png",
+      author: "1092384",
+      caption: "The AEGIS Crates near the Crane",
+    },
+  ]}
+/>
+
+  - Depending on your loadout after looting these crates you can either go for the two Flint Crates near the Blue Port Warehouse (one of them is on a Forklift) or head directly for the Ship.
+
+<Gallery
+  images={[
+    {
+      url: "/img/articles/buildings/port/flint_crates_blue_warehouse.png",
+      author: "1092384",
+      caption: "Forklift Flint Crates",
+    },
+  ]}
+/>
+
+- On the way to the Ship, briefly look inside the Containers and grab anything that might be useful such as a spare weapon or healing items.
+- Since the Ships are generally very dangerous since both variants will attact many players due to their high amounts of valuable loot, try to loot them efficiently and not attract too much attention unless you are looking to get more kills.
+  - You can do this by only looting the most important area of the Ship which is the [Tango Crate](/obstacles/tango_crate) for the Cargo Ship and the [Briefcase](/obstacles/briefcase) for the Oil Tanker. Note that both crates are locked in vaults and require different puzzles to solve in order to unlock the vault in question. See the individual pages for each Ship variant for more information.
+  - If there is time you can loot the rest of the Ship which often has more loot to offer such as AEGIS Crates and a [Fire Hatchet Case](/obstacles/fire_hatchet_case) on the Oil Tanker.
+- After looting the Ship, you can either exit the Port or loot the rest of the Port if there's enough time.
 
 # History
 
+- [v0.15.0](https://github.com/HasangerGames/suroi/releases/tag/v0.15.0)
+  - Revamped
 - [v0.11.0](https://github.com/HasangerGames/suroi/releases/tag/v0.11.0)
   - Added