From 4fac47230d6e3405f1f0eac48a5408a439cee595 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sat, 3 Feb 2024 21:52:30 +0300 Subject: [PATCH 01/12] Mail RPDS --- .../Entities/Objects/Misc/mail_capsule.yml | 91 ++++++++++++++++++ .../Weapons/Guns/Launchers/launchers.yml | 27 +++++- Resources/Prototypes/_NF/tags.yml | 6 ++ .../Fills/Vending/Inventories/maildrobe.yml | 2 + .../Objects/Specific/Mail/base_mail.yml | 8 +- .../Misc/mail_capsule.rsi/icon-empty.png | Bin 0 -> 6010 bytes .../Misc/mail_capsule.rsi/icon-mail.png | Bin 0 -> 6165 bytes .../Misc/mail_capsule.rsi/icon-primed.png | Bin 0 -> 6182 bytes .../Objects/Misc/mail_capsule.rsi/meta.json | 23 +++++ .../Objects/Misc/mail_capsule.rsi/spent.png | Bin 0 -> 5625 bytes .../Guns/Launchers/mail.rsi/bolt-open.png | Bin 0 -> 6861 bytes .../Launchers/mail.rsi/equipped-BACKPACK.png | Bin 0 -> 1472 bytes .../Guns/Launchers/mail.rsi/equipped-BELT.png | Bin 0 -> 1472 bytes .../Weapons/Guns/Launchers/mail.rsi/icon.png | Bin 0 -> 6855 bytes .../Guns/Launchers/mail.rsi/inhand-left.png | Bin 0 -> 1048 bytes .../Guns/Launchers/mail.rsi/inhand-right.png | Bin 0 -> 1060 bytes .../Weapons/Guns/Launchers/mail.rsi/meta.json | 33 +++++++ 17 files changed, 187 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml create mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-empty.png create mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-mail.png create mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-primed.png create mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/spent.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/bolt-open.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json 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..5b315b9935d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -0,0 +1,91 @@ +- type: entity + name: mail capsule + suffix: Primed + id: MailCapsulePrimed + parent: BaseItem + components: + - type: Item + size: 5 + - type: ThrowingAngle + angle: 180 + - type: EmbeddableProjectile + minimumSpeed: 1 + removalTime: 0.1 + - type: Tag + tags: + - MailCapsuleTag + - 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: + - Document + - MailTag + insertOnInteract: true + priority: 1 + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + mail_slot: !type:ContainerSlot {} + - type: Appearance + - type: ItemMapper + mapLayers: + icon-mail: + whitelist: + tags: + - Document + - MailTag + 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: StorageFill + contents: + - id: MailCapsulePrimed + amount: 6 + - type: Storage + capacity: 30 + whitelist: + tags: + - MailCapsuleTag + - type: Sprite + layers: + - state: box \ No newline at end of file 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..a55c82aeea5 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: + - MailCapsuleTag + capacity: 4 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index db873d25a7e..cbc8cb419c9 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -48,3 +48,9 @@ - type: Tag id: PrizeTicket + +- type: Tag + id: MailTag + +- type: Tag + id: MailCapsuleTag \ No newline at end of file diff --git a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/maildrobe.yml b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/maildrobe.yml index 47962cf583b..79209040dbb 100644 --- a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/maildrobe.yml +++ b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/maildrobe.yml @@ -1,6 +1,8 @@ - type: vendingMachineInventory id: MailDrobeInventory startingInventory: + WeaponMailLake: 1 # Frontier + BoxMailCapsulePrimed: 2 # Frontier ClothingUniformJumpsuitMailCarrier: 2 ClothingUniformJumpskirtMailCarrier: 2 ClothingHeadMailCarrier: 2 diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml index b65655b5d17..d5856640786 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml @@ -4,11 +4,15 @@ id: BaseMail name: mail-item-name-unaddressed components: + - type: Tag # Frontier + tags: # Frontier + - MailTag # Frontier - type: Item size: 20 - type: Mail - type: AccessReader - type: Sprite + scale: 0.7, 0.7 # Frontier sprite: Nyanotrasen/Objects/Specific/Mail/mail.rsi layers: - state: icon @@ -91,7 +95,7 @@ - type: DamageOnLand damage: types: - Blunt: 10 + Blunt: 5 # Frontier halved the damage - type: CargoSellBlacklist - type: Food # Frontier - Moth food requiresSpecialDigestion: true @@ -109,4 +113,4 @@ noSpawn: true parent: BaseMail id: MailAdminFun - suffix: adminfun + suffix: adminfun \ No newline at end of file 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 0000000000000000000000000000000000000000..7499e75fe0c7ad825a137a39e104c740475db7f0 GIT binary patch literal 6010 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 literal 0 HcmV?d00001 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..079a6f05bf2 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "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-primed" + }, + { + "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 0000000000000000000000000000000000000000..552d6abda72d19945b3bf962842de6896e0ce5a7 GIT binary patch literal 5625 zcmeHKX;f3!7LJO5$S8_Do!8(xS-asG|xd{md z?uPKtAS(+O3mgt-#Siw60Dtk=$J`WrqiJaaINXF?X;Cqn2%!$IQY$4=8G_fOst`P) zmr8IreMfJ8>{eF~%j|A;gX=iH`RU{{juhth+ZVzli);3EzAyg#x=rrA-BW@cKN#3h zQup+ihf|-`)h}YtsN9-#-Y#r!=@IwHTYn7MMTP{e=B|$J87}2^PR$|k=Kd1jv}8Dl z-8KIFnJt%@nG0*@cAx=*{HKoy_gsRj0zdvNdD7l|d{22MXBD#8FrM(J1x#-MB4gL=LcH3ME`twQC$RC5Vv{ofkSt~ z)D@+j>?cJ}CvNvo^REB5lUbEP2Mf(HA@_SB4-RiY-o%FU#sXQn767%^_a{7vk zDyv%T8`Re=()v?;zbk9%bvl4s*H-`e0MzIHz4wlNYl_??r0qqGDH{_O<}2ksTPIW$ z6%)MjC$=9mIpy#4ak1qj^D`m4zVL7zCXakXovg`))%kB@e{xOH2wX<^+e*#L#p zapX~Kj@M*-)DfqPas0K>b!SbVmqp$5JGhGw{;%B{S8ap;wTeLqDcX&Z~In{sdDn*O$FN5z$jJCXwx9pBfdr`_*BkFM}N z)MaMld~J518>9KV`q_eGmqH@rzh<=TzdUW3ylLS_OIB1h?`=^gI)v`;&YJ#hpiScH z%^g;~d$JEoZ0stI+IO`s$gy90Og>(faHCaJ`~^#<*%7-xC%V{@sI7Od*swOP;7rXu z$>63=`=gsLk&|zmRUiH_-4y#;@Y^cI!|?ZpD}G&6$4emB%dgCd$w+`cL;KUe`}^H8H>wkNvI~9fgM8He&-e7yx|pXtJAI>T{cqnC4O(i=J9;i%Z60W+IXLr9F|z`fADq-@sNu$=xh+VP0&s zL{KxMrX-tIY3;h1-p35PXgmAx^}0K&vr~WF^i6O66^otFAu{iiUHJMtd$KoQ ze?h|HFB2b!jNdD9{?&h3>zySHr{nZ*9Eul4X2!3F#E8yX^} zwJdLK&R)nBxGsv?^eC&a#o`y@`NYce9fLoUEgdWJEU!v)@oQ(!*pg}Ptc?oK%9?Y) z#bef`is^%WHuIl3RKx1%Q|HRoxI_i#PJe2Xp-XZUM=By9>w%Nk9yiXhy*6>F)%9oI zRlRMKZhm5Vup+m%%|znES86KG*+GY`mMzoKQ*DlQj?4a9)3n*ODJ*i1_|bl;u#Zr-$Ynz!h2P2=(5npMMtA;)W{@8+qG_oZx2#o=rUrQr08 z5rlBWN;ydgD@6!NFIR!n6^G;c=v6{-5~9J2ka(%Wi}3JxEdeiuy$DM@1&~1Hha^aY z)6__0T4k{2OH5RUg# zsu4V$L?=PS0KGJYO7OP8bJehf6X72?N&!Y*ganO7#UYb*Ivq(zBPrGKWD1+jCPP#* zl}ZE%BATku2=zn->W)#2aQGvrSS?j)q)G)I;}nXNT8$Th0Os+dY8+FGBACgLw+xn$K~jdu#y&xOLHL*tCS$x* zt}=LFXk#QS9>b}$YMB88i^+%#k%L4~z)X1suaQb#ZqO_1!DjxH2naXE{|fqrUWQx@ zx^n!LVl5Vw@9#yx^5wuvu@vSQej-9Ti-FLXL>dIqh;#~zK@^FYEFx3HkkF_IiwV=| zMpS$Ssu3#02u20SNm9TALrkg=Vlaplst8cf*leN@jEOXcm<3ZjnL?USWJD3BmV!iZib0P1%^-b&wha=nx5trU1G@Vn}IC)Zmk@K)e=)%Aaq%i`rDH=+Rl z_vyd`b>mP=DR>w+6@3)sk9&^2i%xvI4Ok|rf@4t}Zn8c08HXz`2HzmG|SE5CfhUhh+nO+Bx*dn3IcN^Bys?j13? z8awOSl+15tG<065Z0bs{uE4Le^)>I0U!PMj8(Q7@`ajGZ$8|jJe08zs@@m}h;m<0$XYFu#qH5g3`p35DPq5k06RXzfPc7CCr?j=zRc#Q} q7J0ruw_(Y4hiXBjg8ad{xQVJqGrN0Crul+gar}T#|AW49ng0e6-%4Hp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..87c6d812ec26776c0f86b04eae1c1b70e21ccd4b GIT binary patch literal 6861 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 ej6g(0_3;yTz>Vz2R4ZfY literal 0 HcmV?d00001 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..fea86ac86cc --- /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 + } + ] +} From 32cd29aaf8c65332ddc19c1689a09dd12ed9a395 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 4 Feb 2024 04:21:35 +0300 Subject: [PATCH 02/12] removed sizes, more items go in capsules --- .../Entities/Objects/Misc/mail_capsule.yml | 50 ++++++++++++++---- .../Objects/Specific/Mail/base_mail.yml | 2 +- .../Misc/mail_capsule.rsi/icon-cash.png | Bin 0 -> 6359 bytes .../Misc/mail_capsule.rsi/icon-food.png | Bin 0 -> 6612 bytes .../Misc/mail_capsule.rsi/icon-mail.png | Bin 6165 -> 6234 bytes .../Objects/Misc/mail_capsule.rsi/meta.json | 6 +++ .../Guns/Launchers/mail.rsi/equipped-BELT.png | Bin 1472 -> 1488 bytes 7 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-cash.png create mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-food.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml index 5b315b9935d..bdb85782b30 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -4,8 +4,6 @@ id: MailCapsulePrimed parent: BaseItem components: - - type: Item - size: 5 - type: ThrowingAngle angle: 180 - type: EmbeddableProjectile @@ -14,6 +12,7 @@ - type: Tag tags: - MailCapsuleTag + - Trash - type: Sprite sprite: _NF/Objects/Misc/mail_capsule.rsi layers: @@ -26,9 +25,34 @@ name: Mail startingItem: null whitelist: - tags: + tag: + - Book - Document - MailTag + 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 @@ -39,11 +63,24 @@ - type: Appearance - type: ItemMapper mapLayers: + icon-food: + whitelist: + components: + - Food + icon-cash: + whitelist: + components: + - Currency icon-mail: whitelist: - tags: + tag: + - Book - Document - MailTag + components: + - Mail + - Paper + - HyperlinkBook sprite: _NF/Objects/Misc/mail_capsule.rsi - type: Dumpable - type: Damageable @@ -81,11 +118,6 @@ contents: - id: MailCapsulePrimed amount: 6 - - type: Storage - capacity: 30 - whitelist: - tags: - - MailCapsuleTag - type: Sprite layers: - state: box \ No newline at end of file diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml index d5856640786..9ff70edddb0 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/base_mail.yml @@ -6,7 +6,7 @@ components: - type: Tag # Frontier tags: # Frontier - - MailTag # Frontier + - MailTag # Frontier, because it has food component (thanks, Moth-person) - type: Item size: 20 - type: Mail 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 0000000000000000000000000000000000000000..d93e7cb05a03979d51a6f9d176b543db24b6b931 GIT binary patch literal 6359 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 KMNUMnLSTa44_Qh8 delta 2324 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 Ye=@AG2=pcyV*mgE07*qoM6N<$f)r=0VE_OC delta 1426 zcmV;D1#SA!3&0DIB!7fyLqkwWLqi~Na&Km7Y-IodD3N`UJxIeq9K~N#r6Mg3b`WvM zP{qN5SP@65Vi7EqwnD28CYOFelZGV4#ZhoAIQX$xb#QUk)xlK|1V2EW9h?+hq{ROv zg%&X$9QWhhy~o`S}bq^n3 z@1i`*``n)+q!dgB_(bA4rW+RV2Jy_MrE}gV4zseP5T6rI7<576N3P2*zi}=(Ebz>* zkxkDNhl#~f7t3AD%7#ijO&n2Fjq-(@%L?Z$&T6&J+V|uy3>LJN4A*InAb}+$k%9;r zbyQG=g($5WDSsx?v>*5I4?F%8xny!xz{s(H8dOM*AN&t~cWV}7Q*Kf)4)ng*_Qxm? z*acb*+x|Yb?bZq4e+I6!j=$CfW9C~nnvzg zoGz9hsj5l>fk0af5O0jR3VWP-pVp0-6%#LCKw(8}TgAe+sapKokz2zAeZ{ew=k zKd2VlS<9c)n z*fHQ6m9f7(ZO?zqJ#NQFoElLq{&&Yq0Km}eAPyPCGZ|p)CIn+QQBnN* z%!nh)BD}gKcs*`-J??^yS=V)Z{_@xS-G_-+X6$uug4NiZ8z-kH$2h;Z!uZmrBO7Ea z79)}*AsUSW0A^=r0RV5_E))!$Eqg#U@wDxP_*g7P06>x?q|<2xe}h5jx{h=@U6W{A zWjNrnOsbN3|1Dk71HP<*fNR0e7aN;pa8 z_Xttq8QbqST#X2pw&(W19iPVD~;%Zm6)eb_0!f8o?J?Hkz#hr{7;I2;a# z!{KnOybqwSpIW&(Owlxr&;lvTtMZzv!|eoX%uELOCKn-!V%vxpMG?NqMf(i6%di)yyZ(p5R0{J8FRDF(CsDb*=CNLTB{pT+Lxr0c>Q?ME0X}eT;p2kRH zw#5KCtxD1Rpx4pL?9tgJli`(Ot{K@sMp%!YI-c*#WIVgDR+L;U;(cpF From c0b3e3440f7fc43aad1058b4763f326113eda9f7 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 4 Feb 2024 04:28:21 +0300 Subject: [PATCH 03/12] fixed error --- .../Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml index bdb85782b30..66f140e1fd9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -25,7 +25,7 @@ name: Mail startingItem: null whitelist: - tag: + tags: - Book - Document - MailTag @@ -73,7 +73,7 @@ - Currency icon-mail: whitelist: - tag: + tags: - Book - Document - MailTag From fe7dea97be0713efa69d20e62fc7fdbdb6f226d8 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 4 Feb 2024 11:41:14 +0300 Subject: [PATCH 04/12] capsule resprite, added it to service techfab --- .../Prototypes/_NF/Recipes/Lathes/misc.yml | 8 ++++ .../Entities/Structures/Machines/lathe.yml | 35 ++++++++++-------- .../Misc/mail_capsule.rsi/icon-cash.png | Bin 6359 -> 6954 bytes .../Misc/mail_capsule.rsi/icon-empty.png | Bin 6010 -> 6506 bytes .../Misc/mail_capsule.rsi/icon-food.png | Bin 6612 -> 7202 bytes .../Misc/mail_capsule.rsi/icon-mail.png | Bin 6234 -> 6821 bytes .../Misc/mail_capsule.rsi/icon-primed.png | Bin 6182 -> 0 bytes .../Objects/Misc/mail_capsule.rsi/meta.json | 3 -- .../Objects/Misc/mail_capsule.rsi/spent.png | Bin 5625 -> 5618 bytes 9 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/icon-primed.png diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml index 4fade7a37f5..764ef3f76a9 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 diff --git a/Resources/Prototypes/_Nyano/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Nyano/Entities/Structures/Machines/lathe.yml index 258d79e6b59..af4f6366945 100644 --- a/Resources/Prototypes/_Nyano/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_Nyano/Entities/Structures/Machines/lathe.yml @@ -84,36 +84,41 @@ 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: + - LightReplacer + - TrashBag + - WetFloorSign + - Bucket + - MopItem + - MopBucket - KitchenKnife - ButchCleaver - - LightReplacer - Holoprojector - TrashBagOfHolding - MopAdvanced - HydroponicsToolScythe - HydroponicsToolHatchet - - DrinkMug - - DrinkMugMetal - - DrinkGlass - - MopBucket - SynthesizerInstrument - - TrashBag - - WetFloorSign - MiniHoe - HydroponicsToolScythe - HydroponicsToolHatchet - Spade - Clippers - Shovel # Below is shared with other lathes - - FlashlightLantern - - Bucket - - MopItem - - SprayBottle - - FireExtinguisher - - LightTube - - LightBulb - SheetSteel - SheetPlasteel - SheetPlasma 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 index d93e7cb05a03979d51a6f9d176b543db24b6b931..8ba33c95b571476a108f05f30de91aa581c78353 100644 GIT binary patch delta 3116 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 M07*qoM6N<$f?-O>ApigX delta 2154 zcmV-w2$lEhGWsr%BYyaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHlIti8 zhTmDmECC^e#B#W)>g-^aKR>pU=}x+<`ZiC~CNTtKA?Xu>g!T6y4}alG%q3(|E47q} zE7x38L&M^Ewc}1PANS)**CYIX)gSH;61o^QpFgc!<8S?R7k_Y84J~;g$j0@czkX2j zCEp$dT@&%vXlpSqLG=>E>3l$!fOeV{OErCILSJV+Zd*XB|!26p6x1+J|c!EKOwj6hYz*7@A)Bga4%h?~$@!FZ? zUccE-^0xEC;eX;6GxNC5{HlM>sE_8{zV6e4`#P;_xxl66GU{f^(ZawEm-F#jK~a1K zZ9Pgwv4H3upflr$9c56Z1T0ROCN*+eM?Gjj#hg}B)G3X`N1w5#ng+)JHhCBFq+EG| zSKG5rokWg|KfwQQj5gzJEiWDB9gu&@1gAgc_UNzGD=C zkl*4+4hP@LnDEbY1Rj?ytUNjkfcvj9T4umVlx238q~4e_Jd z5JOE^vVVvaQ8B5~3YT1@l%i!Pzox8NMT@GMR&B4Scl%d1IsH4p^c_L5DGIiRlvn^T(rInYgvUJ(1 zt2si=*|UomS2wTT?$jupSf9$rsnLyEI!Nt-dVi;eS5cXis?9PHu+S|fzVLQ4S->qK=y5`)cvpV`#v}Uer zX~P&9wwJU>Rb+tZ(X-AjE?q2jB!{qaL7uQWcw#-zu`K)Qx}^9PvPEE@@-}9hr6osZ z;#zDRQ*4`|N2VIX4_WqxAT3iyo~rx&S%07b4jxEHaX15XDSaY2j)Fu9Ba!G7PT(nRiiXv_Oh$Uur5)0yt$60O z868>vqY)K88-l$TB;nHg03)PsURFRb24Ayzn{B`s6)Hv{Ftz;K~Dobd_TPq4!mX+PEBi?p9$hmX+4|H2s) zAFxSUPC9UAG7mBuIJbSYfES>7Mp|<9iSq^{|KJGoyck`VQG`d^V z;s$Tq!*!;HXi~`1UXd{vo|1+n0gXz>{A-=58!0uEv$_8Xf2$7hSJ3}Skm6`uv7h|| zrdwDb+2+zSlcxqCe^aF*Ee>`NamY}`!Gc&3N2y{FER?oFs}3fYenFFlB*n#1a4k6a zu~>C*an{wrRS*O}K%5<%6kVjm|0RVMF&-TENR+(z{OaiKA8RtWb7V!r0%%-Jt-X{*T zvZN576Hgd)LE=ZQ%PzlhE;%gl%&?J7&l87<#Zni`UChdcN<2**QB;lcg`CR@=Pk}^ zwa(i2IO`ldWEcnkEexxKabaryvcsjKB1;NTD#D^d2k z$GiKwd;9lHyT2c#L2|qBc9MAj01upLR9JLaO-wptvqT880wgnHHDft7F*q$VF*Y(S zG-Y98EjVLlV=Xr~H8x{mH#aw7V>FW*3m+snFl9L~FgP+TGh;P3Ei^M@I4xl_Gi5C_ zH)c6FIX5+9I5K3DT?;29WMMO7Vlp*3EoC(@GA%SQVP!31H8*B0IXPr9F*0R1F*Iah zlc)tF*vh*4qgcst>03O00006VoOIv0H6R0019L#NFkH) z7a)HF4>}Tq`X|i*008_+L_t(o!((6=1*2dTjDk@xz<`ld4SGuY|3$yPV0g_f!2qK# z-Mh$0t^-&|wcO0fG>UGssH3Uf+Posetp4k?)>{@HeaqV9O2Pn zusM8~;RufogXq^640H*B_cAsNjjZ>gcxQjkWC&tlV0iraF@x*WK8AW3n`I0y*OKJ` zCQ=mJe7VBF+tJVPxuTHa@#Dt~3=9kmAF_)WY`$C}I|N8_z!4rDxTOM9`!K}m5&|%Q z>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHj^sEF zMgO&mS%USTC@n`%V0O^UpF`OZU74K)R896z4<-U(J8W4Zc`q+1xBmF|cK_lNie#5W zORhOzd{Rv{G%m_@f7&_vE1l!{gy#|eKiqfk2Z39WbG-kS{C|vp-S_Va?o;DRewe6? z=RyDYpr&X3@@b-Hp=cJF74w;>J`=@oKk&~4?RM+Rwdjv7^mU)-%ad~doE@UxuD>Sv z{68tto5IZ)!iqj#977DZ0nvWR#da?2m>9?)t|eBEKE7f?K)#C8^@COJGb-;Z|C9Tl zK#BRj@3`?Xn1A_w{_?(;uY>PSh<{i)j`zwR?yr2+&+fc_d(YzbUblBGWkQ-Cr{2-A z3kG&V9?xr;uksVF^?WPe;$ZIpoq3I`^BunWK$N#ne){IOU*|mhz{C_*P|hKY5YN35 zHPkTT<-jJ{*YBWUHDdw80lbmB;cbgQ>(;Z}@P&n^XMbeyOy-RW&JKUa_oox>ZIt)^ zD(_ffS1=M{h9PH1MgfT5FCNJW@ay~eW4J~TloRHHgYD|~6kYtoE#pxQ$gboB=BuuOfDaH&qCD_`$qyCHy67Jh* z7C=bMQGbDkWCE*%u)!Zq1r9Zdl0+nnN|7op$DFd{oHd*HHI157G^=XSs;$J5ij-Wm z6jy3#HPnbWO3hVkskOGoqK%mwZ#M?C)@ zs=lW1CMRN;fmlc$#MKah(7`aficcvxgU&F!Y9K2lV5Jy1(;H$Sn3fN+{TsVKk^6v~ zOX*vZo~MYYxAzy?PvGW}8@- z7vu73O|-T;$8M|DwCnM&s~y|)m0YuMg@0Pghz++o`94Qu$Z58im%6T7>h40$SHE;0 zQ#AR7-W|Ix&hB;bt+QX<2~nSFLN;aWB8{WYv=dq?{RS{f_EXW1(J-s@(G3H%q#-B4 zKq|qh>2H+XhU_^Itzi!qW&XU)G#+?+QAX^T(KP8>@DSe((XkWs*qbUsAhhB%?|-OA z*%*nfWARv*ze%xanhHGFJ#OT)-(jjuSEuJfw+FqWtHGmL#@5SccNF=?PtpVs15jg09Y8&#A!K5j;N*gf4<<{0DNp@}UoiO;c zn>lv_(JYFRL*ASE8xDu4C`xTx5L zf(X%9{&_MiV_6`G7Iq47gS(4Hp|;tk?#b@3v`t3W++DL|Ur9?}qmQvK!(tT%L=t%W zhyuurBcf^&W4ME5m3$JENTr>9LSpw$iECe#xd=2wpEM4{(LjVXctTD=5t3yQw6!w0 zRmQ;Mwy)WGb%;VJaQ$I@zkhJ+zY&2a*xI2@!SPOjeU6c2#LpZ<6-9!Gbj!ueM5I^m zvgnPXuNFqxq?x)MBgtTrpHYm#pC^ASexdhlVuQ|(uF%^b5jrlTqQ@Ss$h69sbZzu~I+{C#Z-1TdVrRXo$V#9l zX_bQ$J|!sIPD;?j(Sq$D0A&Dx(Q4w2EiRG^N4ERw)*9U!&bIJ3&+hY$IQvPg)ibGE zmek@&s&`qbs~f{T{i(oyMrp6)oTD1Z04iETLI?{&Mx7^k^hqA$_*i|0)(ZTO^J;}) zCkq35MeoP*ldZ{epnpJ*I7Z$_F>Niiq-nLB#MpA#crtlg3@OwLoIn%wi1`<2UY(b9dH`;byLj^H&SJ|bz`O}IRuTD^jo+cLGFRTb|ckQ>cj zf-?HbbIOncE0j6$J>3QGA;wfaIt&sKu|vk2>h!}@xB2RjM}M*}bTW|+AP_5Bn?+a< zKBc%&6WLDiM~FRPxuBUD#=_(ZyhLC%E&1)f3dqL9PW|;8oBFW2_#tl_9$99xP9xTVNYQg4qTmn)0%R zI%L#tT3l%k(tm_U8a6MOi;F3(@)FJ>(!tC+qB017oRzWyNAs-biu4iP^fSlp`^0{cyHDl|5$*miup8%Y8=+-xt?6NgQottRyMK z=fvX%U6A;Z>$1yloQn<%JTq)$QuD-NVzJo4atE`Lp%PCMM-)|~d?D+y!g-6cTB)(t zJ^2emd2J=lb(%wnV+jc)AwotCWmI4xN~=bSi4^U}Jp6->KS?f`TxBqFET9S%lH&*e zgMZ)MnuV!JHz^bYx?XJiV+0890?oQ@e;?a+^91le16NwxUu^)hpQP8@TI2}m+XgPK z+nT%wTj20<--Q(Te zoxS~grq$mMV`XxoiXT1L000l1X;fHrShJM~wgMw$IW%E3GB{x^VmM?lEi^b`W-Vf5 zIXNviW;8i5HDh8nWHpm+3m_ynGdN~BHaRpcGdVdqEi^GSHZ5W}VKOZ+V=^#hIWc4~ zFl8{4vI{69V`MlpHZV0UVPax9Ei^S_VJ%{1WMM5hFkv%eW@R*FH#udK{R>A6Gcz?c zF)}tYH#Il2PYehGBr-HJV=^&iW-T@{F=j0^GC46VVlrc4EjMH}H!)!`WMnpCGn0D` zPY5wEIyE^uF)_2!4qgcsiV+AZ00006VoOIv0Kfpi0KgiZ2UL?r7$JWLI}2@2*G&Kb z0wPI7K~z}7?Uqky6G0S*zuhF-rtwbps3j^xzF|WX}xO6303yyAw~Q( zGBUEuY@XJubP1(?^Pds?Y5vb6Q1lOSCw!Bo4i_i(bmEN0a7JSk{e#U(!m*wnacS}z zs&3-(`*?N#AqG%tcd=fDyH7GC6AzSzA;=!P#ixmh-x6@{^zDBiR)&V=0Kj!UuxWTV zN1rxAJ~;(|J2&5W1ShYKW8Y%O)9K~oqZtISx~+rlC`>)eN+VEZ5h(9c=o?iwOhH>D z!VWD$Whsqn3QI|-${sNLHN^WA?zeAfQ^8cBy*J3}O4zc_-z* zy%dTHZGj+4K8-u~y736&B?UF2Q64zThq(k_77_>>ln;cOgTR$sgl-4xyTEaN0CngP z>!mFA-L}TJ;^EO*0dTo<9*@J$a(|G@R|C`7%DwS%OaDaz>GxZUoD;R~S1UVbG)6u- zCEbLi5e$#ciW`m$$H&g#(?;qq;kTKKzeK2|mSprDY-!I)8}}yI00000NkvXXu0mjf DRaB^>EX>4U6ba`-PAZ2)IW&i+q+U=NIvfMZh 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 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 index 192cb283290b4cb63e1cfb10b9f810fb489e1817..b35a2acc0f35c17db2ed3b9dc71defa390b8a36b 100644 GIT binary patch delta 2982 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 diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json index bdc735cb6bb..2e9bfc36170 100644 --- a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/meta.json @@ -13,9 +13,6 @@ { "name": "icon-mail" }, - { - "name": "icon-primed" - }, { "name": "icon-food" }, diff --git a/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/spent.png b/Resources/Textures/_NF/Objects/Misc/mail_capsule.rsi/spent.png index 552d6abda72d19945b3bf962842de6896e0ce5a7..acd0d0577fcf2c69dafee98bdeea2787236ac4f8 100644 GIT binary patch delta 1809 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 Date: Thu, 8 Feb 2024 21:39:42 +0300 Subject: [PATCH 05/12] Update after upstream merge --- .../Entities/Objects/Specific/Mail/base_mail.yml | 4 ++-- .../Entities/Structures/Machines/lathe.yml | 15 ++++++--------- .../Objects/Weapons/Guns/Launchers/launchers.yml | 2 +- Resources/Prototypes/_NF/Recipes/Lathes/misc.yml | 2 +- .../Weapons/Guns/Launchers/mail.rsi/meta.json | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) 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 934cf9242b2..18f2f6d0005 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml @@ -95,7 +95,7 @@ - type: DamageOnLand damage: types: - Blunt: 5 # Frontier halved the damage + Blunt: 10 - type: CargoSellBlacklist - type: Food # Frontier - Moth food requiresSpecialDigestion: true @@ -113,4 +113,4 @@ noSpawn: true parent: BaseMail id: MailAdminFun - suffix: adminfun \ No newline at end of file + suffix: adminfun diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml index b7421ba9d8d..7c9936d2bfa 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml @@ -99,35 +99,32 @@ - CableMVStack - CableHVStack dynamicRecipes: - - LightReplacer - - TrashBag - - WetFloorSign - - Bucket - - MopItem - - MopBucket - KitchenKnife - ButchCleaver + - LightReplacer - Holoprojector - TrashBagOfHolding - MopAdvanced - HydroponicsToolScythe - HydroponicsToolHatchet + - MopBucket - SynthesizerInstrument + - TrashBag + - WetFloorSign - MiniHoe - HydroponicsToolScythe - HydroponicsToolHatchet - Spade - Clippers - Shovel # Below is shared with other lathes + - Bucket + - MopItem - SheetSteel - SheetPlasteel - SheetPlasma - SheetGlass1 - SheetRGlass - SheetPlastic - - CableStack - - CableMVStack - - CableHVStack - type: MaterialStorage whitelist: tags: 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 a55c82aeea5..30cf3965c24 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -86,4 +86,4 @@ whitelist: tags: - MailCapsuleTag - capacity: 4 + capacity: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml index 764ef3f76a9..22e1f9605f7 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml @@ -12,4 +12,4 @@ completetime: 1 materials: Glass: 100 - Plastic: 100 + Plastic: 100 \ No newline at end of file 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 index fea86ac86cc..464c22d1a7a 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json @@ -30,4 +30,4 @@ "directions": 4 } ] -} +} \ No newline at end of file From b9ec8e29e040a1529493763931f48894bb661581 Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 10 Feb 2024 04:49:02 +0200 Subject: [PATCH 06/12] glass --- Resources/Maps/_NF/Outpost/frontier.yml | 232 ++++++++++++------------ 1 file changed, 113 insertions(+), 119 deletions(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index b68cb400ba1..979eafe0df5 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,7 +6992,7 @@ entities: - uid: 2232 components: - type: Transform - pos: -48.365223,6.623182 + pos: -48.22512,6.5454493 parent: 2173 - uid: 2233 components: @@ -7004,7 +7004,7 @@ entities: - uid: 2391 components: - type: Transform - pos: -45.40057,16.392315 + pos: -45.611477,16.755453 parent: 2173 - proto: BoxTrashbag entities: @@ -16024,11 +16024,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 +16034,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 +16064,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 +16150,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 +16178,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 +16283,7 @@ entities: ents: [] - proto: ComputerCloningConsole entities: - - uid: 1473 + - uid: 2231 components: - type: Transform pos: -48.5,13.5 @@ -16480,11 +16473,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 +16514,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 +16549,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 +19638,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 +30484,7 @@ entities: - uid: 5691 components: - type: Transform - pos: -48.873768,6.612765 + pos: -48.70429,6.6912827 parent: 2173 - proto: IngotGold1 entities: @@ -30507,12 +30505,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 +30584,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 +30649,8 @@ entities: - type: Transform pos: 8.5,18.5 parent: 2173 + - type: Physics + bodyType: Static - proto: LockerJanitorFilled entities: - uid: 4325 @@ -30716,12 +30709,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.776226,16.649557 parent: 2173 - proto: MailingUnit entities: @@ -30816,7 +30809,7 @@ entities: parent: 2173 - proto: MedicalScanner entities: - - uid: 1475 + - uid: 2567 components: - type: Transform pos: -47.5,13.5 @@ -30978,7 +30971,7 @@ entities: - uid: 2551 components: - type: Transform - pos: -49.776596,10.821695 + pos: -49.299927,10.571657 parent: 2173 - proto: NitrogenCanister entities: @@ -31179,11 +31172,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 +31183,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 +31465,7 @@ entities: - uid: 4429 components: - type: Transform - pos: 33.5,21.5 + pos: 32.5,20.5 parent: 2173 - uid: 4463 components: @@ -32486,6 +32479,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 +32495,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 +32520,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 +34887,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 +36134,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 +41748,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 From 8abd81af35b797a16dd220235ddec3fa390a38db Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 10 Feb 2024 05:15:23 +0200 Subject: [PATCH 07/12] Update frontier.yml --- Resources/Maps/_NF/Outpost/frontier.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index 979eafe0df5..c5093d49d08 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -6999,6 +6999,13 @@ entities: - 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 @@ -30714,7 +30721,7 @@ entities: - uid: 807 components: - type: Transform - pos: 28.776226,16.649557 + pos: 28.522831,16.557152 parent: 2173 - proto: MailingUnit entities: @@ -41862,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 From 928db426a25edbc98046eef5422919b8ee2544aa Mon Sep 17 00:00:00 2001 From: Dvir Date: Sat, 10 Feb 2024 05:26:17 +0200 Subject: [PATCH 08/12] tag fix --- Content.Server/Nyanotrasen/Mail/MailSystem.cs | 1 + .../Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml | 3 --- .../Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml | 2 +- .../_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 4 ++-- Resources/Prototypes/_NF/tags.yml | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs index 929011e58ed..23393c7eeec 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 } 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 18f2f6d0005..73a75cae24d 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml @@ -4,9 +4,6 @@ id: BaseMail name: mail-item-name-unaddressed components: - - type: Tag # Frontier - tags: # Frontier - - MailTag # Frontier, because it has food component (thanks, Moth-person) - type: Item size: Normal - type: Mail diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml index 66f140e1fd9..74f0920c0db 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -11,7 +11,7 @@ removalTime: 0.1 - type: Tag tags: - - MailCapsuleTag + - MailCapsule - Trash - type: Sprite sprite: _NF/Objects/Misc/mail_capsule.rsi 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 30cf3965c24..3821af30aa7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -85,5 +85,5 @@ proto: null whitelist: tags: - - MailCapsuleTag - capacity: 4 \ No newline at end of file + - MailCapsule + capacity: 4 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index cb8f1e3c5fc..6264405762b 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -50,7 +50,7 @@ id: PrizeTicket - type: Tag - id: MailTag + id: Mail - type: Tag - id: MailCapsuleTag \ No newline at end of file + id: MailCapsule From cf6e3e57d156a9e13511c20b8644cfcac8a232fb Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 10 Feb 2024 05:32:37 +0200 Subject: [PATCH 09/12] Update mail_capsule.yml --- .../Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml index 74f0920c0db..837ec14fee1 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -28,7 +28,7 @@ tags: - Book - Document - - MailTag + - Mail components: - Mail - Paper @@ -120,4 +120,4 @@ amount: 6 - type: Sprite layers: - - state: box \ No newline at end of file + - state: box From a005f8c3422e83ac420eb66f8d8c55b9d35e5bc1 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 10 Feb 2024 05:33:35 +0200 Subject: [PATCH 10/12] Update mail_capsule.yml --- Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml index 837ec14fee1..c2228df87b0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -76,7 +76,7 @@ tags: - Book - Document - - MailTag + - Mail components: - Mail - Paper From 24548b61376453d1c3c6f7f33c5546bf98c1020a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 10 Feb 2024 15:39:36 +0200 Subject: [PATCH 11/12] Update MailSystem.cs --- Content.Server/Nyanotrasen/Mail/MailSystem.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs index 23393c7eeec..f8f75232930 100644 --- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs +++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs @@ -726,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); } From fb2d10ff6646cdb326e0bbea3455b44b34c3ea59 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 10 Feb 2024 15:40:44 +0200 Subject: [PATCH 12/12] Update mail_capsule.yml --- .../Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml index c2228df87b0..9b2bbe148b0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mail_capsule.yml @@ -114,10 +114,13 @@ id: BoxMailCapsulePrimed description: A box of primed mail capsules. components: + - type: Storage + grid: + - 0,0,4,3 - type: StorageFill contents: - id: MailCapsulePrimed - amount: 6 + amount: 10 - type: Sprite layers: - state: box