Sociopath delete (#917)

* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix
This commit is contained in:
Ed
2025-02-19 21:56:29 +03:00
committed by GitHub
parent fa21ad93ff
commit 224d96bd34
16 changed files with 3 additions and 113 deletions

View File

@@ -48,6 +48,7 @@ namespace Content.IntegrationTests.Tests
{
//CrystallEdge Map replacement
"/Maps/_CP14/dev_map.yml",
"/Maps/_CP14/Dungeon/artifact_room.yml",
//CrystallEdge Map replacement end
"/Maps/centcomm.yml",
"/Maps/bagel.yml", // Contains mime's rubber stamp --> Either fix this, remove the category, or remove this comment if intentional.

View File

@@ -1,4 +1,3 @@
using Content.Server._CP14.Roles;
using Content.Server.Administration.Commands;
using Content.Server.Antag;
using Content.Server.GameTicking.Rules.Components;
@@ -53,22 +52,6 @@ public sealed partial class AdminVerbSystem
var targetPlayer = targetActor.PlayerSession;
Verb CP14Sociopath = new()
{
Text = Loc.GetString("cp14-admin-verb-text-make-sociopath"),
Category = VerbCategory.Antag,
Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"),
"icon"), //TODO
Act = () =>
{
//_antag.ForceMakeAntag<CP14BanditRoleComponent>(targetPlayer, "CP14Bandit"); //TODO
},
Impact = LogImpact.High,
Message = Loc.GetString("cp14-admin-verb-make-sociopath"),
};
args.Verbs.Add(CP14Sociopath);
/* CP14 disable default antags
Verb traitor = new()
{

View File

@@ -1,11 +0,0 @@
using Content.Shared.Roles;
namespace Content.Server._CP14.Roles;
/// <summary>
/// Added to mind role entities to tag that they are a sociopath.
/// </summary>
[RegisterComponent]
public sealed partial class CP14SociopathRoleComponent : BaseMindRoleComponent
{
}

View File

@@ -1,2 +0,0 @@
cp14-admin-verb-text-make-sociopath = Make sociopath
cp14-admin-verb-make-sociopath = Add to target antagonist role “Sociopath”

View File

@@ -1,3 +0,0 @@
cp14-roles-antag-sociopath-name = Sociopath
cp14-roles-antag-sociopath-objective = You don't understand morality or empathy. As long as other people are constrained by them, you don't have to worry about exactly how to accomplish your tasks.
cp14-roles-antag-sociopath-briefing = From birth you don't know what emotion, morality or empathy are. You only know that other people are constrained by them, and this prevents them from being effective. You have certain goals - and you can strive to accomplish them by ANY means.

View File

@@ -10,9 +10,6 @@ cp14-store-sell-special-meat-desc = Any kind of meat will do. Lambs, goats, cows
cp14-store-sell-special-torch-name = 20 torches
cp14-store-sell-special-torch-desc = The settlement of Grimstroke is requesting a large shipment of torches from the Empire! We're making a big march on the Great Tomb of Lazaric! And we have nothing to light it with.
cp14-store-sell-special-flora-name = 15 flora material
cp14-store-sell-special-flora-desc = Battle HQ 14 requesting support! Orders have been received to 'Green the area surrounding the HQ'. Unfortunately, the HQ is located in the desert. Requesting grass to spread all over the area.
cp14-store-sell-special-ash-name = 10 ashes
cp14-store-sell-special-ash-desc = The Mermaid Council is requesting a shipment of ash to their oceanic domain for the reason, quote Where do you think we should get ash from underwater?

View File

@@ -1,2 +0,0 @@
cp14-admin-verb-text-make-sociopath = Сделать социопатом
cp14-admin-verb-make-sociopath = Добавить цели роль антагониста "Социопат"

View File

@@ -1,3 +0,0 @@
cp14-roles-antag-sociopath-name = Социопат
cp14-roles-antag-sociopath-objective = Вам непонятны принципы морали или сочувствия. Пока остальные люди скованы ими, вам не нужно заботиться о том, как именно выполнить свои задачи.
cp14-roles-antag-sociopath-briefing = С самого рождения вы не знаете что такое эмоции, мораль или сочувствие. Вы знаете только, что остальные люди скованы ими, и это мешает им действовать эффективно. У вас есть определенные задачи - и вы можете стремиться к их выполнению ЛЮБЫМИ методами.

View File

@@ -10,9 +10,6 @@ cp14-store-sell-special-meat-desc = Нам подойдет любое мясо.
cp14-store-sell-special-torch-name = 20 факелов
cp14-store-sell-special-torch-desc = Поселение Гримстроук запрашивает большую партию факелов от Империи! Мы устраиваем большой поход на Великую Гробницу Лазарика! И нам нечем освещать ее.
cp14-store-sell-special-flora-name = 15 растительного волокна
cp14-store-sell-special-flora-desc = Боевой штаб 14 запрашивает поддержку! Поступил приказ 'Озеленить прилегающую к штабу территорию'. К сожалению, штаб расположен в пустыне. Запрашиваем траву, чтобы раскидать ее по всей территории.
cp14-store-sell-special-ash-name = 10 пепла
cp14-store-sell-special-ash-desc = Совет русалок запрашивает партию пепла в свои океанические владения по причине, цитата 'Откуда мы должны под водой получать пепел по вашему?'

View File

@@ -984,7 +984,7 @@ entities:
- type: Transform
pos: -0.5,-0.5
parent: 2
- proto: SpawnPointPassenger
- proto: CP14SpawnPointAdventurer
entities:
- uid: 99
components:

View File

@@ -58,19 +58,6 @@
- CP14Torch
count: 20
- type: storePositionSell
id: BountyFloraMaterial
special: true
name: cp14-store-sell-special-flora-name
desc: cp14-store-sell-special-flora-desc
icon:
sprite: _CP14/Objects/Materials/flora.rsi
state: grass_material1
price: 200
service: !type:CP14SellStackService
stackId: CP14FloraMaterial
count: 15
- type: storePositionSell
id: BountySpellScroll
special: true

View File

@@ -30,27 +30,6 @@
- CP14PersonalCurrencyCollectObjectiveGroup
CP14Innkeeper:
- CP14PersonalCurrencyCollectObjectiveGroup
- type: entity
id: CP14SociopathsRule
parent: CP14BaseGameRule
components:
- type: GameRule
minPlayers: 2 #Increase when bigger online
- type: AntagSelection
definitions:
- prefRoles: [ CP14Sociopath ]
startingGear: CP14SociopathGear
max: 8
playerRatio: 10
lateJoinAdditional: true
mindRoles:
- CP14MindRoleSociopath
briefing:
text: cp14-roles-antag-sociopath-briefing
color: "#cc3010"
sound: "/Audio/_CP14/Ambience/Antag/bandit_start.ogg"
# event schedulers

View File

@@ -11,4 +11,4 @@
mapNameTemplate: "Meteor Arena"
- type: StationJobs
availableJobs:
Passenger: [ -1, -1 ]
CP14Adventurer: [ -1, -1 ]

View File

@@ -1,18 +0,0 @@
- type: antag
id: CP14Sociopath
name: cp14-roles-antag-sociopath-name
antagonist: true
setPreference: true
objective: cp14-roles-antag-sociopath-objective
requirements:
- !type:OverallPlaytimeRequirement
time: 7200 # 2h
#guides: TODO
- type: startingGear
id: CP14SociopathGear
storage:
back:
- CP14BaseLockpick
- CP14BaseLockpick
- CP14BaseLockpick

View File

@@ -6,17 +6,3 @@
- type: MindRole
roleType: CP14DemiplaneAntagonist
antagPrototype: CP14DemiplaneAntag
- type: entity
parent: BaseMindRoleAntag
id: CP14MindRoleSociopath
categories: [ ForkFiltered ]
name: Sociopath Role
components:
- type: MindRole
antagPrototype: CP14Sociopath
roleType: SoloAntagonist
exclusiveAntag: true
- type: CP14SociopathRole
- type: RoleBriefing
briefing: cp14-roles-antag-sociopath-briefing

View File

@@ -17,7 +17,6 @@
showInVote: true
cP14Allowed: true
rules:
- CP14SociopathsRule
- CP14RoundObjectivesRule
- CP14BasicStationEventScheduler