diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Wallmount/noticeboard.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Wallmount/noticeboard.yml new file mode 100644 index 00000000000..ca721b3a7ec --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Wallmount/noticeboard.yml @@ -0,0 +1,63 @@ +- type: entity + id: N14NoticeBoard + name: notice board + description: Something important to post? + placement: + mode: SnapgridCenter + components: + - type: WallMount + - type: Sprite + sprite: _Nuclear14/Structures/Wallmounts/noticeboard.rsi + layers: + - state: noticeboard + - state: notice-0 + - map: ["enum.StorageFillLayers.Fill"] + - type: StorageFillVisualizer + maxFillLevels: 6 + fillBaseName: notice + - type: Appearance + - type: InteractionOutline + - type: Clickable + - type: Transform + anchored: true + - type: Damageable + damageModifierSet: Wood + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 30 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Storage + grid: + - 0,0,4,3 + maxItemSize: Small + whitelist: + tags: + - Folder + - Document + - Write + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: Tag + tags: + - Wooden + - type: Construction + graph: NoticeBoard + node: noticeBoard diff --git a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml index 917c4999aaa..052a5d7903c 100644 --- a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml +++ b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml @@ -1701,6 +1701,45 @@ heatCapacity: 10000 weather: true +- type: tile + id: N14FloorRoadInnerMiddleWithTop + name: road inner middle with top + sprite: /Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + +- type: tile + id: N14FloorRoadOuterTurnSouthTop + name: road outer turn south top + sprite: /Textures/_Nuclear14/Tiles/roadouterturnstop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + +- type: tile + id: N14FloorRoadOuterTurnWestTop + name: road outer turn west top + sprite: /Textures/_Nuclear14/Tiles/roadouterturnwtop.png + baseTurf: FloorWasteland + isSubfloor: true + footstepSounds: + collection: FootstepFloor + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true + # Wasteland - type: tile id: FloorWasteland @@ -1865,4 +1904,21 @@ thermalConductivity: 0.4 heatCapacity: 700000 weather: true + indestructible: true + + # Swampland +- type: tile + id: FloorSwampland + name: swampland + sprite: /Textures/_Nuclear14/Tiles/swampland.png + variants: 4 + placementVariants: [0, 1, 2, 3] + baseTurf: space + isSubfloor: true + footstepSounds: + collection: N14FootstepWater + friction: 0.30 + thermalConductivity: 0.04 + heatCapacity: 10000 + weather: true indestructible: true \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill1.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill1.png index dfb7055d2bf..183523659d8 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill1.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill2.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill2.png index 600ae5e7a57..fc795889d7c 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill2.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill3.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill3.png index eea88e58b58..241becf05b2 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill3.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill4.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill4.png index 36d9bd8aa73..9eed99f7d23 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill4.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill4.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill5.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill5.png index 0bb9ff1205f..044eb48d69e 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill5.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill5.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill6.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill6.png index 01a1959447d..8ec0c2d3394 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill6.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/fill6.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon.png index 350380a11f3..266df54549a 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon_open.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon_open.png index edcdb307428..2f9980d1eb8 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon_open.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/cream.rsi/icon_open.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill1.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill1.png index a6179de0a7a..183523659d8 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill1.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill1.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill2.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill2.png index 826327b7532..fc795889d7c 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill2.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill2.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill3.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill3.png index 32a3c1d767d..241becf05b2 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill3.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill3.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill4.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill4.png index 6289be46d9c..9eed99f7d23 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill4.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill4.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill5.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill5.png index fbeaca5dc78..044eb48d69e 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill5.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill5.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill6.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill6.png index d199606fbba..8ec0c2d3394 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill6.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/fill6.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon.png index b5b47ddf173..f91b8f23710 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon_open.png b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon_open.png index d61511604eb..b8a2d8092d7 100644 Binary files a/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon_open.png and b/Resources/Textures/_Nuclear14/Objects/Consumable/Drinks/milk.rsi/icon_open.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-bottom.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-bottom.png index d0bcc098384..7238770a79d 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-bottom.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-bottom.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-top.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-top.png index 5cf22c85ed2..ec6e93b6273 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-top.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-left-top.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-bottom.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-bottom.png index 655fe5d65fb..7dd8f8fcbb8 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-bottom.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-bottom.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-top.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-top.png index 575faa25d1d..793db233c39 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-top.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/junction-right-top.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/rails.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/rails.png index a417b49cefd..96028b3149c 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/rails.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/rails.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NE.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NE.png index 6727467f61d..c90bd0e1810 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NE.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NE.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NW.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NW.png index ab79d3e1a0a..67197f64e41 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NW.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-NW.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-SE.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-SE.png index 579e5e6ae2e..c9ae45f2633 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-SE.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-SE.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-WS.png b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-WS.png index 2e975355c97..1099423275f 100644 Binary files a/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-WS.png and b/Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi/turn-WS.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/meta.json new file mode 100644 index 00000000000..0e9dc64e4bf --- /dev/null +++ b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "created by maxxorion", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "noticeboard" + }, + { + "name": "notice-0" + }, + { + "name": "notice-1" + }, + { + "name": "notice-2" + }, + { + "name": "notice-3" + }, + { + "name": "notice-4" + }, + { + "name": "notice-5" + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-0.png b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-0.png new file mode 100644 index 00000000000..016d8ba5a76 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-0.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-1.png b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-1.png new file mode 100644 index 00000000000..61b1825a415 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-1.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-2.png b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-2.png new file mode 100644 index 00000000000..d069eef5e94 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-2.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-3.png b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-3.png new file mode 100644 index 00000000000..7e4ac447be9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-3.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-4.png b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-4.png new file mode 100644 index 00000000000..f3ddba1d006 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-4.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-5.png b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-5.png new file mode 100644 index 00000000000..e04a0eb63f4 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/notice-5.png differ diff --git a/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/noticeboard.png b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/noticeboard.png new file mode 100644 index 00000000000..8339a787dcb Binary files /dev/null and b/Resources/Textures/_Nuclear14/Structures/Wallmounts/noticeboard.rsi/noticeboard.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/attributions.yml b/Resources/Textures/_Nuclear14/Tiles/attributions.yml index 9dabf79c982..68558b3e7a6 100644 --- a/Resources/Textures/_Nuclear14/Tiles/attributions.yml +++ b/Resources/Textures/_Nuclear14/Tiles/attributions.yml @@ -36,3 +36,8 @@ license: "CC-BY-NC-SA-3.0" copyright: "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/ddd7f6a0b7a1b2758c0f9dfff09974854e3ef7ed" source: "https://github.com/goonstation/goonstation" + +- files: ["swampland.png", "roadinnermiddlewithtop", "roadouterturnstop", "roadouterturnwtop"] + license: "CC-BY-NC-SA-3.0" + copyright: "Taken from wasteland at commit 6d346b9a8a1821fbe0a8bb3ac8d358ebcb266e53, swampland, roadinnermiddlewithtop, roadouterturnstop, roadouterturnwtop by maxxorion" + source: "https://github.com/Vault-Overseers/nuclear-14" \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png b/Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png new file mode 100644 index 00000000000..d2c497d5080 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturnstop.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturnstop.png new file mode 100644 index 00000000000..09bb37d79cc Binary files /dev/null and b/Resources/Textures/_Nuclear14/Tiles/roadouterturnstop.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png b/Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png new file mode 100644 index 00000000000..97c178fa3d5 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Tiles/roadouterturnwtop.png differ diff --git a/Resources/Textures/_Nuclear14/Tiles/swampland.png b/Resources/Textures/_Nuclear14/Tiles/swampland.png new file mode 100644 index 00000000000..91f0446349b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Tiles/swampland.png differ