diff --git a/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl b/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl index 36c7db9a346..0079685cb06 100644 --- a/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl +++ b/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl @@ -1,4 +1,4 @@ -warp-point-evac = Evac +warp-point-evacshuttle = Evac Shuttle warp-point-shuttle = Shuttle warp-point-debris = Space Debris warp-point-ruin = Space Ruin diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/warp_points.yml b/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml similarity index 77% rename from Resources/Prototypes/DeltaV/Entities/Markers/warp_points.yml rename to Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml index 90c18670f0f..e2fec5fa00d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/warp_points.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml @@ -5,7 +5,7 @@ suffix: Evac Shuttle components: - type: WarpPoint - location: warp-point-evac + location: Evac Shuttle - type: entity id: WarpPointShuttle @@ -13,7 +13,7 @@ suffix: Shuttle components: - type: WarpPoint - location: warp-point-shuttle + location: Shuttle - type: entity id: WarpPointDebris @@ -21,7 +21,7 @@ suffix: Space Debris components: - type: WarpPoint - location: warp-point-debris + location: Space Debris - type: entity id: WarpPointRuin @@ -29,7 +29,7 @@ suffix: Space Ruin components: - type: WarpPoint - location: warp-point-ruin + location: Space Ruin # Command - type: entity @@ -38,7 +38,7 @@ suffix: Bridge components: - type: WarpPoint - location: warp-point-bridge + location: Bridge - type: entity id: WarpPointVault @@ -46,7 +46,7 @@ suffix: Vault components: - type: WarpPoint - location: warp-point-vault + location: Vault # Security - type: entity @@ -55,7 +55,7 @@ suffix: Security components: - type: WarpPoint - location: warp-point-sec + location: Security - type: entity id: WarpPointPerma @@ -63,7 +63,7 @@ suffix: Perma components: - type: WarpPoint - location: warp-point-perma + location: Perma - type: entity id: WarpPointDetective @@ -71,7 +71,7 @@ suffix: Detective components: - type: WarpPoint - location: warp-point-detective + location: Detective - type: entity id: WarpPointCourt @@ -79,7 +79,7 @@ suffix: Courtroom components: - type: WarpPoint - location: warp-point-court + location: Courtroom #Medical - type: entity @@ -88,7 +88,7 @@ suffix: Medical components: - type: WarpPoint - location: warp-point-medical + location: Medical - type: entity id: WarpPointMorgue @@ -96,7 +96,7 @@ suffix: Morgue components: - type: WarpPoint - location: warp-point-morgue + location: Morgue #Epistemics - type: entity @@ -105,7 +105,7 @@ suffix: Epistemics components: - type: WarpPoint - location: warp-point-epistemics + location: Epistemics #Logistics - type: entity @@ -114,7 +114,7 @@ suffix: Logistics components: - type: WarpPoint - location: warp-point-logistics + location: Logistics - type: entity id: WarpPointSalvage @@ -122,7 +122,7 @@ suffix: Salvage components: - type: WarpPoint - location: warp-point-salvage + location: Salvage #Engineering - type: entity @@ -131,7 +131,7 @@ suffix: Engineering components: - type: WarpPoint - location: warp-point-engineering + location: Engineering - type: entity id: WarpPointSingulo @@ -139,7 +139,7 @@ suffix: Singularity components: - type: WarpPoint - location: warp-point-singularity + location: Singularity - type: entity id: WarpPointAtmos @@ -147,7 +147,7 @@ suffix: Atmos components: - type: WarpPoint - location: warp-point-atmospherics + location: Atmos #Service - type: entity @@ -156,7 +156,7 @@ suffix: HoP components: - type: WarpPoint - location: warp-point-hop + location: HoP - type: entity id: WarpPointKitchen @@ -164,7 +164,7 @@ suffix: Kitchen components: - type: WarpPoint - location: warp-point-kitchen + location: Kitchen - type: entity id: WarpPointBar @@ -172,7 +172,7 @@ suffix: Bar components: - type: WarpPoint - location: warp-point-bar + location: Bar - type: entity id: WarpPointBotany @@ -180,7 +180,7 @@ suffix: Botany components: - type: WarpPoint - location: warp-point-botany + location: Botany - type: entity id: WarpPointJanitor @@ -188,7 +188,7 @@ suffix: Janitor components: - type: WarpPoint - location: warp-point-janitor + location: Janitor - type: entity id: WarpPointReporter @@ -196,7 +196,7 @@ suffix: Reporter components: - type: WarpPoint - location: warp-point-reporter + location: Reporter - type: entity id: WarpPointLawyer @@ -204,7 +204,7 @@ suffix: Lawyer components: - type: WarpPoint - location: warp-point-lawyer + location: Lawyer #Misc - type: entity @@ -213,7 +213,7 @@ suffix: AI components: - type: WarpPoint - location: warp-point-ai + location: AI - type: entity id: WarpPointArrivals @@ -221,7 +221,7 @@ suffix: Arrivals components: - type: WarpPoint - location: warp-point-arrivals + location: Arrivals - type: entity id: WarpPointEvac @@ -229,7 +229,7 @@ suffix: Evac components: - type: WarpPoint - location: warp-point-evac + location: Evac - type: entity id: WarpPointCryo @@ -237,7 +237,7 @@ suffix: Cryo components: - type: WarpPoint - location: warp-point-cryo + location: Cryo - type: entity id: WarpPointChapel @@ -245,7 +245,7 @@ suffix: Chapel components: - type: WarpPoint - location: warp-point-chapel + location: Chapel - type: entity id: WarpPointLibrary @@ -253,7 +253,7 @@ suffix: Library components: - type: WarpPoint - location: warp-point-library + location: Library - type: entity id: WarpPointDorms @@ -261,7 +261,7 @@ suffix: Dorms components: - type: WarpPoint - location: warp-point-dorms + location: Dorms - type: entity id: WarpPointDisposals @@ -269,4 +269,4 @@ suffix: Disposals components: - type: WarpPoint - location: warp-point-disposals + location: Disposals diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml new file mode 100644 index 00000000000..1d0eb4e8506 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -0,0 +1,123 @@ +- type: entity + parent: DrinkBase + id: DrinkJuiceBoxBaseFull + abstract: true + components: + - type: Openable + sound: + collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯ + - type: Sealable + - type: SolutionContainerManager + solutions: + drink: + maxVol: 20 + - type: Item + size: Small + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:SpillBehavior { } + - !type:DoActsBehavior + acts: [ "Destruction" ] + #In future maybe add generic plastic scrap trash/debris + - type: TrashOnSolutionEmpty + solution: drink + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuiceOrangeJuicebox + name: orange juice box + description: A great source of vitamins. Stay healthy! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceOrange + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuicePineappleJuicebox + name: pineapple juice box + description: Everyone's favourite juice. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuicePineapple + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuiceAppleJuicebox + name: apple juice box + description: Sweet apple juice. Don't be late for school! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceApple + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkJuiceGrapeJuicebox + name: grape juice box + description: Tasty grape juice in a fun little container. Non-alcoholic! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceGrape + Quantity: 20 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi + +- type: entity + parent: DrinkJuiceBoxBaseFull + id: DrinkChocolateJuicebox + name: chocolate milk juice box + description: Tasty chocolate juice and milk in a small box. Contains Theobromine. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: HotCocoa + Quantity: 10 + - ReagentId: Milk # The milk of chocolate milk + Quantity: 10 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml index 99c5d49c1b2..46e689615b3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml @@ -11,7 +11,7 @@ - state: generic-open map: ["openLayer"] - type: Item - size: Normal + size: Large shape: null sprite: DeltaV/Objects/Storage/lunchbox.rsi heldPrefix: generic @@ -20,7 +20,7 @@ grid: - 0,0,1,1 - 3,0,1,1 - - 4,0,4,2 + - 4,0,4,1 - type: PhysicalComposition materialComposition: Plastic: 100 @@ -42,28 +42,74 @@ components: - type: StorageFill contents: + #Main - id: FoodPizzaArnoldSlice orGroup: HealthyOrUnhealthyMain - prob: 0.5 + prob: 0.2 amount: 2 - - id: FoodApple + - id: FoodBurgerCheese orGroup: HealthyOrUnhealthyMain - prob: 0.5 - - id: DrinkWaterBottleFull + prob: 0.2 + - id: FoodCarrot + orGroup: HealthyOrUnhealthyMain + prob: 0.2 + - id: FoodMothCapreseSalad + orGroup: HealthyOrUnhealthyMain + prob: 0.2 + - id: FoodEggBoiled + orGroup: HealthyOrUnhealthyMain + prob: 0.2 + #Drink + - id: DrinkJuiceOrangeJuicebox orGroup: HealthyOrUnhealthyDrink - prob: 0.5 - - id: DrinkCartonOrange + prob: 0.15 + - id: DrinkJuicePineappleJuicebox orGroup: HealthyOrUnhealthyDrink - prob: 0.5 + prob: 0.15 + - id: DrinkJuiceAppleJuicebox + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + - id: DrinkJuiceGrapeJuicebox + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + - id: DrinkChocolateJuicebox + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + - id: DrinkWaterBottleFull + orGroup: HealthyOrUnhealthyDrink + prob: 0.15 + #Snack - id: FoodSnackCheesie orGroup: HealthyOrUnhealthySnack - prob: 0.25 + prob: 0.15 + - id: FoodSnackBoritos + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + - id: FoodSnackChips + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + - id: FoodSnackPistachios + orGroup: HealthyOrUnhealthySnack + prob: 0.15 - id: FoodSnackChocolate orGroup: HealthyOrUnhealthySnack - prob: 0.25 - - id: FoodCarrot + prob: 0.15 + - id: FoodSnackSus orGroup: HealthyOrUnhealthySnack - prob: 0.5 + prob: 0.15 + - id: FoodMothMoffin + orGroup: HealthyOrUnhealthySnack + prob: 0.05 + - id: FoodMothMothmallowSlice + orGroup: HealthyOrUnhealthySnack + prob: 0.05 + - id: FoodApple + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + - id: FoodBanana + orGroup: HealthyOrUnhealthySnack + prob: 0.15 + #Note - id: PaperWrittenNoteFromMumGeneric prob: 0.1 @@ -76,9 +122,26 @@ components: - type: StorageFill contents: - - id: FoodApple - - id: DrinkWaterBottleFull + #Main - id: FoodCarrot + orGroup: HealthyMain + prob: 0.5 + - id: FoodMothCapreseSalad + orGroup: HealthyMain + prob: 0.5 + - id: FoodEggBoiled + orGroup: HealthyMain + prob: 0.25 + #Drink + - id: DrinkWaterBottleFull + #Snack + - id: FoodApple + orGroup: HealthySnack + prob: 0.5 + - id: FoodBanana + orGroup: HealthySnack + prob: 0.5 + #Note - id: PaperWrittenNoteFromMumHealthy prob: 0.1 @@ -91,15 +154,51 @@ components: - type: StorageFill contents: + #Main - id: FoodPizzaArnoldSlice amount: 2 - - id: DrinkCartonOrange + #Drink + - id: DrinkJuiceOrangeJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkJuicePineappleJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkJuiceAppleJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkJuiceGrapeJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + - id: DrinkChocolateJuicebox + orGroup: UnhealthyDrink + prob: 0.2 + #Snack - id: FoodSnackCheesie orGroup: UnhealthySnack - prob: 0.25 + prob: 0.15 + - id: FoodSnackBoritos + orGroup: UnhealthySnack + prob: 0.15 + - id: FoodSnackChips + orGroup: UnhealthySnack + prob: 0.15 + - id: FoodSnackPistachios + orGroup: UnhealthySnack + prob: 0.15 - id: FoodSnackChocolate orGroup: UnhealthySnack - prob: 0.25 + prob: 0.15 + - id: FoodSnackSus + orGroup: UnhealthySnack + prob: 0.15 + - id: FoodMothMoffin + orGroup: UnhealthySnack + prob: 0.05 + - id: FoodMothMothmallowSlice + orGroup: UnhealthySnack + prob: 0.05 + #Note - id: PaperWrittenNoteFromMumUnhealthy prob: 0.1 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png new file mode 100644 index 00000000000..e8fd6f98786 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png new file mode 100644 index 00000000000..06a5ba1f4e3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json new file mode 100644 index 00000000000..bf25cd28971 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png new file mode 100644 index 00000000000..d115d698337 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png new file mode 100644 index 00000000000..8021fdc8407 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json new file mode 100644 index 00000000000..719567215e0 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e and modified by Floofers", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png new file mode 100644 index 00000000000..3a47b141691 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png new file mode 100644 index 00000000000..55b87906404 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json new file mode 100644 index 00000000000..bf25cd28971 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png new file mode 100644 index 00000000000..ebe1a123d69 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png new file mode 100644 index 00000000000..fefe447542c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json new file mode 100644 index 00000000000..bf25cd28971 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png new file mode 100644 index 00000000000..2402cff41e3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png new file mode 100644 index 00000000000..db97ee7d3dd Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json new file mode 100644 index 00000000000..bf25cd28971 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +}