]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Decorative Flags (also handheld flags) (#19670)
authorSaveliyM360 <142160914+SaveliyM360@users.noreply.github.com>
Mon, 4 Dec 2023 06:27:02 +0000 (08:27 +0200)
committerGitHub <noreply@github.com>
Mon, 4 Dec 2023 06:27:02 +0000 (17:27 +1100)
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
28 files changed:
Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/flags.rsi/NT_flag.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/flags.rsi/blank_flag.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/flags.rsi/pirate_flag.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/flags.rsi/syndie_flag.png [new file with mode: 0644]

diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
new file mode 100644 (file)
index 0000000..42ebf32
--- /dev/null
@@ -0,0 +1,59 @@
+- type: entity
+  parent: BaseItem
+  id: BlankHandyFlag
+  name: blank handheld flag
+  description: "Some piece of white cloth wound on a stick."
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/Handy_Flags/blank_handy_flag.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Misc/Handy_Flags/blank_handy_flag.rsi
+
+- type: entity
+  parent: BaseItem
+  id: NTHandyFlag
+  name: Nanotrasen handheld flag
+  description: "Glory to NT! Wait, they really made a handheld flag for a corporation?"
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi
+
+- type: entity
+  parent: BaseItem
+  id: SyndieHandyFlag
+  name: Syndicate handheld flag
+  description: "For truly rebellious patriots. Death to NT!"
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi
+
+- type: entity
+  parent: BaseItem
+  id: LGBTQHandyFlag
+  name: LGBTQ handheld flag
+  description: "The be gay do crime handy flag."
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi
+
+- type: entity
+  parent: BaseItem
+  id: PirateHandyFlag
+  name: Pirate handheld flag
+  description: "Holding it in your hands, show these carp that you're not kidding."
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/Handy_Flags/pirate_handy_flag.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Misc/Handy_Flags/pirate_handy_flag.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
new file mode 100644 (file)
index 0000000..96204c3
--- /dev/null
@@ -0,0 +1,55 @@
+- type: entity
+  parent: BaseSign
+  id: BaseFlag
+  abstract: true
+  components:
+  - type: WallMount
+    arc: 360
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Wallmounts/flags.rsi
+
+- type: entity
+  parent: BaseFlag
+  id: BlankFlag
+  name: blank flag
+  description: "Some piece of white cloth. Definitely not the flag of France."
+  components:
+  - type: Sprite
+    state: blank_flag
+
+- type: entity
+  parent: BaseFlag
+  id: NTFlag
+  name: Nanotrasen flag
+  description: "Glory to NT! Wait, they really made a flag for a corporation?"
+  components:
+  - type: Sprite
+    state: NT_flag
+
+- type: entity
+  parent: BaseFlag
+  id: SyndieFlag
+  name: Syndicate flag
+  description: "Smells bloody. Death to NT!"
+  components:
+  - type: Sprite
+    state: syndie_flag
+    
+- type: entity
+  parent: BaseFlag
+  id: LGBTQFlag
+  name: LGBTQ flag
+  description: "Be gay do crime flag"
+  components:
+  - type: Sprite
+    state: lgbtq_flag
+    
+- type: entity
+  parent: BaseFlag
+  id: PirateFlag
+  name: Pirate flag
+  description: "Raise the jolly roger, scallywags!"
+  components:
+  - type: Sprite
+    state: pirate_flag
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/icon.png
new file mode 100644 (file)
index 0000000..647b116
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..4355065
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7200c69
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/NT_handy_flag.rsi/meta.json
new file mode 100644 (file)
index 0000000..7fc21e6
--- /dev/null
@@ -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
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/icon.png
new file mode 100644 (file)
index 0000000..5ddc8ef
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..1863e62
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2963932
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/blank_handy_flag.rsi/meta.json
new file mode 100644 (file)
index 0000000..7fc21e6
--- /dev/null
@@ -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
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png
new file mode 100644 (file)
index 0000000..ff4e3eb
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..63005e5
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..fbdf7c7
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/meta.json
new file mode 100644 (file)
index 0000000..7fc21e6
--- /dev/null
@@ -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
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/icon.png
new file mode 100644 (file)
index 0000000..b6b4b46
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..2a6fc30
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..b00d5c8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/pirate_handy_flag.rsi/meta.json
new file mode 100644 (file)
index 0000000..7fc21e6
--- /dev/null
@@ -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
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/icon.png
new file mode 100644 (file)
index 0000000..aba18d4
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..6196478
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..5ec9f14
Binary files /dev/null and b/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/meta.json b/Resources/Textures/Objects/Misc/Handy_Flags/syndie_handy_flag.rsi/meta.json
new file mode 100644 (file)
index 0000000..7fc21e6
--- /dev/null
@@ -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
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/NT_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/NT_flag.png
new file mode 100644 (file)
index 0000000..11c0a0c
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/flags.rsi/NT_flag.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/blank_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/blank_flag.png
new file mode 100644 (file)
index 0000000..4a099fa
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/flags.rsi/blank_flag.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png
new file mode 100644 (file)
index 0000000..36237bb
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/flags.rsi/lgbtq_flag.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/flags.rsi/meta.json
new file mode 100644 (file)
index 0000000..36d69f0
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Derived by sprites from tgstation at https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 and adapted by Saveliy360",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "blank_flag"
+    },
+    {
+      "name": "NT_flag"
+    },
+    {
+      "name": "syndie_flag"
+    },
+    {
+      "name": "lgbtq_flag"
+    },
+    {
+      "name": "pirate_flag"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/pirate_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/pirate_flag.png
new file mode 100644 (file)
index 0000000..0648331
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/flags.rsi/pirate_flag.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/flags.rsi/syndie_flag.png b/Resources/Textures/Structures/Wallmounts/flags.rsi/syndie_flag.png
new file mode 100644 (file)
index 0000000..cac0a5f
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/flags.rsi/syndie_flag.png differ