juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Master fix + Bank removal (#888)

Browse Source 
* bugfix

* bank removal

* red and blue carpet

* Update carpets.yml
This commit is contained in:
Ed
2025-02-12 22:36:19 +03:00
committed by GitHub
parent 73b4060c65
commit 007249b675
31 changed files with 11685 additions and 12640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/_CP14/Passport/CP14PassportSystem.cs
View File

@@ -1,6 +1,6 @@
using System.Text;
using Content.Shared.GameTicking;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Inventory;
using Content.Shared.Paper;
using Content.Shared.Roles;
using Robust.Shared.Prototypes;
@@ -12,8 +12,8 @@ public sealed partial class CP14PassportSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly PaperSystem _paper = default!;
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
public readonly EntProtoId PassportProto = "CP14Passport";
public override void Initialize()
@@ -39,7 +39,7 @@ public sealed partial class CP14PassportSystem : EntitySystem
StampedName = Loc.GetString("cp14-passport-stamp")
},
"");
_hands.TryPickupAnyHand(ev.Mob, passport);
_inventory.TryEquip(ev.Mob, passport, "pocket1");
}
private string GeneratePassportText(PlayerSpawnCompleteEvent ev)

123
Resources/Maps/_CP14/Ships/cargo_shuttle.yml
View File

