diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs index 929011e58ed..f8f75232930 100644 --- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs +++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs @@ -692,6 +692,7 @@ public void SpawnMail(EntityUid uid, MailTeleporterComponent? component = null) var mail = EntityManager.SpawnEntity(chosenParcel, Transform(uid).Coordinates); SetupMail(mail, component, candidate); + _tagSystem.AddTag(mail, "Mail"); // Frontier _tagSystem.AddTag(mail, "Recyclable"); // Frontier - Make it so mail can be destroyed by reclaimer } @@ -725,7 +726,6 @@ public void OpenMail(EntityUid uid, MailComponent? component = null, EntityUid? _tagSystem.AddTag(uid, "Trash"); _tagSystem.AddTag(uid, "Recyclable"); - _tagSystem.AddTag(uid, "ClothMade"); // Frontier - Make it so moth can eat open mail. component.IsEnabled = false; UpdateMailTrashState(uid, true); } diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index b68cb400ba1..c5093d49d08 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -149,7 +149,7 @@ entities: version: 6 2,1: ind: 2,1 - tiles: ZAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAZAAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAaQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAZAAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAaQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAABWgAAAAAAWgAAAAACWgAAAAADWgAAAAACWgAAAAAAWgAAAAAAWgAAAAABWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAACWgAAAAAAWgAAAAACWgAAAAADWgAAAAADWgAAAAABWgAAAAACWgAAAAAAWgAAAAADWgAAAAAAWgAAAAAAWgAAAAACaQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAACWgAAAAACWgAAAAAAWgAAAAABWgAAAAADWgAAAAAAWgAAAAABWgAAAAAAWgAAAAABWgAAAAABWgAAAAADWgAAAAAAaQAAAAAAWgAAAAADWgAAAAABWgAAAAAAWgAAAAADWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAADWgAAAAADWgAAAAACWgAAAAACWgAAAAACWgAAAAACWgAAAAABaQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAADWgAAAAABWgAAAAADWgAAAAAAWgAAAAAAWgAAAAADWgAAAAAAWgAAAAACWgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: ZAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAZAAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAaQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAZAAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAaQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAABWgAAAAAAWgAAAAACWgAAAAADWgAAAAACWgAAAAAAWgAAAAAAWgAAAAABWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAACWgAAAAAAWgAAAAACWgAAAAADWgAAAAADWgAAAAABWgAAAAACWgAAAAAAWgAAAAADWgAAAAAAWgAAAAAAWgAAAAACaQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAACWgAAAAACWgAAAAAAWgAAAAABWgAAAAADWgAAAAAAWgAAAAABWgAAAAAAWgAAAAABWgAAAAABWgAAAAADWgAAAAAAaQAAAAAAWgAAAAADWgAAAAABWgAAAAAAWgAAAAADWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAADWgAAAAADWgAAAAACWgAAAAACWgAAAAACWgAAAAACWgAAAAABaQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAADWgAAAAABWgAAAAADWgAAAAAAWgAAAAAAWgAAAAADWgAAAAAAWgAAAAACWgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,1: ind: 3,1 @@ -559,22 +559,22 @@ entities: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: - 2748: 32,18 + 2738: 32,18 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw decals: - 2716: 27,18 + 2713: 27,18 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe decals: - 2750: 32,16 + 2740: 32,16 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 2717: 27,16 + 2714: 27,16 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN @@ -607,7 +607,7 @@ entities: decals: 2033: 0,11 2034: 0,10 - 2749: 32,17 + 2739: 32,17 - node: color: '#52B4E9FF' id: BrickTileSteelLineN @@ -627,17 +627,17 @@ entities: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 2719: 28,18 - 2720: 29,18 - 2721: 30,18 - 2751: 31,18 + 2716: 28,18 + 2717: 29,18 + 2718: 30,18 + 2741: 31,18 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 2725: 28,16 - 2726: 29,16 - 2727: 30,16 + 2719: 28,16 + 2720: 29,16 + 2721: 30,16 - node: color: '#52B4E9FF' id: BrickTileSteelLineW @@ -658,7 +658,7 @@ entities: 155: -3,42 2025: -2,10 2032: -2,11 - 2718: 27,17 + 2715: 27,17 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe @@ -1571,13 +1571,13 @@ entities: 2696: 47,3 2697: 45,6 2698: 20,22 - 2728: 27,18 - 2729: 28,18 - 2730: 29,18 - 2731: 29,17 - 2732: 28,16 - 2733: 30,16 - 2735: 30,18 + 2722: 27,18 + 2723: 28,18 + 2724: 29,18 + 2725: 29,17 + 2726: 28,16 + 2727: 30,16 + 2728: 30,18 - node: cleanable: True zIndex: 180 @@ -1989,8 +1989,8 @@ entities: 2447: -14,2 2448: -14,4 2449: -13,2 - 2753: 31,17 - 2754: 32,18 + 2743: 31,17 + 2744: 32,18 - node: cleanable: True zIndex: 180 @@ -2572,10 +2572,10 @@ entities: 2658: 32,22 2659: 33,23 2660: 33,22 - 2736: 28,17 - 2737: 28,17 - 2738: 27,16 - 2752: 32,17 + 2729: 28,17 + 2730: 28,17 + 2731: 27,16 + 2742: 32,17 - node: cleanable: True zIndex: 180 @@ -2861,10 +2861,10 @@ entities: 2631: 37,10 2632: 38,9 2633: 38,10 - 2755: 31,18 - 2756: 32,16 - 2757: 31,16 - 2758: 32,17 + 2745: 31,18 + 2746: 32,16 + 2747: 31,16 + 2748: 32,17 - node: cleanable: True zIndex: 180 @@ -3008,12 +3008,12 @@ entities: 2710: 30,16 2711: 30,17 2712: 30,18 - 2742: 31,17 - 2743: 31,18 - 2744: 32,18 - 2745: 32,17 - 2746: 32,16 - 2747: 31,16 + 2732: 31,17 + 2733: 31,18 + 2734: 32,18 + 2735: 32,17 + 2736: 32,16 + 2737: 31,16 - node: color: '#FFFFFFFF' id: MiniTileCheckerAOverlay @@ -6812,10 +6812,10 @@ entities: bodyType: Static - proto: BiomassReclaimer entities: - - uid: 1476 + - uid: 2476 components: - type: Transform - pos: -47.5,10.5 + pos: -48.5,10.5 parent: 2173 - proto: BlastDoor entities: @@ -6909,15 +6909,15 @@ entities: parent: 2173 - proto: BodyBag_Folded entities: - - uid: 2388 + - uid: 1475 components: - type: Transform - pos: -49.62833,10.587946 + pos: -49.685345,10.644573 parent: 2173 - - uid: 2389 + - uid: 3782 components: - type: Transform - pos: -49.394184,10.763556 + pos: -49.331177,10.884157 parent: 2173 - proto: Bookshelf entities: @@ -6947,7 +6947,7 @@ entities: - uid: 2390 components: - type: Transform - pos: -45.620083,16.65573 + pos: -45.37189,16.401287 parent: 2173 - proto: BoxFolderBlack entities: @@ -6961,7 +6961,7 @@ entities: - uid: 2234 components: - type: Transform - pos: -48.146473,6.769015 + pos: -47.97512,6.7225327 parent: 2173 - uid: 5737 components: @@ -6992,19 +6992,26 @@ entities: - uid: 2232 components: - type: Transform - pos: -48.365223,6.623182 + pos: -48.22512,6.5454493 parent: 2173 - uid: 2233 components: - type: Transform pos: -49.37637,7.544346 parent: 2173 +- proto: BoxMailCapsulePrimed + entities: + - uid: 4936 + components: + - type: Transform + pos: 28.929081,16.827986 + parent: 2173 - proto: BoxNitrileGloves entities: - uid: 2391 components: - type: Transform - pos: -45.40057,16.392315 + pos: -45.611477,16.755453 parent: 2173 - proto: BoxTrashbag entities: @@ -16024,11 +16031,6 @@ entities: - type: Transform pos: -47.5,7.5 parent: 2173 - - uid: 2476 - components: - - type: Transform - pos: 30.5,17.5 - parent: 2173 - uid: 2609 components: - type: Transform @@ -16039,6 +16041,11 @@ entities: - type: Transform pos: -31.462313,7.0218196 parent: 2173 + - uid: 2829 + components: + - type: Transform + pos: 29.5,17.5 + parent: 2173 - uid: 4452 components: - type: Transform @@ -16064,16 +16071,9 @@ entities: rot: 3.141592653589793 rad pos: -3.5,27.5 parent: 2173 -- proto: CheapRollerBed - entities: - - uid: 2392 - components: - - type: Transform - pos: -49.5,15.5 - parent: 2173 - proto: CloningPod entities: - - uid: 1474 + - uid: 828 components: - type: Transform pos: -49.5,13.5 @@ -16157,10 +16157,10 @@ entities: parent: 2173 - proto: ClothingEyesGlasses entities: - - uid: 2231 + - uid: 4932 components: - type: Transform - pos: -49.603878,6.8523483 + pos: -47.646618,6.8266993 parent: 2173 - proto: ClothingHandsGlovesColorYellow entities: @@ -16185,10 +16185,10 @@ entities: parent: 2173 - proto: ClothingNeckStethoscope entities: - - uid: 2437 + - uid: 2478 components: - type: Transform - pos: -49.5,6.5 + pos: -47.427868,6.6287827 parent: 2173 - proto: ClothingOuterCoatParamedicWB entities: @@ -16290,7 +16290,7 @@ entities: ents: [] - proto: ComputerCloningConsole entities: - - uid: 1473 + - uid: 2231 components: - type: Transform pos: -48.5,13.5 @@ -16480,11 +16480,11 @@ entities: parent: 2173 - proto: ComputerTabletopId entities: - - uid: 4819 + - uid: 2392 components: - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,13.5 + rot: -1.5707963267948966 rad + pos: 15.5,14.5 parent: 2173 - proto: ComputerTabletopMedicalRecords entities: @@ -16521,17 +16521,15 @@ entities: - type: Transform pos: -2.5,41.5 parent: 2173 - - uid: 828 + - uid: 1476 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,4.5 + pos: -49.5,6.5 parent: 2173 - - uid: 4932 + - uid: 2388 components: - type: Transform - rot: 3.141592653589793 rad - pos: -47.5,6.5 + pos: -0.5,4.5 parent: 2173 - proto: ComputerTabletopShipyard entities: @@ -16558,17 +16556,17 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,14.5 parent: 2173 -- proto: ComputerTabletopStationRecords +- proto: ComputerTabletopSurveillanceCameraMonitor entities: - - uid: 4825 + - uid: 2387 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,14.5 + rot: 3.141592653589793 rad + pos: 13.5,13.5 parent: 2173 -- proto: ComputerTabletopSurveillanceCameraMonitor +- proto: ComputerTabletopSurveillanceWirelessCameraMonitor entities: - - uid: 2829 + - uid: 2437 components: - type: Transform rot: 1.5707963267948966 rad @@ -19647,6 +19645,13 @@ entities: - type: Transform pos: -48.589905,15.402771 parent: 2173 +- proto: EmergencyRollerBedSpawnFolded + entities: + - uid: 2389 + components: + - type: Transform + pos: -49.449234,15.683861 + parent: 2173 - proto: FaxMachineBase entities: - uid: 2859 @@ -30486,7 +30491,7 @@ entities: - uid: 5691 components: - type: Transform - pos: -48.873768,6.612765 + pos: -48.70429,6.6912827 parent: 2173 - proto: IngotGold1 entities: @@ -30507,12 +30512,6 @@ entities: parent: 2173 - proto: IntercomAll entities: - - uid: 5757 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,13.5 - parent: 2173 - uid: 5758 components: - type: Transform @@ -30592,11 +30591,10 @@ entities: parent: 2173 - proto: LampGold entities: - - uid: 2478 + - uid: 1474 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 30.042118,16.771519 + pos: 30.099142,17.118307 parent: 2173 - proto: LessLethalVendingMachine entities: @@ -30658,6 +30656,8 @@ entities: - type: Transform pos: 8.5,18.5 parent: 2173 + - type: Physics + bodyType: Static - proto: LockerJanitorFilled entities: - uid: 4325 @@ -30716,12 +30716,12 @@ entities: - uid: 805 components: - type: Transform - pos: 28.644905,16.700432 + pos: 28.42206,16.847475 parent: 2173 - uid: 807 components: - type: Transform - pos: 29.108994,16.42958 + pos: 28.522831,16.557152 parent: 2173 - proto: MailingUnit entities: @@ -30816,7 +30816,7 @@ entities: parent: 2173 - proto: MedicalScanner entities: - - uid: 1475 + - uid: 2567 components: - type: Transform pos: -47.5,13.5 @@ -30978,7 +30978,7 @@ entities: - uid: 2551 components: - type: Transform - pos: -49.776596,10.821695 + pos: -49.299927,10.571657 parent: 2173 - proto: NitrogenCanister entities: @@ -31179,11 +31179,6 @@ entities: parent: 2173 - proto: PaperBin10 entities: - - uid: 2567 - components: - - type: Transform - pos: 31.5,16.5 - parent: 2173 - uid: 2611 components: - type: Transform @@ -31195,6 +31190,11 @@ entities: - type: Transform pos: -1.5,5.5 parent: 2173 + - uid: 4825 + components: + - type: Transform + pos: 30.5,16.5 + parent: 2173 - proto: PaperBin5 entities: - uid: 3041 @@ -31472,7 +31472,7 @@ entities: - uid: 4429 components: - type: Transform - pos: 33.5,21.5 + pos: 32.5,20.5 parent: 2173 - uid: 4463 components: @@ -32486,6 +32486,12 @@ entities: parent: 2173 - proto: Rack entities: + - uid: 1473 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -49.5,10.5 + parent: 2173 - uid: 1716 components: - type: Transform @@ -32496,11 +32502,6 @@ entities: - type: Transform pos: 45.5,13.5 parent: 2173 - - uid: 2387 - components: - - type: Transform - pos: -49.5,10.5 - parent: 2173 - uid: 2428 components: - type: Transform @@ -32526,6 +32527,11 @@ entities: - type: Transform pos: -28.5,14.5 parent: 2173 + - uid: 4296 + components: + - type: Transform + pos: 31.5,16.5 + parent: 2173 - proto: RadioHandheld entities: - uid: 4456 @@ -34888,19 +34894,26 @@ entities: - type: Transform pos: 32.5,18.5 parent: 2173 +- proto: SheetGlass + entities: + - uid: 4819 + components: + - type: Transform + pos: 32.549232,16.804625 + parent: 2173 - proto: SheetPlastic entities: - uid: 4930 components: - type: Transform - pos: 32.594048,16.818851 + pos: 32.007565,16.773375 parent: 2173 - proto: SheetSteel entities: - uid: 4931 components: - type: Transform - pos: 32.44821,16.725101 + pos: 31.476742,16.762957 parent: 2173 - proto: SignalButton entities: @@ -36128,11 +36141,6 @@ entities: - type: Transform pos: 23.5,20.5 parent: 2173 - - uid: 3782 - components: - - type: Transform - pos: 31.5,16.5 - parent: 2173 - uid: 3783 components: - type: Transform @@ -41747,13 +41755,6 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,19.5 parent: 2173 - - uid: 4296 - components: - - type: MetaData - flags: PvsPriority - - type: Transform - pos: 32.5,20.5 - parent: 2173 - uid: 4301 components: - type: MetaData @@ -41868,6 +41869,13 @@ entities: - type: Transform pos: 35.5,9.5 parent: 2173 +- proto: WeaponMailLake + entities: + - uid: 4935 + components: + - type: Transform + pos: 29.456926,16.560009 + parent: 2173 - proto: WeaponPistolMk58 entities: - uid: 4380 diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml index 303080f1e43..d625270b790 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/maildrobe.yml @@ -1,6 +1,8 @@ - type: vendingMachineInventory id: MailDrobeInventory startingInventory: + WeaponMailLake: 1 # Frontier + BoxMailCapsulePrimed: 2 # Frontier ClothingBackpackMessengerMailman: 2 # Frontier ClothingUniformJumpsuitMailCarrier: 2 ClothingUniformJumpskirtMailCarrier: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml index 80a6d9c3eb7..73a75cae24d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml @@ -9,6 +9,7 @@ - type: Mail - type: AccessReader - type: Sprite + scale: 0.7, 0.7 # Frontier sprite: Nyanotrasen/Objects/Specific/Mail/mail.rsi layers: - state: icon diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml index a50c70fdd54..7c9936d2bfa 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml @@ -84,7 +84,20 @@ board: ServiceTechFabCircuitboard - type: Lathe idleState: icon - runningState: icon + runningState: icon + staticRecipes: #Frontier + - MailCapsule #Frontier + - SprayBottle #Frontier, moved this ones from dynamicRecipes, so the service fab wouldn't need a server for basic stuff + - FlashlightLantern + - FireExtinguisher + - LightTube + - LightBulb + - DrinkMug + - DrinkMugMetal + - DrinkGlass + - CableStack + - CableMVStack + - CableHVStack dynamicRecipes: - KitchenKnife - ButchCleaver @@ -94,9 +107,6 @@ - MopAdvanced - HydroponicsToolScythe - HydroponicsToolHatchet - - DrinkMug - - DrinkMugMetal - - DrinkGlass - MopBucket - SynthesizerInstrument - TrashBag @@ -107,22 +117,14 @@ - Spade - Clippers - Shovel # Below is shared with other lathes - - FlashlightLantern - Bucket - MopItem - - SprayBottle - - FireExtinguisher - - LightTube - - LightBulb - SheetSteel - SheetPlasteel - SheetPlasma - SheetGlass1 - SheetRGlass - SheetPlastic - - CableStack - - CableMVStack - - CableHVStack - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml new file mode 100644 index 00000000000..9b2bbe148b0 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -0,0 +1,126 @@ +- type: entity + name: mail capsule + suffix: Primed + id: MailCapsulePrimed + parent: BaseItem + components: + - type: ThrowingAngle + angle: 180 + - type: EmbeddableProjectile + minimumSpeed: 1 + removalTime: 0.1 + - type: Tag + tags: + - MailCapsule + - Trash + - type: Sprite + sprite: _NF/Objects/Misc/mail_capsule.rsi + layers: + - state: icon-empty + - type: ItemSlots + slots: + mail_slot: + insertVerbText: Put in Mail + ejectVerbText: Take out Mail + name: Mail + startingItem: null + whitelist: + tags: + - Book + - Document + - Mail + components: + - Mail + - Paper + - HyperlinkBook + insertOnInteract: true + priority: 3 + food_slot: + insertVerbText: Put in Food + ejectVerbText: Take out Food + name: Food + startingItem: null + whitelist: + components: + - Food + insertOnInteract: true + priority: 2 + cash_slot: + insertVerbText: Put in Cash + ejectVerbText: Take out Cash + name: Cash + startingItem: null + whitelist: + components: + - Currency + insertOnInteract: true + priority: 1 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + mail_slot: !type:ContainerSlot {} + - type: Appearance + - type: ItemMapper + mapLayers: + icon-food: + whitelist: + components: + - Food + icon-cash: + whitelist: + components: + - Currency + icon-mail: + whitelist: + tags: + - Book + - Document + - Mail + components: + - Mail + - Paper + - HyperlinkBook + sprite: _NF/Objects/Misc/mail_capsule.rsi + - type: Dumpable + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 #excess damage avoids cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:EmptyAllContainersBehaviour + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + damage: + types: + Blunt: 9.5 + +- type: entity + name: mail capsule box + parent: BoxCardboard + id: BoxMailCapsulePrimed + description: A box of primed mail capsules. + components: + - type: Storage + grid: + - 0,0,4,3 + - type: StorageFill + contents: + - id: MailCapsulePrimed + amount: 10 + - type: Sprite + layers: + - state: box diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index b75c3155a92..3821af30aa7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -61,4 +61,29 @@ magState: mag steps: 2 zeroVisible: false - - type: Appearance \ No newline at end of file + - type: Appearance + +- type: entity + name: mail RPDS + parent: WeaponLauncherChinaLake + id: WeaponMailLake + description: Rap(b?)id Parcel Delivery System + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Launchers/mail.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Launchers/mail.rsi + quickEquip: false + slots: + - Back + - Belt + - suitStorage + - type: BallisticAmmoProvider + proto: null + whitelist: + tags: + - MailCapsule + capacity: 4 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml index 4fade7a37f5..22e1f9605f7 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml @@ -5,3 +5,11 @@ materials: Silver: 1000 Gold: 500 + +- type: latheRecipe + id: MailCapsule + result: MailCapsulePrimed + completetime: 1 + materials: + Glass: 100 + Plastic: 100 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index b79c351a754..6264405762b 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -48,3 +48,9 @@ - type: Tag id: PrizeTicket + +- type: Tag + id: Mail + +- type: Tag + id: MailCapsule diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-cash.png b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-cash.png new file mode 100644 index 00000000000..8ba33c95b57 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-cash.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-empty.png b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-empty.png new file mode 100644 index 00000000000..085b787410b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-empty.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-food.png b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-food.png new file mode 100644 index 00000000000..d08489cec89 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-food.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-mail.png b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-mail.png new file mode 100644 index 00000000000..b35a2acc0f3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-mail.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json new file mode 100644 index 00000000000..2e9bfc36170 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made for Frontier by erhardsteinhauer (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-empty" + }, + { + "name": "icon-mail" + }, + { + "name": "icon-food" + }, + { + "name": "icon-cash" + }, + { + "name": "spent" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/spent.png b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/spent.png new file mode 100644 index 00000000000..acd0d0577fc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/spent.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/bolt-open.png new file mode 100644 index 00000000000..87c6d812ec2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..c17a68eb35a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BELT.png new file mode 100644 index 00000000000..59dc5f13ed0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/icon.png new file mode 100644 index 00000000000..dd7b21e1671 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-left.png new file mode 100644 index 00000000000..427389f40d5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-right.png new file mode 100644 index 00000000000..8e50ef04f91 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json new file mode 100644 index 00000000000..464c22d1a7a --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, resprited for mail gun by erhardsteinhauer (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} \ No newline at end of file