diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl index 240f89260a2..c9c5d2fbf4b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl @@ -1,2 +1,4 @@ ent-ADTDrinkNoStopCan = Банка энергетика NoStop .desc = Натуральный энергетический напиток, в нем нет сахара! +ent-ADTDrinkBeerCanPack = держатель банок для пива + .desc = Служит для удобного хранения сразу нескольких банок пива. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl index 5f7b82afba7..2b117452f0b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl @@ -21,3 +21,15 @@ ent-ADTVendingMachineCiviMedVend = ГраждоМед ent-ADTIceCreamVendInventory = Морожемат .desc = Смотри, смотри! Это мороженщик! + +ent-ADTVendingMachineSnackFree = Getmore Chocolate Corp + .suffix = Бесплатный + .desc = Автомат с закусками, предоставленный корпорацией Getmore Chocolate, базирующейся на Марсе. + +ent-ADTVendingMachineGamesFree = Безобидные развлечения + .suffix = Бесплатный + .desc = Выдаёт вещи, которые капитан и глава персонала, скорее всего, не оценят, если вы будете развлекаться с ними вместо своей работы... + +ent-ADTVendingMachineCoffeeFree = Лучшие горячие напитки Солнечной + .suffix = Бесплатный + .desc = Подаются кипящими, чтобы оставались горячими всю смену! diff --git a/Resources/Prototypes/ADT/Decals/concrete_trim.yml b/Resources/Prototypes/ADT/Decals/concrete_trim.yml new file mode 100644 index 00000000000..c5f97ecbe46 --- /dev/null +++ b/Resources/Prototypes/ADT/Decals/concrete_trim.yml @@ -0,0 +1,6 @@ +- type: decal + id: ADTWhiteConcreteTrimBox + tags: ["planet", "markings"] + sprite: + sprite: ADT/Decals/concretetrim.rsi + state: whiteconcrete_box diff --git a/Resources/Prototypes/ADT/Decals/markings.yml b/Resources/Prototypes/ADT/Decals/markings.yml new file mode 100644 index 00000000000..c3b8dcb4609 --- /dev/null +++ b/Resources/Prototypes/ADT/Decals/markings.yml @@ -0,0 +1,247 @@ +- type: decal + id: ADTArrowsWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: arrows_whitescale + +- type: decal + id: ADTBotWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: bot_whitescale + +- type: decal + id: ADTBotLeftWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: bot_left_whitescale + +- type: decal + id: ADTBotRightWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: bot_right_whitescale + +- type: decal + id: ADTCautionWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: caution_whitescale + +- type: decal + id: ADTDeliveryWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: delivery_whitescale + +- type: decal + id: ADTLoadingAreaWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: loading_area_whitescale + +- type: decal + id: ADTStandClearWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: standclear_whitescale + +- type: decal + id: ADTWarnBoxWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_box_whitescale + +- type: decal + id: ADTWarnEndWhitescale + showMenu: false + tags: ["station", "markings"] + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_end_whitescale + +- type: decal + id: ADTWarnFullWhitescale + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_full_whitescale + +- type: decal + id: ADTWarningLineWhitescale + showMenu: false + tags: ["station", "markings"] + sprite: + sprite: ADT/Decals/markings.rsi + state: warningline_whitescale + +- type: decal + id: ADTWarningLineCornerFlippedWhitescale + showMenu: false + tags: ["station", "markings"] + sprite: + sprite: ADT/Decals/markings.rsi + state: warninglinecorner_flipped_whitescale + +- type: decal + id: ADTWarnCornerWhitescale + showMenu: false + tags: ["station", "markings"] + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_whitescale + +- type: decal + id: ADTWarnCornerFlippedWhitescale + showMenu: false + tags: ["station", "markings"] + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_flipped_whitescale + +- type: decal + id: ADTWarnCornerWhitescaleNE + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_whitescale_ne + +- type: decal + id: ADTWarnCornerWhitescaleNW + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_whitescale_nw + +- type: decal + id: ADTWarnCornerWhitescaleSE + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_whitescale_se + +- type: decal + id: ADTWarnCornerWhitescaleSW + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_whitescale_sw + +- type: decal + id: ADTWarnCornerSmallWhitescaleNE + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_small_whitescale_ne + +- type: decal + id: ADTWarnCornerSmallWhitescaleNW + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_small_whitescale_nw + +- type: decal + id: ADTWarnCornerSmallWhitescaleSE + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_small_whitescale_se + +- type: decal + id: ADTWarnCornerSmallWhitescaleSW + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_corner_small_whitescale_sw + +- type: decal + id: ADTWarnEndWhitescaleE + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_end_whitescale_e + +- type: decal + id: ADTWarnEndWhitescaleN + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_end_whitescale_n + +- type: decal + id: ADTWarnEndWhitescaleS + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_end_whitescale_s + +- type: decal + id: ADTWarnEndWhitescaleW + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_end_whitescale_w + +- type: decal + id: ADTWarnLineWhitescaleE + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_line_whitescale_e + +- type: decal + id: ADTWarnLineWhitescaleN + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_line_whitescale_n + +- type: decal + id: ADTWarnLineWhitescaleS + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_line_whitescale_s + +- type: decal + id: ADTWarnLineWhitescaleW + tags: ["station", "markings"] + defaultCustomColor: true + sprite: + sprite: ADT/Decals/markings.rsi + state: warn_line_whitescale_w diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/diona.yml index 3049fd1650a..e53f970ee5b 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/diona.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/diona.yml @@ -1,6 +1,6 @@ - type: marking id: ADTDionaTreePaintOverlay - bodyPart: LLeg + bodyPart: [ RFoot, LFoot] markingCategory: Overlay speciesRestriction: [Diona] # coloring: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 1d17e418785..b466265e947 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -13,3 +13,56 @@ Quantity: 30 - type: Sprite sprite: ADT/Objects/Consumable/Drinks/nostop.rsi + +- type: entity + id: ADTDrinkBeerCanPack + parent: BaseStorageItem + name: 6pack + components: + - type: Sprite + sprite: ADT/Objects/Misc/6pack_beer.rsi + layers: + - state: plastic-thingy + - state: 6pack1 + map: ["6pack1"] + visible: false + - state: 6pack2 + map: ["6pack2"] + visible: false + - state: 6pack3 + map: ["6pack3"] + visible: false + - state: 6pack4 + map: ["6pack4"] + visible: false + - state: 6pack5 + map: ["6pack5"] + visible: false + - state: 6pack6 + map: ["6pack6"] + visible: false + - type: Item + size: Normal + - type: Storage + grid: + - 0,0,2,3 + whitelist: + tags: + - ADTBeerCan + hideStackVisualsWhenClosed: false + - type: StorageFill + contents: + - id: DrinkBeerCan + amount: 6 + - type: ItemCounter + count: + tags: [ADTBeerCan] + composite: true + layerStates: + - 6pack1 + - 6pack2 + - 6pack3 + - 6pack4 + - 6pack5 + - 6pack6 + - type: Appearance diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml index 4571edbb572..05537a320db 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml @@ -270,3 +270,60 @@ energy: 1.6 color: "#9dc5c9" +#Бесплатные версии торгоматов +- type: entity + parent: VendingMachineCoffee + id: ADTVendingMachineCoffeeFree + name: Solar's Best Hot Drinks + description: Served boiling so it stays hot all shift! + suffix: Free + components: + - type: VendingMachine + pack: HotDrinksMachineInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + screenState: screen + ejectDelay: 5 + soundVend: /Audio/Machines/machine_vend_hot_drink.ogg + initialStockQuality: 0.33 + allForFree: true # ADT-Economy + +- type: entity + parent: VendingMachineGames + id: ADTVendingMachineGamesFree + name: Good Clean Fun + description: Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job... + suffix: Free + components: + - type: VendingMachine + pack: GoodCleanFunInventory + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + ejectDelay: 1.8 + allForFree: true # ADT-Economy + +- type: entity + parent: VendingMachineSnack + id: ADTVendingMachineSnackFree + name: Getmore Chocolate Corp + description: A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars. + suffix: Free + components: + - type: VendingMachine + pack: GetmoreChocolateCorpInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + initialStockQuality: 0.33 + allForFree: true # ADT-Economy diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index 59a2ed9b38f..9f0eb2c5542 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -159,3 +159,6 @@ - type: Tag id: ADTCandies + +- type: Tag + id: ADTBeerCan diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index f5b733d37b1..f85d4fafe95 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -510,6 +510,7 @@ - type: Tag tags: - Beer + - ADTBeerCan #ADTTweak - type: entity parent: DrinkCanBaseFull diff --git a/Resources/Textures/ADT/Decals/concretetrim.rsi/meta.json b/Resources/Textures/ADT/Decals/concretetrim.rsi/meta.json new file mode 100644 index 00000000000..4093a029562 --- /dev/null +++ b/Resources/Textures/ADT/Decals/concretetrim.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14 and modified by Lost Paradise MRP.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "whiteconcrete_box" + } + ] +} diff --git a/Resources/Textures/ADT/Decals/concretetrim.rsi/whiteconcrete_box.png b/Resources/Textures/ADT/Decals/concretetrim.rsi/whiteconcrete_box.png new file mode 100644 index 00000000000..e98d4bdb8df Binary files /dev/null and b/Resources/Textures/ADT/Decals/concretetrim.rsi/whiteconcrete_box.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/arrows_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/arrows_whitescale.png new file mode 100644 index 00000000000..f4fa7dc44b0 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/arrows_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/bot_left_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/bot_left_whitescale.png new file mode 100644 index 00000000000..ad890aa6a88 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/bot_left_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/bot_right_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/bot_right_whitescale.png new file mode 100644 index 00000000000..6fb9bd43696 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/bot_right_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/bot_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/bot_whitescale.png new file mode 100644 index 00000000000..7954808d1d1 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/bot_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/caution_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/caution_whitescale.png new file mode 100644 index 00000000000..62b2fd16987 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/caution_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/delivery_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/delivery_whitescale.png new file mode 100644 index 00000000000..437f6034729 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/delivery_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/loading_area_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/loading_area_whitescale.png new file mode 100644 index 00000000000..58f10fcbb74 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/loading_area_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/meta.json b/Resources/Textures/ADT/Decals/markings.rsi/meta.json new file mode 100644 index 00000000000..cf6e870ac55 --- /dev/null +++ b/Resources/Textures/ADT/Decals/markings.rsi/meta.json @@ -0,0 +1,104 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tgstation at 606005645d3a14c4439e5ce14785650121b22678 and modified by Lost Paradise MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "arrows_whitescale" + }, + { + "name": "bot_whitescale" + }, + { + "name": "bot_left_whitescale" + }, + { + "name": "bot_right_whitescale" + }, + { + "name": "caution_whitescale" + }, + { + "name": "delivery_whitescale" + }, + { + "name": "loading_area_whitescale" + }, + { + "name": "standclear_whitescale" + }, + { + "name": "warn_box_whitescale" + }, + { + "name": "warn_end_whitescale" + }, + { + "name": "warn_full_whitescale" + }, + { + "name": "warningline_whitescale" + }, + { + "name": "warninglinecorner_flipped_whitescale" + }, + { + "name": "warn_corner_whitescale" + }, + { + "name": "warn_corner_flipped_whitescale" + }, + { + "name": "warn_corner_whitescale_ne" + }, + { + "name": "warn_corner_whitescale_nw" + }, + { + "name": "warn_corner_whitescale_se" + }, + { + "name": "warn_corner_whitescale_sw" + }, + { + "name": "warn_corner_small_whitescale_ne" + }, + { + "name": "warn_corner_small_whitescale_nw" + }, + { + "name": "warn_corner_small_whitescale_se" + }, + { + "name": "warn_corner_small_whitescale_sw" + }, + { + "name": "warn_end_whitescale_e" + }, + { + "name": "warn_end_whitescale_n" + }, + { + "name": "warn_end_whitescale_s" + }, + { + "name": "warn_end_whitescale_w" + }, + { + "name": "warn_line_whitescale_e" + }, + { + "name": "warn_line_whitescale_n" + }, + { + "name": "warn_line_whitescale_s" + }, + { + "name": "warn_line_whitescale_w" + } + ] +} diff --git a/Resources/Textures/ADT/Decals/markings.rsi/standclear_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/standclear_whitescale.png new file mode 100644 index 00000000000..e6a9451714b Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/standclear_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_box_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_box_whitescale.png new file mode 100644 index 00000000000..ab5284bd0f9 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_box_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_flipped_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_flipped_whitescale.png new file mode 100644 index 00000000000..653220ae6c5 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_flipped_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_ne.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_ne.png new file mode 100644 index 00000000000..8a7407e43d8 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_ne.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_nw.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_nw.png new file mode 100644 index 00000000000..fbf31be6c9c Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_nw.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_se.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_se.png new file mode 100644 index 00000000000..24f554361c6 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_se.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_sw.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_sw.png new file mode 100644 index 00000000000..0c4c4789f55 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_small_whitescale_sw.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale.png new file mode 100644 index 00000000000..4555cee67cc Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_ne.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_ne.png new file mode 100644 index 00000000000..40fe1e04eeb Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_ne.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_nw.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_nw.png new file mode 100644 index 00000000000..b3af59c3b13 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_nw.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_se.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_se.png new file mode 100644 index 00000000000..b87ec5ac93f Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_se.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_sw.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_sw.png new file mode 100644 index 00000000000..35f792a5b3f Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_corner_whitescale_sw.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale.png new file mode 100644 index 00000000000..bae292267e1 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_e.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_e.png new file mode 100644 index 00000000000..052a91365ef Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_e.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_n.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_n.png new file mode 100644 index 00000000000..120eea4ba4f Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_n.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_s.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_s.png new file mode 100644 index 00000000000..bc863e521be Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_s.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_w.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_w.png new file mode 100644 index 00000000000..76c419b4712 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_end_whitescale_w.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_full_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_full_whitescale.png new file mode 100644 index 00000000000..33503ecbd4e Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_full_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_e.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_e.png new file mode 100644 index 00000000000..95da1ee44b5 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_e.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_n.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_n.png new file mode 100644 index 00000000000..502eae95493 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_n.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_s.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_s.png new file mode 100644 index 00000000000..6b7425f9481 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_s.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_w.png b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_w.png new file mode 100644 index 00000000000..3a5fc82d9bc Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warn_line_whitescale_w.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warningline_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/warningline_whitescale.png new file mode 100644 index 00000000000..abe665bc517 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warningline_whitescale.png differ diff --git a/Resources/Textures/ADT/Decals/markings.rsi/warninglinecorner_flipped_whitescale.png b/Resources/Textures/ADT/Decals/markings.rsi/warninglinecorner_flipped_whitescale.png new file mode 100644 index 00000000000..767a6eae233 Binary files /dev/null and b/Resources/Textures/ADT/Decals/markings.rsi/warninglinecorner_flipped_whitescale.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack1.png b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack1.png new file mode 100644 index 00000000000..6a2b9f50b86 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack2.png b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack2.png new file mode 100644 index 00000000000..2421c44b54b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack3.png b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack3.png new file mode 100644 index 00000000000..ed994761044 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack4.png b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack4.png new file mode 100644 index 00000000000..ceef6de5f09 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack4.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack5.png b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack5.png new file mode 100644 index 00000000000..495b9b19989 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack5.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack6.png b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack6.png new file mode 100644 index 00000000000..b29c7a238aa Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/6pack6.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/meta.json new file mode 100644 index 00000000000..8d03e35183b --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Qti for Adventure Time MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "6pack1" + }, + { + "name": "6pack2" + }, + { + "name": "6pack3" + }, + { + "name": "6pack4" + }, + { + "name": "6pack5" + }, + { + "name": "6pack6" + }, + { + "name": "plastic-thingy" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/plastic-thingy.png b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/plastic-thingy.png new file mode 100644 index 00000000000..8dbcee66bb9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/6pack_beer.rsi/plastic-thingy.png differ