@@ -85,14 +85,6 @@ entities:
chunkSize: 4
- type: GasTileOverlay
- type: RadiationGridResistance
- proto: C14IronCabinetCargo
entities:
- uid: 55
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 0.5,-3.5
parent: 1
- proto: CP14BlueBottle
entities:
- uid: 73
@@ -103,12 +95,6 @@ entities:
parent: 1
- proto: CP14ChairWooden
entities:
- uid: 39
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 1.4904509,1.7075868
parent: 1
- uid: 69
components:
- type: Transform
@@ -236,12 +222,13 @@ entities:
rot: 1.5707963267948966 rad
pos: 1.0687864,6.6510777
parent: 1
- proto: CP14IronDoorBankStaff
- proto: CP14IronCabinetCargo
entities:
- uid: 50
- uid: 55
components:
- type: Transform
pos: 0.5,0.5
rot: 3.141592653589793 rad
pos: 0.5,-3.5
parent: 1
- proto: CP14OrangeBottle
entities:
@@ -288,8 +275,6 @@ entities:
- type: Transform
pos: -1.5,-4.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 79
@@ -297,8 +282,6 @@ entities:
- type: Transform
pos: -1.5,-3.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 80
@@ -306,8 +289,6 @@ entities:
- type: Transform
pos: -1.5,-2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 81
@@ -315,8 +296,6 @@ entities:
- type: Transform
pos: -1.5,-1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 82
@@ -324,8 +303,6 @@ entities:
- type: Transform
pos: -1.5,-0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 83
@@ -333,8 +310,6 @@ entities:
- type: Transform
pos: -1.5,0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 84
@@ -342,8 +317,6 @@ entities:
- type: Transform
pos: -0.5,-4.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 85
@@ -351,8 +324,6 @@ entities:
- type: Transform
pos: -0.5,-3.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 86
@@ -360,8 +331,6 @@ entities:
- type: Transform
pos: -0.5,-2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 87
@@ -369,8 +338,6 @@ entities:
- type: Transform
pos: -0.5,-1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 88
@@ -378,8 +345,6 @@ entities:
- type: Transform
pos: -0.5,-0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 89
@@ -387,8 +352,6 @@ entities:
- type: Transform
pos: -0.5,0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 90
@@ -396,8 +359,6 @@ entities:
- type: Transform
pos: 0.5,-4.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 91
@@ -405,8 +366,6 @@ entities:
- type: Transform
pos: 0.5,-3.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 92
@@ -414,8 +373,6 @@ entities:
- type: Transform
pos: 0.5,-2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 93
@@ -423,8 +380,6 @@ entities:
- type: Transform
pos: 0.5,-1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 94
@@ -432,8 +387,6 @@ entities:
- type: Transform
pos: 0.5,-0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 95
@@ -441,8 +394,6 @@ entities:
- type: Transform
pos: 0.5,0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 96
@@ -450,8 +401,6 @@ entities:
- type: Transform
pos: 1.5,-4.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 97
@@ -459,8 +408,6 @@ entities:
- type: Transform
pos: 1.5,-3.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 98
@@ -468,8 +415,6 @@ entities:
- type: Transform
pos: 1.5,-1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 99
@@ -477,8 +422,6 @@ entities:
- type: Transform
pos: 1.5,-0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 100
@@ -486,8 +429,6 @@ entities:
- type: Transform
pos: 1.5,0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 101
@@ -495,8 +436,6 @@ entities:
- type: Transform
pos: 2.5,-4.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 102
@@ -504,8 +443,6 @@ entities:
- type: Transform
pos: 2.5,-3.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 103
@@ -513,8 +450,6 @@ entities:
- type: Transform
pos: 2.5,-2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 104
@@ -522,8 +457,6 @@ entities:
- type: Transform
pos: 2.5,-1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 105
@@ -531,8 +464,6 @@ entities:
- type: Transform
pos: 2.5,-0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 106
@@ -540,8 +471,6 @@ entities:
- type: Transform
pos: 1.5,-2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 107
@@ -549,8 +478,6 @@ entities:
- type: Transform
pos: 2.5,0.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 108
@@ -558,8 +485,6 @@ entities:
- type: Transform
pos: 1.5,1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 109
@@ -567,8 +492,6 @@ entities:
- type: Transform
pos: 0.5,1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 110
@@ -576,8 +499,6 @@ entities:
- type: Transform
pos: -0.5,1.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 111
@@ -585,8 +506,6 @@ entities:
- type: Transform
pos: 1.5,2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 112
@@ -594,8 +513,6 @@ entities:
- type: Transform
pos: 0.5,2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 113
@@ -603,8 +520,6 @@ entities:
- type: Transform
pos: -0.5,2.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- uid: 114
@@ -612,8 +527,6 @@ entities:
- type: Transform
pos: 0.5,3.5
parent: 1
- type: Physics
canCollide: False
- type: Fixtures
fixtures: {}
- proto: CP14ShuttleWingBigL
@@ -768,16 +681,6 @@ entities:
- type: Transform
pos: 2.5,-0.5
parent: 1
- uid: 43
components:
- type: Transform
pos: -0.5,0.5
parent: 1
- uid: 44
components:
- type: Transform
pos: 1.5,0.5
parent: 1
- proto: CP14WallmountFlagBankShip
entities:
- uid: 17
@@ -814,14 +717,6 @@ entities:
fixtures: {}
- proto: CP14WallmountLamp
entities:
- uid: 57
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 1.5,1.5
parent: 1
- type: Fixtures
fixtures: {}
- uid: 67
components:
- type: Transform
@@ -884,6 +779,11 @@ entities:
- type: Transform
pos: -0.5,-0.5
parent: 1
- uid: 39
components:
- type: Transform
pos: -0.5,0.5
parent: 1
- proto: CP14WoodenPalletSell
entities:
- uid: 2
@@ -906,4 +806,9 @@ entities:
- type: Transform
pos: 1.5,-1.5
parent: 1
- uid: 43
components:
- type: Transform
pos: 1.5,0.5
parent: 1
...

23922
Resources/Maps/_CP14/comoss.yml
View File

File diff suppressed because it is too large Load Diff

58
Resources/Prototypes/_CP14/Entities/Structures/Furniture/carpets.yml Normal file
View File

