Skip to content

Commit 2b79a18

Browse files
Rainbeonfunkystationbot
andauthored
Revert "[Imp port] hefty and slight traits" (funky-station#2803)
* Revert "[Imp port] hefty and slight traits (funky-station#2692)" This reverts commit b6f82f0. * chore: Automatically update REUSE headers --------- Co-authored-by: funkystationbot <funky@funkystation.org>
1 parent 0ef68d1 commit 2b79a18

7 files changed

Lines changed: 4 additions & 124 deletions

File tree

‎Content.Shared/_Floof/Traits/Components/FixtureDensityModifier.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Content.Shared/_Floof/Traits/TraitStatModifierSystem.cs‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Resources/Locale/en-US/_Impstation/traits/categories.ftl‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Resources/Locale/en-US/_Impstation/traits/traits.ftl‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,5 @@
77
trait-nocontractions-name = No contractions
88
trait-nocontractions-desc = You are (mostly) incapable of using contractions.
99
10-
trait-hefty-name = Hefty
11-
trait-hefty-desc = You're heavier than average.
12-
Incompatible with Slight.
13-
trait-slight-name = Slight
14-
trait-slight-desc = You're lighter than average.
15-
Incompatible with Hefty.
16-
1710
trait-milbrat-name = Military Jargon
18-
trait-milbrat-desc = You make subtle references to a past stint in the military by using strange terminology and acronyms.
11+
trait-milbrat-desc = You make subtle references to a past stint in the military by using strange terminology and acronyms.

‎Resources/Prototypes/Traits/categories.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# SPDX-FileCopyrightText: 2024 Ed <96445749+TheShuEd@users.noreply.github.com>
22
# SPDX-FileCopyrightText: 2024 Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
3-
# SPDX-FileCopyrightText: 2025 ImpstationBot <irismessage+bot@protonmail.com>
43
# SPDX-FileCopyrightText: 2025 SaffronFennec <firefoxwolf2020@protonmail.com>
54
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
65
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
6+
# SPDX-FileCopyrightText: 2026 ImpstationBot <irismessage+bot@protonmail.com>
7+
# SPDX-FileCopyrightText: 2026 Mora <46364955+TrixxedHeart@users.noreply.github.com>
8+
# SPDX-FileCopyrightText: 2026 Skye <57879983+Rainbeon@users.noreply.github.com>
79
#
810
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
911

@@ -30,8 +32,3 @@
3032
id: Vision
3133
name: trait-category-vision-tolerance
3234
maxTraitPoints: 1
33-
34-
- type: traitCategory # Funky Station
35-
id: Weight
36-
name: trait-category-weight
37-
maxTraitPoints: 1

‎Resources/Prototypes/_DEN/Traits/traits.yml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎Resources/Prototypes/_Impstation/Traits/subcategories.yml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)