diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml index 4a18149d5c..fd06120419 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml @@ -37,3 +37,33 @@ interfaces: - key: enum.NukeUiKey.Key type: NukeBoundUserInterface + +- type: entity + parent: StorageTank + id: NuclearBombKeg + name: nuclear fission explosive + suffix: keg + description: You probably shouldn't stick around to see if this is armed. It has a tap on the side. + components: + - type: Sprite + sprite: Objects/Devices/nuke.rsi + netsync: false + state: nuclearbomb_base + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.45 + mass: 150 + layer: + - SmallImpassable + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: NuclearCola + Quantity: 3000 + - type: ReagentTank + transferAmount: 100 diff --git a/Resources/Prototypes/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml new file mode 100644 index 0000000000..1f6059aef5 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Decoration/banners.yml @@ -0,0 +1,137 @@ +- type: entity + id: BannerBase + parent: BaseStructureDynamic + name: base banner + description: It is the concept of a banner, you shouldn't be seeing this. + abstract: true + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner + netsync: false + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeCircle + radius: 0.2 + mass: 25 + mask: + - SmallImpassable + - VaultImpassable + layer: + - Opaque + - MobImpassable + - SmallImpassable + - VaultImpassable + +- type: entity + id: BannerNanotrasen + parent: BannerBase + name: nanotrasen banner + description: It is a banner displaying the Nanotrasen logo. It looks rather cheap. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner + +- type: entity + id: BannerCargo + parent: BannerBase + name: cargo banner + description: It is a banner displaying the colors of the cargo department. Not. Cargonia. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner_cargo + +- type: entity + id: BannerEngineering + parent: BannerBase + name: engineering banner + description: It is a banner displaying the colors of the engineering deparment. Scrungularty. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner_engineering + +- type: entity + id: BannerMedical + parent: BannerBase + name: medical banner + description: It is a banner displaying the colors of the medical deparment. How sterile. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner_medical + +- type: entity + id: BannerRevolution + parent: BannerBase + name: revolution banner + description: It is a banner displaying revolution. Viva! + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner_revolution + +- type: entity + id: BannerScience + parent: BannerBase + name: science banner + description: It is a banner displaying the colors of the science department. Where stupidity is proven greater than the universe. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner_science + +- type: entity + id: BannerSecurity + parent: BannerBase + name: security banner + description: It is a banner displaying the colors of the shitcurity department. Security, my bad. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner_security + +- type: entity + id: BannerBlue + parent: BannerBase + name: blue banner + description: It is a banner displaying the color blue. Dabudidabudai. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner-blue + +- type: entity + id: BannerRed + parent: BannerBase + name: red banner + description: It is a banner displaying the color red. The edgy one. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner-red + +- type: entity + id: BannerYellow + parent: BannerBase + name: yellow banner + description: It is a banner displaying the color yellow. Reminds you of ducks and lemon stands. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner-yellow + +- type: entity + id: BannerGreen + parent: BannerBase + name: green banner + description: It is a banner displaying the color green. Grass, leaves, guacamole. + components: + - type: Sprite + sprite: Structures/Decoration/banner.rsi + state: banner-green + + diff --git a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml new file mode 100644 index 0000000000..5a12163831 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml @@ -0,0 +1,39 @@ +- type: entity + id: ShowcaseRobot + parent: BaseStructure + name: security robot showcase + description: It is an unfunctional replica of an old security robot. + components: + - type: Sprite + sprite: Structures/Decoration/showcase.rsi + state: showcase_1 + +- type: entity + id: ShowcaseRobotWhite + parent: BaseStructure + name: white robot showcase + description: It is an unfunctional replica of an old robot. + components: + - type: Sprite + sprite: Structures/Decoration/showcase.rsi + state: showcase_2 + +- type: entity + id: ShowcaseRobotAntique + parent: BaseStructure + name: cargo robot showcase + description: It is an unfunctional replica of an old cargo robot. + components: + - type: Sprite + sprite: Structures/Decoration/showcase.rsi + state: showcase_3 + +- type: entity + id: ShowcaseRobotMarauder + parent: BaseStructure + name: marauder showcase + description: It is an unfunctional replica of a marauder, painted green. + components: + - type: Sprite + sprite: Structures/Decoration/showcase.rsi + state: showcase_4 diff --git a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml new file mode 100644 index 0000000000..7cae407769 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml @@ -0,0 +1,25 @@ +- type: entity + id: StatueVenusRed + parent: BaseStructure + name: statue of a pure maiden + suffix: Red + description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a red toolbox. + components: + - type: Sprite + sprite: Structures/Decoration/statues.rsi + state: venus_red + drawdepth: Mobs + offset: "0.0,0.5" + +- type: entity + id: StatueVenusBlue + parent: BaseStructure + name: statue of a pure maiden + suffix: Blue + description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a blue toolbox. + components: + - type: Sprite + sprite: Structures/Decoration/statues.rsi + state: venus_blue + drawdepth: Mobs + offset: "0.0,0.5" diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 42f6f61248..22c7a91bc7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -104,7 +104,7 @@ visuals: - type: ComputerVisualizer key: security_key - screen: security + screen: explosive - type: PointLight radius: 1.5 energy: 1.6 diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-blue.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-blue.png new file mode 100644 index 0000000000..724dd1ea24 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-blue.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-green.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-green.png new file mode 100644 index 0000000000..a0c89e4bfc Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-green.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-red.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-red.png new file mode 100644 index 0000000000..82af96018c Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-red.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner-yellow.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner-yellow.png new file mode 100644 index 0000000000..0069be618d Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner-yellow.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner.png new file mode 100644 index 0000000000..8daa67ae23 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png new file mode 100644 index 0000000000..ff808bbc8b Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_cargo.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png new file mode 100644 index 0000000000..da76b044c1 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_engineering.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png new file mode 100644 index 0000000000..5bbd100773 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_medical.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_revolution.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_revolution.png new file mode 100644 index 0000000000..fd97a4b39d Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_revolution.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png new file mode 100644 index 0000000000..8ae607cdcd Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_science.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png b/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png new file mode 100644 index 0000000000..42114c515b Binary files /dev/null and b/Resources/Textures/Structures/Decoration/banner.rsi/banner_security.png differ diff --git a/Resources/Textures/Structures/Decoration/banner.rsi/meta.json b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json new file mode 100644 index 0000000000..f9fb3f5839 --- /dev/null +++ b/Resources/Textures/Structures/Decoration/banner.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/fa9e44d937026d5a2ba72615afccf2f18a87c485", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "banner" + }, + { + "name": "banner-red" + }, + { + "name": "banner-blue" + }, + { + "name": "banner-yellow" + }, + { + "name": "banner-green" + }, + { + "name": "banner_engineering" + }, + { + "name": "banner_medical" + }, + { + "name": "banner_science" + }, + { + "name": "banner_cargo" + }, + { + "name": "banner_security" + }, + { + "name": "banner_revolution" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Decoration/showcase.rsi/meta.json b/Resources/Textures/Structures/Decoration/showcase.rsi/meta.json new file mode 100644 index 0000000000..855b519aec --- /dev/null +++ b/Resources/Textures/Structures/Decoration/showcase.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/240aadc41d3555fabfe9875b9ee0c3fc3a19062a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "showcase_1" + }, + { + "name": "showcase_2", + "delays": [ + [ + 25.5, + 0.1 + ] + ] + }, + { + "name": "showcase_3" + }, + { + "name": "showcase_4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_1.png b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_1.png new file mode 100644 index 0000000000..ded4402639 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_1.png differ diff --git a/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_2.png b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_2.png new file mode 100644 index 0000000000..4ad933c2f4 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_2.png differ diff --git a/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_3.png b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_3.png new file mode 100644 index 0000000000..720ab5e8ac Binary files /dev/null and b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_3.png differ diff --git a/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_4.png b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_4.png new file mode 100644 index 0000000000..b93b3bc095 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/showcase.rsi/showcase_4.png differ diff --git a/Resources/Textures/Structures/Decoration/statues.rsi/meta.json b/Resources/Textures/Structures/Decoration/statues.rsi/meta.json new file mode 100644 index 0000000000..b8159cfb47 --- /dev/null +++ b/Resources/Textures/Structures/Decoration/statues.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/commit/2bb568bf2beddeee5f1f28cbc1e15bdcfb2e2cb0", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "venus_blue" + }, + { + "name": "venus_red" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Decoration/statues.rsi/venus_blue.png b/Resources/Textures/Structures/Decoration/statues.rsi/venus_blue.png new file mode 100644 index 0000000000..aab57420f5 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/statues.rsi/venus_blue.png differ diff --git a/Resources/Textures/Structures/Decoration/statues.rsi/venus_red.png b/Resources/Textures/Structures/Decoration/statues.rsi/venus_red.png new file mode 100644 index 0000000000..c2f2017d1b Binary files /dev/null and b/Resources/Textures/Structures/Decoration/statues.rsi/venus_red.png differ