@@ -0,0 +1,58 @@
- type: entity
id: CP14CarpetBase
parent: BaseStructure
name: carpet
description: "Fancy walking surface."
categories: [ ForkFiltered ]
abstract: true
components:
- type: Sprite
drawdepth: FloorTiles
- type: Icon
state: full
- type: IconSmooth
key: full
base: carpet_
- type: Tag
tags:
- Carpet
- ForceFixRotations
- type: Physics
canCollide: false
- type: Fixtures
- type: Damageable
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 10
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Butcherable
butcheringType: Knife
butcherDelay: 2
spawned:
- id: CP14Cloth1
amount: 1
- type: entity
id: CP14CarpetBlue
parent: CP14CarpetBase
suffix: Blue
components:
- type: Sprite
sprite: _CP14/Structures/Furniture/Carpets/blue_carpet.rsi
- type: Icon
sprite: _CP14/Structures/Furniture/Carpets/blue_carpet.rsi
- type: entity
id: CP14CarpetRed
parent: CP14CarpetBase
suffix: Red
components:
- type: Sprite
sprite: _CP14/Structures/Furniture/Carpets/red_carpet.rsi
- type: Icon
sprite: _CP14/Structures/Furniture/Carpets/red_carpet.rsi

2
Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml
View File

@@ -25,7 +25,7 @@
- type: loadout
id: CP14ClothingOuterClothingGreenVest
equipment:
cloak: CP14ClothingOuterClothingGreenVest
outerClothing: CP14ClothingOuterClothingGreenVest
# Shirt

57
Resources/Prototypes/_CP14/Maps/arenas.yml
View File

@@ -11,59 +11,4 @@
mapNameTemplate: "Meteor Arena"
- type: StationJobs
availableJobs:
CP14Adventurer: [ -1, -1 ]
- type: gameMap
id: Comoss
mapName: "Comoss island"
mapPath: /Maps/_CP14/comoss.yml
maxRandomOffset: 0
randomRotation: false
minPlayers: 0
stations:
Comoss:
stationProto: CP14BaseExpedition
components:
- type: StationNameSetup
mapNameTemplate: "Comoss island"
- type: StationJobs
availableJobs:
#Mercenary
CP14Guildmaster: [1, 1]
CP14Adventurer: [ -1, -1 ]
#Artisans
CP14Apprentice: [ 5, 5 ]
CP14Alchemist: [ 2, 2 ]
CP14Blacksmith: [ 2, 2 ]
CP14Innkeeper: [ 3, 4 ]
#Traders
CP14Commandant: [1, 1]
CP14Merchant: [3, 4]
#Guard
CP14Guard: [8, 8]
CP14GuardCommander: [1, 1]
- type: CP14StationZLevels
defaultMapLevel: 0
levels:
-1:
path: /Maps/_CP14/comoss_d.yml
- type: CP14StationKeyDistribution
keys:
- Alchemy1
- Alchemy2
- Blacksmith1
- Blacksmith2
- PersonalHouse1
- PersonalHouse2
#- PersonalHouse3 #TODO: return
- PersonalHouse4
- PersonalHouse5
- PersonalHouse6
- PersonalHouse7
- PersonalHouse8
- PersonalHouse9
- PersonalHouse10
- PersonalHouse11
- PersonalHouse12
- PersonalHouse13
- PersonalHouse14
CP14Adventurer: [ -1, -1 ]

54
Resources/Prototypes/_CP14/Maps/comoss.yml Normal file
View File

