From 46f3adeee954289f387a15c396dadc50d05b7009 Mon Sep 17 00:00:00 2001 From: 1092384 <66282302+1092384@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:03:31 +0900 Subject: [PATCH] feat: chairs and toilets combined articles, square desk and vending machine articles, minor updates to old articles --- .../removed_content/house/page.mdx} | 4 +++- app/(wiki)/(prose)/removed_content/page.mdx | 5 ++++- app/(wiki)/buildings/articles/tugboats.md | 2 +- app/(wiki)/obstacles/[item]/page.tsx | 5 +++++ app/(wiki)/obstacles/articles/chair.md | 18 ----------------- app/(wiki)/obstacles/articles/chairs.md | 20 +++++++++++++++++++ app/(wiki)/obstacles/articles/sink.md | 19 ------------------ app/(wiki)/obstacles/articles/smokestack.md | 4 ---- app/(wiki)/obstacles/articles/square_desk.md | 16 +++++++++++++++ app/(wiki)/obstacles/articles/toilets.md | 4 ++-- app/(wiki)/obstacles/articles/tv.md | 12 +---------- .../obstacles/articles/vending_machine.md | 18 +++++++++++++++++ app/(wiki)/obstacles/articles/viking_chest.md | 4 ++-- app/(wiki)/obstacles/articles/water_cooler.md | 2 +- 14 files changed, 73 insertions(+), 60 deletions(-) rename app/(wiki)/{buildings/articles/house.md => (prose)/removed_content/house/page.mdx} (89%) delete mode 100644 app/(wiki)/obstacles/articles/chair.md create mode 100644 app/(wiki)/obstacles/articles/chairs.md delete mode 100644 app/(wiki)/obstacles/articles/sink.md create mode 100644 app/(wiki)/obstacles/articles/square_desk.md create mode 100644 app/(wiki)/obstacles/articles/vending_machine.md diff --git a/app/(wiki)/buildings/articles/house.md b/app/(wiki)/(prose)/removed_content/house/page.mdx similarity index 89% rename from app/(wiki)/buildings/articles/house.md rename to app/(wiki)/(prose)/removed_content/house/page.mdx index d3d2ab2d..a259b02f 100644 --- a/app/(wiki)/buildings/articles/house.md +++ b/app/(wiki)/(prose)/removed_content/house/page.mdx @@ -1,4 +1,5 @@ - +# 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 diff --git a/app/(wiki)/(prose)/removed_content/page.mdx b/app/(wiki)/(prose)/removed_content/page.mdx index f1bd895f..74ea2ddb 100644 --- a/app/(wiki)/(prose)/removed_content/page.mdx +++ b/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) \ No newline at end of file +- [Barrett M95](/removed_content/barrett_m95) + +## Buildings +- [House](/removed_content/house) \ No newline at end of file diff --git a/app/(wiki)/buildings/articles/tugboats.md b/app/(wiki)/buildings/articles/tugboats.md index f03b31f2..96527f92 100644 --- a/app/(wiki)/buildings/articles/tugboats.md +++ b/app/(wiki)/buildings/articles/tugboats.md @@ -14,7 +14,7 @@ All tugboats contain one [Grenade Crate](/obstacles/grenade_crate), one [Barrel] The Cabin can be accessed through a [Door](/obstacles/doors) in the center of the boat. -All tugboat cabins contain one [Tugboat Control Panel](/obstacles/tugboat_control_panel), one [Office Chair](/obstacles/office_chair), one [Large Drawer](/obstacles/drawers) and one [Life Preserver](/obstacles/life_preserver). Additionally, White Tugboats contain a [Gun Case](/obstacles/gun_case) and Red Tugboats contain a [Lux Crate](/obstacles/lux_crate) inside the cabin. The Lux Crate drops a guaranteed [CZ-600](/weapons/guns/cz600) and a scope. +All tugboat cabins contain one [Tugboat Control Panel](/obstacles/tugboat_control_panel), one [Office Chair](/obstacles/office_chair), one [Large Drawer](/obstacles/drawers) and one [Life Preserver](/obstacles/life_preserver). Additionally, White Tugboats contain a [Gun Case](/obstacles/gun_case) and Red Tugboats contain a [Lux Crate](/obstacles/lux_crate) inside the cabin. The Lux Crate drops a guaranteed [RGS](/weapons/guns/rgs) and a scope. # Tips diff --git a/app/(wiki)/obstacles/[item]/page.tsx b/app/(wiki)/obstacles/[item]/page.tsx index 63d19284..00c14b94 100644 --- a/app/(wiki)/obstacles/[item]/page.tsx +++ b/app/(wiki)/obstacles/[item]/page.tsx @@ -111,6 +111,11 @@ const toExport = GenericArticlePage({ items: ["small_table", "large_table", "round_table"], fileName: "tables" }, + { + title: "Chairs", + items: ["chair", "office_chair", "grey_office_chair"], + fileName: "chairs" + }, { title: "Sinks", items: ["sink", "sink2"], diff --git a/app/(wiki)/obstacles/articles/chair.md b/app/(wiki)/obstacles/articles/chair.md deleted file mode 100644 index e1c5bf51..00000000 --- a/app/(wiki)/obstacles/articles/chair.md +++ /dev/null @@ -1,18 +0,0 @@ -The **Chair** is an [Obstacle](/obstacles) added in the [v0.9.0](https://github.com/HasangerGames/suroi/releases/tag/v0.9.0) "Behind Closed Doors" update on July 30th, 2023. - -# Location & Spawning - -Two Chairs spawn across a [Table](/obstacles/table) in the Foyer of the [House](/buildings/house) and the Kitchen & Dining area of the [Small House](/buildings/small_house). One chair also spawns in the office in the [Refinery](/buildings/refinery) and inside the [Sheds](/buildings/port_shed) in the [Port](/buildings/port) and [Armory](/buildings/armory). - -# Loot & More - -Chairs drop no loot when broken. - -# Tips - -- Due to its low health and positioning, the Chair can only be used as temporary cover from enemies in specific situations. - -# History - -- [v0.9.0](https://github.com/HasangerGames/suroi/releases/tag/v0.9.0) - - Added diff --git a/app/(wiki)/obstacles/articles/chairs.md b/app/(wiki)/obstacles/articles/chairs.md new file mode 100644 index 00000000..584413b8 --- /dev/null +++ b/app/(wiki)/obstacles/articles/chairs.md @@ -0,0 +1,20 @@ +**Chairs** are a type of [Obstacle](/obstacles) in Suroi. The Normal Chair was added in the [v0.9.0](https://github.com/HasangerGames/suroi/releases/tag/v0.9.0) "Behind Closed Doors" update on July 30th, 2023 and the Office Chairs were 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 + +Normal Chairs can be found in many structures and often facing a [Table](/obstacles/tables). Red Office Chairs are slightly less prelevant but can still be found in many structures such as the [Tugboats](/buildings/tugboats) and [Large Tents](/buildings/tents). Grey Office Chairs are the rarest type of Chair and are only found in certain areas of the [Plumpkin Bunker](/buildings/plumpkin_bunker_meta) and [AEGIS Headquarters](/buildings/headquarters). + +# Loot & More + +Chairs drop no loot when broken. + +# Tips + +- Since Chairs are often found near Tables, you can use them as cover if you are hiding under a Table. However, Chairs have low health, so they can't be used for very long as they will be broken quickly by most weapons. + +# History + +- [v0.19.0](https://github.com/HasangerGames/suroi/releases/tag/v0.19.0) + - Added Red and Grey Office Chairs +- [v0.9.0](https://github.com/HasangerGames/suroi/releases/tag/v0.9.0) + - Added diff --git a/app/(wiki)/obstacles/articles/sink.md b/app/(wiki)/obstacles/articles/sink.md deleted file mode 100644 index 76636cdc..00000000 --- a/app/(wiki)/obstacles/articles/sink.md +++ /dev/null @@ -1,19 +0,0 @@ -The **Sink** is an [Obstacle](/obstacles) added in the [v0.15.0](https://github.com/HasangerGames/suroi/releases/tag/v0.15.0) "Pulling the Pin" update on January 14th, 2024. - -# Location & Spawning - -A Sink spawns in every [Mobile Home](/buildings/mobile_home) in its interior next to the [Small Stove](/obstacles/small_stove). - -# Loot & More - -The Sink drops either healing items or ammo. The former is slightly more common. - -# Tips - -- Sinks can only be used as cover in certain situations. -- Sinks are a good way to get healing items when you need them. - -# History - -- [v0.15.0](https://github.com/HasangerGames/suroi/releases/tag/v0.15.0) - - Added \ No newline at end of file diff --git a/app/(wiki)/obstacles/articles/smokestack.md b/app/(wiki)/obstacles/articles/smokestack.md index ae784290..7b6fe25c 100644 --- a/app/(wiki)/obstacles/articles/smokestack.md +++ b/app/(wiki)/obstacles/articles/smokestack.md @@ -8,10 +8,6 @@ One Smokestack spawns in one of the corners of the [Refinery](/buildings/refiner Smokestacks are indestructible and reflect bullets. -# Tips - -- The Smokestack in the refinery can be used as cover from enemies; however, its usage very situational. - # Trivia - In real life, smokestacks are tall vertical pipes used to discharge gases or vapors safely. diff --git a/app/(wiki)/obstacles/articles/square_desk.md b/app/(wiki)/obstacles/articles/square_desk.md new file mode 100644 index 00000000..18b8ef37 --- /dev/null +++ b/app/(wiki)/obstacles/articles/square_desk.md @@ -0,0 +1,16 @@ +The **Square Desk** is an [Obstacle](/obstacles) added alongside the [Plumpkin Bunker](/buildings/plumpkin_bunker_meta) in the [v0.20.0](https://github.com/HasangerGames/suroi/releases/tag/v0.20.0) "Open Season" update on October 27th, 2024. + +# Location & Spawning + +The Square Desk only appears in the Lobby of the Plumpkin Bunker, where it encloses a [Button](/obstacles/button) that can be used to open the blue sliding doors, letting players access the Security Office. + +# Tips + +- Try not to be caught inside of the Square Desk as you can easily be killed by someone with a CQC weapon such as the [Flues](/weapons/flues). Make sure you leave the area as soon as possible after activating the button. + - In contrast, the whole of the Square Desk is a great piece of cover as it is completely indestructible. + +# History + +- [v0.20.0](https://github.com/HasangerGames/suroi/releases/tag/v0.20.0) + - Added + \ No newline at end of file diff --git a/app/(wiki)/obstacles/articles/toilets.md b/app/(wiki)/obstacles/articles/toilets.md index 4b423c6b..a1664d7d 100644 --- a/app/(wiki)/obstacles/articles/toilets.md +++ b/app/(wiki)/obstacles/articles/toilets.md @@ -2,7 +2,7 @@ # Location & Spawning -One "Ceramic" Toilet always spawns in the bathrooms of the [House](/buildings/house) and the [Small House](/buildings/small_house). These toilets have a 30% chance to be used. Porta Potty Toilets spawn in [Porta Potties](/buildings/porta_potty) and have a 70% chance to be used. +Ceramic Toilets are found across many structures and can often spawn multiple times in large structures like the [Lodge](/buildings/lodge). In contrast, the Porta Potty Toilet is only found as part of the [Porta Potty](/buildings/porta_potty). # Loot & More @@ -11,7 +11,7 @@ Unused Toilets usually contain 2-3 healing items but can occasionally contain sc # Tips - Toilets can be used as cover in certain situations, but it is more worthwhile to break them for loot. -- Toilets often contain the best loot in houses along with the [Fridge](/obstacles/fridge), so it is recommended to loot them first. +- Toilets often contain the best loot in houses along with the [Fridge](/obstacles/fridge), so it is recommended to loot them first. Some players go as far as to only loot the Fridge and the Toilet and then immediately leave the house in order to not waste time looting the less valuable obstacles. # History diff --git a/app/(wiki)/obstacles/articles/tv.md b/app/(wiki)/obstacles/articles/tv.md index ed3d09b3..0a18a7eb 100644 --- a/app/(wiki)/obstacles/articles/tv.md +++ b/app/(wiki)/obstacles/articles/tv.md @@ -2,19 +2,9 @@ The **TV** is an [Obstacle](/obstacles) added in the [v0.9.0](https://github.com # Location & Spawning -A single TV spawned in the Living Room of the removed [House](/buildings/house). A TV also spawns in the Living Room of the Green House. - -# Loot & More - -TVs drop no loot when broken. - -# Tips - -- Since the TV has extremely low health, it cannot be normally used as cover. +TVs can be found in certain residential buildings such as the [Green House](/buildings/green_house) and the [Lodge](/buildings/lodge). # History -- [v0.17.0](https://github.com/HasangerGames/suroi/releases/tag/v0.17.0) - - Added to the Green House - [v0.9.0](https://github.com/HasangerGames/suroi/releases/tag/v0.9.0) - Added diff --git a/app/(wiki)/obstacles/articles/vending_machine.md b/app/(wiki)/obstacles/articles/vending_machine.md new file mode 100644 index 00000000..1dbe38e7 --- /dev/null +++ b/app/(wiki)/obstacles/articles/vending_machine.md @@ -0,0 +1,18 @@ +The **Vending Machine** is an [Obstacle](/obstacles) 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 + +The Vending Machine can only be found on the first floor of the [AEGIS Headquarters](/buildings/headquarters). + +# Loot & More + +Vending Machines can drop [Cola](/healing/cola), [Medikits](/healing/medikits), or [Tablets](/healing/tablets). They always drop 2-3 of these items with Cola being the most common drop. See the [loot tables](/loot#vending_machine_normal) for more information. + +# Tips + +- Vending Machines are a great source of healing items in the Headquarters and should be looted along with the [Fridges](/obstacles/fridges) in the Kitchen after getting a solid weapon. + +# History + +- [v0.19.0](https://github.com/HasangerGames/suroi/releases/tag/v0.19.0) + - Added diff --git a/app/(wiki)/obstacles/articles/viking_chest.md b/app/(wiki)/obstacles/articles/viking_chest.md index fd67ad08..c181c7f0 100644 --- a/app/(wiki)/obstacles/articles/viking_chest.md +++ b/app/(wiki)/obstacles/articles/viking_chest.md @@ -6,11 +6,11 @@ A single Viking Chest typically spawns on the beach near the shore once per game # Loot & More -The Viking Chest has decent [loot](/loot#viking_crate). It drops a [Seax](/weapons/melee/seax), 2-3 [Guns](/loot#viking_chest_guns), up to two pieces of [Equipment](/loot#special_equipment), and up to two [Scopes](/loot#special_scopes). +The Viking Chest has decent [loot](/loot#viking_crate_normal). It drops a [Seax](/weapons/melee/seax), 2-3 [Guns](/loot#viking_chest_guns_normal), up to two pieces of [Equipment](/loot#special_equipment_normal), and up to two [Scopes](/loot#special_scopes_normal). # Tips -- The Viking Chest can be used as cover in certain situations, but it is more worthwhile to break them for loot. +- The Viking Chest can be used as cover in certain situations, but it is more worthwhile to break it for loot. # History diff --git a/app/(wiki)/obstacles/articles/water_cooler.md b/app/(wiki)/obstacles/articles/water_cooler.md index 21ccbc45..4675979f 100644 --- a/app/(wiki)/obstacles/articles/water_cooler.md +++ b/app/(wiki)/obstacles/articles/water_cooler.md @@ -11,7 +11,7 @@ Water Coolers drop no loot upon being broken. # Tips - You can hide behind Water Coolers for a short period of time for cover. - - Do not use Water Coolers as prolonged cover, because they have low health. Instead, hide behind walls or corners. + - Do not use Water Coolers as prolonged cover because they have low health. Instead, hide behind walls or corners. # History