Skip to content

Commit

Permalink
Merge pull request #121 from Gorox221/flags
Browse files Browse the repository at this point in the history
Флаги государств
  • Loading branch information
Gorox221 authored Mar 19, 2024
2 parents 371d27a + 2a86e15 commit 88b1580
Show file tree
Hide file tree
Showing 19 changed files with 172 additions and 1 deletion.
12 changes: 12 additions & 0 deletions Resources/Locale/ru-RU/ganimed/entities/misc/flags.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-FlagElizium = флаг Элизиума
.desc = Иди и убей пару ксеносов!
ent-FlagTSF = флаг ТСФ
.desc = Выглядит не так уж и технологично.
ent-FlagUSSP = флаг СССП
.desc = Пролетарии всех стран, соединяйтесь!
ent-FlagHandyUSSP = флажок СССП
.desc = Пролетарии всех стран, соединяйтесь!
ent-FlagHandyElz = флажок Элизиума
.desc = Иди и убей пару ксеносов!
ent-FlagHandyTSF = флажок ТСФ
.desc = Выглядит не так уж и технологично.
40 changes: 40 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,43 @@
state: icon
- type: Item
sprite: Objects/Misc/Handy_Flags/pirate_handy_flag.rsi


- type: entity
parent: BaseItem
id: FlagHandyElz
name: Elizium handheld flag
description: "Go to kill xenos!"
components:
- type: Sprite
sprite: Objects/Misc/Handy_Flags/Elz_handy_flag.rsi
state: icon
- type: Item
sprite: Objects/Misc/Handy_Flags/Elz_handy_flag.rsi

- type: entity
parent: BaseItem
id: FlagHandyUSSP
name: USSP handheld flag
description: "Proletarians of all countries, unite!"
components:
- type: Sprite
sprite: Objects/Misc/Handy_Flags/USSP_handy_flag.rsi
state: icon
- type: Item
sprite: Objects/Misc/Handy_Flags/USSP_handy_flag.rsi

- type: entity
parent: BaseItem
id: FlagHandyTSF
name: TSF handheld flag
description: "It looks technologically advanced."
components:
- type: Sprite
sprite: Objects/Misc/Handy_Flags/TSF_handy_flag.rsi
state: icon
- type: Item
sprite: Objects/Misc/Handy_Flags/TSF_handy_flag.rsi



Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,37 @@
description: "Raise the jolly roger, scallywags!"
components:
- type: Sprite
state: pirate_flag
state: pirate_flag

- type: entity
parent: BaseFlag
id: FlagElizium
name: Elizium flag
description: "Go to kill xenos!"
components:
- type: Sprite
drawdepth: WallTops
sprite: Ganimed/Structures/Wallmounts/flags.rsi
state: elz

- type: entity
parent: BaseFlag
id: FlagTSF
name: TSF flag
description: "It doesn't look technologically advanced."
components:
- type: Sprite
drawdepth: WallTops
sprite: Ganimed/Structures/Wallmounts/flags.rsi
state: tsf

- type: entity
parent: BaseFlag
id: FlagUSSP
name: USSP flag
description: "Сranberry."
components:
- type: Sprite
drawdepth: WallTops
sprite: Ganimed/Structures/Wallmounts/flags.rsi
state: ussp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"version": 1,
"license": "CLA",
"copyright": "By AltMapper for Enterprise server exclusive use.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "elz"
},
{
"name": "tsf"
},
{
"name": "ussp"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CLA",
"copyright": "Drawn by Saveliy360, modified by AltMapper, see repo CLA.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CLA",
"copyright": "Drawn by Saveliy360, modified by AltMapper, see repo CLA.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Drawn by Saveliy360",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 88b1580

Please sign in to comment.