@@ -0,0 +1,54 @@
- type: gameMap
id: Comoss
mapName: "Comoss island"
mapPath: /Maps/_CP14/comoss.yml
maxRandomOffset: 0
randomRotation: false
minPlayers: 0
stations:
Comoss:
stationProto: CP14BaseExpedition
components:
- type: StationNameSetup
mapNameTemplate: "Comoss island"
- type: StationJobs
availableJobs:
#Mercenary
CP14Guildmaster: [1, 1]
CP14Adventurer: [ -1, -1 ]
#Artisans
CP14Apprentice: [ 5, 5 ]
CP14Alchemist: [ 2, 2 ]
CP14Blacksmith: [ 2, 2 ]
CP14Innkeeper: [ 3, 4 ]
#Traders
#CP14Commandant: [1, 1]
#CP14Merchant: [3, 4]
#Guard
CP14Guard: [8, 8]
CP14GuardCommander: [1, 1]
- type: CP14StationZLevels
defaultMapLevel: 0
levels:
-1:
path: /Maps/_CP14/comoss_d.yml
- type: CP14StationKeyDistribution
keys:
- Alchemy1
- Alchemy2
- Blacksmith1
- Blacksmith2
- PersonalHouse1
- PersonalHouse2
#- PersonalHouse3 #TODO: return
- PersonalHouse4
- PersonalHouse5
- PersonalHouse6
- PersonalHouse7
- PersonalHouse8
- PersonalHouse9
- PersonalHouse10
- PersonalHouse11
- PersonalHouse12
- PersonalHouse13
- PersonalHouse14

8
Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml
View File

@@ -27,10 +27,6 @@
- CP14DemiplanePeacefulAnimals
layers:
- !type:OreDunGen
tileMask:
- CP14FloorGrass
- CP14FloorGrassLight
- CP14FloorGrassTall
entity: CP14MobRabbit
count: 3
minGroupSize: 2
@@ -49,10 +45,6 @@
- CP14DemiplanePeacefulAnimals
layers:
- !type:OreDunGen
tileMask:
- CP14FloorGrass
- CP14FloorGrassLight
- CP14FloorGrassTall
entity: CP14MobBoar
count: 3
minGroupSize: 2

1
Resources/Prototypes/_CP14/Roles/Jobs/Traders/commandant.yml
View File

@@ -3,6 +3,7 @@
name: cp14-job-name-commandant
description: cp14-job-desc-commandant
playTimeTracker: CP14JobCommandant
setPreference: false
startingGear: CP14CommandantGear
icon: "CP14JobIconCommandant"
requireAdminNotify: true

1
Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
View File

@@ -3,6 +3,7 @@
name: cp14-job-name-merchant
description: cp14-job-desc-merchant
playTimeTracker: CP14JobMerchant
setPreference: false
startingGear: CP14MerchantGear
icon: "CP14JobIconMerchant"
supervisors: cp14-job-supervisors-commandant

1
Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
View File

@@ -26,6 +26,7 @@
description: department-CP14Bank-desc
weight: 8
color: "#fadb3e"
editorHidden: true
roles:
- CP14Commandant
- CP14Merchant

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 987 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 911 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 911 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 881 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 877 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 891 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 886 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/carpet_7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 365 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 637 B

46
Resources/Textures/_CP14/Structures/Furniture/Carpets/blue_carpet.rsi/meta.json Normal file
View File

@@ -0,0 +1,46 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by TheShuEd (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "carpet_0",
"directions": 4
},
{
"name": "carpet_1",
"directions": 4
},
{
"name": "carpet_2",
"directions": 4
},
{
"name": "carpet_3",
"directions": 4
},
{
"name": "carpet_4",
"directions": 4
},
{
"name": "carpet_5",
"directions": 4
},
{
"name": "carpet_6",
"directions": 4
},
{
"name": "carpet_7",
"directions": 4
}
]
}

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 991 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 915 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 911 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 879 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 859 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 867 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 873 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/carpet_7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 360 B

BIN
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 652 B

46
Resources/Textures/_CP14/Structures/Furniture/Carpets/red_carpet.rsi/meta.json Normal file
View File

@@ -0,0 +1,46 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by TheShuEd (github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "carpet_0",
"directions": 4
},
{
"name": "carpet_1",
"directions": 4
},
{
"name": "carpet_2",
"directions": 4
},
{
"name": "carpet_3",
"directions": 4
},
{
"name": "carpet_4",
"directions": 4
},
{
"name": "carpet_5",
"directions": 4
},
{
"name": "carpet_6",
"directions": 4
},
{
"name": "carpet_7",
"directions": 4
}
]
}