From 6ba85012b23b25d0c8a204b63190fdfea4553824 Mon Sep 17 00:00:00 2001 From: Ichaie Date: Fri, 1 Nov 2024 13:36:08 -0300 Subject: [PATCH 1/6] new closets --- .../Storage/Closets/Lockers/lockers.yml | 28 ++++++++++++++++++ .../Storage/closet.rsi/bartender.png | Bin 0 -> 292 bytes .../Storage/closet.rsi/bartender_door.png | Bin 0 -> 309 bytes .../Storage/closet.rsi/bartender_open.png | Bin 0 -> 279 bytes .../Structures/Storage/closet.rsi/jan.png | Bin 0 -> 298 bytes .../Storage/closet.rsi/jan_door.png | Bin 0 -> 308 bytes .../Storage/closet.rsi/jan_open.png | Bin 0 -> 277 bytes .../Structures/Storage/closet.rsi/meta.json | 27 +++++++++++++++++ .../Storage/closet.rsi/syndicate1.png | Bin 0 -> 328 bytes .../Storage/closet.rsi/syndicate1_door.png | Bin 0 -> 352 bytes .../Storage/closet.rsi/syndicate1_open.png | Bin 0 -> 310 bytes 11 files changed, 55 insertions(+) create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/bartender.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/bartender_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/bartender_open.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/jan.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/jan_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/jan_open.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/syndicate1.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/syndicate1_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/syndicate1_open.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index b38a77b82b7..fbc91b0a348 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -194,6 +194,20 @@ - type: AccessReader access: [ [ "Hydroponics" ] ] +#Janitor +- type: entity + id: LockerJanitor + parent: LockerBase + name: janitor locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: jan + stateDoorOpen: jan_open + stateDoorClosed: jan_door + - type: AccessReader + access: [ [ "Janitor" ] ] + # Medicine - type: entity id: LockerMedicine @@ -394,6 +408,20 @@ stateDoorOpen: syndicate_open stateDoorClosed: syndicate_door +- type: entity + id: LockerSyndicateAgentLocker + name: syndicate agent locker + parent: LockerBase + description: It's a personal storage unit for agent gear. + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: syndicate1 + stateDoorOpen: syndicate1_open + stateDoorClosed: syndicate1_door + - type: AccessReader + access: [ [ "SyndicateAgent" ] ] + # Bluespace - type: entity id: LockerBluespaceStation diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bartender.png b/Resources/Textures/Structures/Storage/closet.rsi/bartender.png new file mode 100644 index 0000000000000000000000000000000000000000..5846a93d96ee20b2f83f58b93608d950591d05e9 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilo1AIbU1qB6VWMuU9^?Q4JO-)TbJw2B!S(25NrKqT=rlw|KV4$I)0aRO& zU-bY;@s%38WeaM zF0P#Y?eTB>eDC8?2AoZ=mK6uD;Wv@E!mY;O?DnRjRUp}GBWIe<`En+eQ!}N$Fg-av z{Zc(sK-+U=p6?w7EA3yf9bB`ITddT4LTX}jLTLY8$9hrW}-0*$)xPWQygCq7aqUY)*IQ=zP#G7vJs$u{t jWVn6o`1H6R3%AOuX{%g6q`k=!=o$u3S3j3^P6NT^vI!{O?XOU5rkhAj==f{Ositj!iY)T1;Eradjz?EtzjWpeTeY`H{blR2t3Wp} Nc)I$ztaD0e0sxueTzCKg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/jan.png b/Resources/Textures/Structures/Storage/closet.rsi/jan.png new file mode 100644 index 0000000000000000000000000000000000000000..dd15c4a3a69479575b7535b5fa48b3be46a09ca7 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUJvd$S_%auY%sP1R;2x`Oj~+dmJbAK)hK7}um5q&!qobpXi%UR2 zKm>OfP{&0*-EBaMza+>n_&*9@xN>L4LZB39fk$L90|Vb-5N14{zaj-FnCKqiw70e$F8K z6DvemeN0Zt+?Y1qJVl^R$^YH;gKuWBc2`TUSr^Ih=)k{#J1n!a#Tqm;${vSqRApNj aRUW)U>+huLCc;2#89ZJ6T-G@yGywp*z-|!$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/jan_door.png b/Resources/Textures/Structures/Storage/closet.rsi/jan_door.png new file mode 100644 index 0000000000000000000000000000000000000000..055374e977c54daa806937f82379091c058e2721 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik70(?STljRckSZ#as=+Q!vSqBduY|(7YRm}F6@HG`MS+Qb8Utb?kVNXl; zRv^Vw666>B9|0JI?w>mc6z44Ph%9Dc;5!V$jK}j=qyPmQJzX3_Ec~BNaO7)H;9==@ z4gCH8|E|_!A|f_fkKQgd=<22ef+ty4HwdSRie1|fxFIa`=HwkU-)dL1zDVYN+P)VM(9sMdwJz;7337raYUs7ZACd9}|$ mI%osej_`@HnJZhgmDrCwQqefaFM1y67zR&QKbLh*2~7aHjdLCV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/jan_open.png b/Resources/Textures/Structures/Storage/closet.rsi/jan_open.png new file mode 100644 index 0000000000000000000000000000000000000000..d2da542a6318af35756bde62311a62ef75dd1b3a GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbUljRb_q(XoCepx6oD_1dF%`#w*)izTB6QKN=U%H!t6lY10U+{k@ zU&UEen{v9HgnVV#6 zOkU2JGB-y_aPb3wrUtQgSrh(3OUsCv3p)f328U{`m=$>N&66 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index d3802637c05..23e024d043a 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -511,6 +511,33 @@ ] ] }, + { + "name": "bartender" + }, + { + "name": "bartender_door" + }, + { + "name": "bartender_open" + }, + { + "name": "jan" + }, + { + "name": "jan_door" + }, + { + "name": "jan_open" + }, + { + "name": "syndicate1" + }, + { + "name": "syndicate1_door" + }, + { + "name": "syndicate1_open" + }, { "name": "syndicate" }, diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate1.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate1.png new file mode 100644 index 0000000000000000000000000000000000000000..879f85b6392b41fcb96353ef8bfad2d19266cd5f GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilg0(?STHAF?VwYA$B7)(t~0|NusGcXuPN~#D8`v4gR1{M|;_O`ZG78VME zf=&(&?yjy*%E~~k&sp+-CNT(=1o;L3M+Xd#_U{)0%5oNXL>4nJ@ErzW#^d=bQh+0%iXlO`E zN{Wbx$jQl7$;$(^P8H?b1f+yYg8YL2qXULV`}Ye0WjPBxB8wRq_zr_G6gAa-=rxyKZPFb^YZQWJ< zO+G${&NzjsUtzr7(6M}h@T-Q92OpbeGpZjdWP9|g)x9KcUqgsv_GQjqg_aGz2i50Z z;P^DJ{37RF#!AM%S$;2AjIJ(TB5c*z{L1%${+@>WYhs(1d#YtxE##Xbp0|QseCj8* Y9zkol1#l(z_ja`(L)r5uR1q3YR{vwZVOk01gFVj6(#2f-*OM~ z9`s!Bv+Y5 Date: Fri, 1 Nov 2024 13:55:13 -0300 Subject: [PATCH 2/6] bartender locker --- .../Storage/Closets/Lockers/lockers.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index fbc91b0a348..854807c7340 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -18,6 +18,20 @@ openSound: path: /Audio/Effects/woodenclosetopen.ogg +# Bartender +- type: entity + id: LockerBartender + parent: LockerBase + name: bartender's locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: bartender + stateDoorOpen: bartender_open + stateDoorClosed: bartender_door + - type: AccessReader + access: [ [ "bar" ] ] + # Basic - type: entity id: LockerSteel @@ -194,7 +208,7 @@ - type: AccessReader access: [ [ "Hydroponics" ] ] -#Janitor +# Janitor - type: entity id: LockerJanitor parent: LockerBase From 166f94d490a36aa0f4eb6748e28f4e7467407b77 Mon Sep 17 00:00:00 2001 From: Ichaie Date: Fri, 1 Nov 2024 20:16:20 -0300 Subject: [PATCH 3/6] new sprites (PDA and rad wall locker) --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 12 ++ .../Entities/Objects/Devices/pda.yml | 143 ++++++++++++++++++ .../Storage/Closets/wall_lockers.yml | 12 ++ .../Objects/Devices/pda.rsi/meta.json | 21 +++ .../Devices/pda.rsi/pda-captainnano.png | Bin 0 -> 416 bytes .../Objects/Devices/pda.rsi/pda-cenano.png | Bin 0 -> 399 bytes .../Objects/Devices/pda.rsi/pda-cmonano.png | Bin 0 -> 400 bytes .../Objects/Devices/pda.rsi/pda-hopnano.png | Bin 0 -> 407 bytes .../Objects/Devices/pda.rsi/pda-hosnano.png | Bin 0 -> 406 bytes .../Objects/Devices/pda.rsi/pda-qmnano.png | Bin 0 -> 441 bytes .../Objects/Devices/pda.rsi/pda-rdnano.png | Bin 0 -> 426 bytes .../Storage/wall_locker.rsi/meta.json | 5 +- .../Storage/wall_locker.rsi/rad.png | Bin 0 -> 224 bytes .../Storage/wall_locker.rsi/rad_door.png | Bin 0 -> 335 bytes .../Storage/wall_locker.rsi/rad_open.png | Bin 0 -> 287 bytes 15 files changed, 192 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-captainnano.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-cenano.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-cmonano.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-hopnano.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-hosnano.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-qmnano.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-rdnano.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/rad.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/rad_door.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/rad_open.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 3a9211d2489..eaf35667ef9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -307,3 +307,15 @@ - id: WeaponSniperMosin prob: 0.0010 orGroup: syndiemaintloot + +- type: entity + id: ClosetWallRadiationFilled + suffix: Filled + parent: ClosetWallRadiation + components: + - type: StorageFill + contents: + - id: ClothingOuterSuitRad + amount: 2 + - id: GeigerCounter + amount: 2 diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 3ff5a3955a9..3c9224e33f8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -365,6 +365,27 @@ - NewsReaderCartridge - MailMetricsCartridge +- type: entity + name: LO special PDA unit # DeltaV - Logistics Department replacing Cargo + parent: BasePDA + id: QuartermasterNTPDA + description: PDA for the guy that directs logistics.it says in gold "special unit unique to the best logistics officer in the sector". # DeltaV - Logistics Department replacing Cargo + components: + - type: Pda + id: QuartermasterIDCard + state: pda-qmnano + - type: PdaBorderColor + borderColor: "#e39751" + accentVColor: "#a23e3e" + - type: Icon + state: pda-qmnano + - type: CartridgeLoader # Adds the MailMetrics courier tracker + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - MailMetricsCartridge + - type: entity parent: BasePDA id: CargoPDA @@ -495,6 +516,26 @@ - type: Icon state: pda-captain +- type: entity + parent: BasePDA + id: CaptainNTPDA + name: CAP special PDA unit + description: incredibly shining with embossed details.it says in gold "special unit unique to the best captain in the sector". + components: + - type: Pda + id: CaptainIDCard + state: pda-captainnano + penSlot: + startingItem: PenCap + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#7C5D00" + - type: Icon + state: pda-captainnano + - type: entity parent: BasePDA id: HoPPDA @@ -516,6 +557,27 @@ - type: Icon state: pda-hop +- type: entity + parent: BasePDA + id: HoPNTPDA + name: HOP special PDA unit + description: Looks like it's been chewed on.it says in gold "special unit unique to the best head of personnel in the sector". + components: + - type: Pda + id: HoPIDCard + state: pda-hopnano + penSlot: + startingItem: PenHop + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#789876" + accentHColor: "#447987" + - type: Icon + state: pda-hopnano + - type: entity parent: BasePDA id: CEPDA @@ -531,6 +593,21 @@ - type: Icon state: pda-ce +- type: entity + parent: BasePDA + id: CENTPDA + name: CE special PDA unit + description: Looks like it's barely been used.it says in gold "special unit unique to the best chief engineer in the sector". + components: + - type: Pda + id: CEIDCard + state: pda-cenano + - type: PdaBorderColor + borderColor: "#949137" + accentHColor: "#447987" + - type: Icon + state: pda-cenano + - type: entity parent: BasePDA id: EngineerPDA @@ -568,6 +645,28 @@ - type: Icon state: pda-cmo +- type: entity + parent: BaseMedicalPDA + id: CMONTPDA + name: CMO special pda unit + description: Extraordinarily shiny and sterile.it says in gold "special unit unique to the best chief medical officer in the sector". Has a built-in health analyzer. + components: + - type: Pda + id: CMOIDCard + state: pda-cmonano + penSlot: # Fancy Pen Light + startingItem: CMOPenLight + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#d7d7d0" + accentHColor: "#447987" + accentVColor: "#447987" + - type: Icon + state: pda-cmonano + - type: entity parent: BaseMedicalPDA id: MedicalPDA @@ -656,6 +755,28 @@ - NewsReaderCartridge - GlimmerMonitorCartridge +- type: entity + parent: BasePDA + id: RnDNTPDA + name: MY special PDA unit # DeltaV - Epistemics Department replacing Science + description: It appears surprisingly ordinary.it says in gold "special unit unique to the best Mystagogue in the sector". + components: + - type: Pda + id: RDIDCard + state: pda-rdnano + - type: PdaBorderColor + borderColor: "#d7d7d0" + accentHColor: "#447987" + accentVColor: "#8900c9" + - type: Icon + state: pda-rdnano + - type: CartridgeLoader # Nyanotrasen - Glimmer Monitor + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - GlimmerMonitorCartridge + - type: entity parent: BasePDA id: SciencePDA @@ -714,6 +835,28 @@ - CrimeAssistCartridge - SecWatchCartridge +- type: entity + parent: BasePDA + id: HoSNTPDA + name: HOS special PDA unit + description: Whosoever bears this PDA is the law.it says in gold "special unit unique to the best head of security in the sector". + components: + - type: Pda + id: HoSIDCard + state: pda-hosnano + - type: PdaBorderColor + borderColor: "#A32D26" + accentHColor: "#447987" + - type: Icon + state: pda-hosnano + - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + - SecWatchCartridge + - type: entity parent: BasePDA id: WardenPDA diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml index 4280b960b4c..e16df3bfb99 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml @@ -22,6 +22,18 @@ stateDoorOpen: emergency_open stateDoorClosed: emergency_door +- type: entity + id: ClosetWallRadiation + name: radiation wall closet + parent: BaseWallCloset + description: It's a storage unit for radiation equipment + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: rad + stateDoorOpen: rad_open + stateDoorClosed: rad_door + - type: entity id: ClosetWallFire name: fire-safety wall closet diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 37355b77a1d..1debaf447f2 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -34,6 +34,27 @@ { "name": "pda-atmos" }, + { + "name": "pda-cmonano" + }, + { + "name": "pda-hopnano" + }, + { + "name": "pda-hosnano" + }, + { + "name": "pda-rdnano" + }, + { + "name": "pda-cenano" + }, + { + "name": "pda-qmnano" + }, + { + "name": "pda-captainnano" + }, { "name": "pda-bartender" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-captainnano.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-captainnano.png new file mode 100644 index 0000000000000000000000000000000000000000..010eef5ffc495e9e7345b7948caba663ecafea9e GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij)0(?STEzHb-OjA=e2E9lIb)Que875aUH0LrfxOX}@=rfq4t=cuKWp)k& z!_0!#CO>_%)r2R7=#&*=dVZs3hwoEaSXBWe>(9tU$X*FTe>Fm7NrvQd;fjIJGwe!x7|*y z-=XmI@#72LKPSX9mwc;EXwY>&8}*h!!sT{RX?XGt4 zV@c|9F+8+GVU>edr-rITAnT{R6UFBuna!Nzia4Y$yz^k$6mPtN;jO@fnWoIAjW6q7 zl&wg7W_-c^ROA(&PbOu3@|$j-`txVmdKI;Vst0NqQZWB>pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cenano.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cenano.png new file mode 100644 index 0000000000000000000000000000000000000000..fe92a1fbbb3c67ee7b9e8100407c03da4f17ea8a GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik_0(?STEzHb-OjA=e2E9lIb)P8{cL2DEP zLt5Rm^mC`QYp14V)rB!w7W}`#@E@p?fnjmPc~>AMRubeF{2v=&V7zqT2~Y)Rfk$L9 z0|Vb-5N14{zaj-FxW&`OF~q|E=|o4N!wMX((yXROGPJ+`3)fBYxx_lN?Dos}L$lit zt*t+?p3&^Lt-(&)$!Q_}2Pzq+G#vX~Ai&O0$gxQ1B*Pt_SvQxuGMK-5?{IFWM*8$H z24Rh*0#hGNI%B|K!?WW`m)HjBg0+TG2fn!}wSPUdpiXj;a?W9&r*SV9D(f8Hxq>Z0 z@=12jiQbv1laHcSW-3;qMOF)$Qt5_$`yL`#DFg8yRy4B9tqUjY?x7I;J!GcfQS z0%1l`4X*~E;7(5$#}EturxWk;9a7+FUApCfm0Rhjf9JCzZ$xa8+G{$m;A-8Re|KN8 z|CLJEe4m-GZ09mLS%wOipv1}FA1d%MB%62idayAFoBK{kV_k6kyu-Pfmgyeci#VqQ z&G2qqV#?FN$3AOoB=-&3jD-@q39lzg-rCaEtg%6qaput?0ol!Wxa}Rp1a~qe2Wl^R zx?nNq#5KQm_g3CrQoo2JbJNq0RovoDRvk;0=(iM}lU;FpVtdsWmOYo_8Mf|YI2q%( V`0-v(O`sroq zEnPHo=KmWEwNulw>cT2!lttCV{AXZr2nU+Tpncd0sE9$lB*-uLKUTo-%;8xaPzh&& zM`SSr1K(i~W;~w1A_XY8!_&nv#KQmS#fyB+3OuYAA_ZMq@=`zipTEmVz~{}Ty?VPp z9z5`HQNd~XPuULJ?l*Jx`KacWFwD4m!bU%~WI>7c1y>2i16kf-2GYzKkJBH_*?i5? zV0VzxhkMblZ6)qGGb}W3(QQ#^T&(!UF`M&B{uZ%{y;mA|Ua2)md-0yw|MLAkJBD(X zJxs6IMLUEwghN7-klKPcS{-56mq{K^t{DS{u1q{y|p2Y!`a29w( z7BevL9RguSQ4OyKpx|~-7sn6_|ECi#@*Ps(agEJvEbR$h{^$SlD6tgpu*K_-3C}xq zQg`X}PmS@yIp3=j8^oQLhL$tRC}~C%o-1F>EfM9g!p($5VyBVQoREevdoE4YXHyi; zbu61uoOVuf(KiE@SDYrg+;dr9avFJaOxv(`qU4e!?r7l&Cw&xTjpL2)H>7>${q4TC zBdn=U&1F;8f2(Id)$hu>%2h?a|G207V70G6XJG&L-&XNXH>d5nyo&vyY`x-?Pb?3Q Vd$8U+^bX`N22WQ%mvv4FO#sCOoYVjS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-qmnano.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-qmnano.png new file mode 100644 index 0000000000000000000000000000000000000000..e1479a7bcdbd2a6d6d82455c5cb7f67530e0064b GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilW1AIbUEzHb-OjA=e2E9lIb)Q9cc8{kAUhE4xSZ;i#(T2gj)4@T1)vj4B zvvXD|D;KmzEn;G-o0cw`Ig^0_h|>PwV5ps%mQ@$VU|Em`G{_|FKagZ#2=wUf2U4;n zL4Lvi@c@R%w&z(ug`5Q*k;M!Qe1}1p@p%4<6rkWCPZ!4!3;(ARFY+}R@VG9WW;nAn zFM##Q|NWQydK@}R+Fb2zlsgozSG&cTcV5qLF1e)_9WU392k}3)E3;vG_ zFo-BI+ybiNEbxddW?1N+h$^!8pXJ!V@gv-&&yqP;?@q)TsdNXj0Oeg z81j4=PW|E7^Zm@d=Gi@gjvS4aECrdotQYP%B;Q)YwvBDpi74JR)hTT?QA-_#BE%Ub zU9%^YoGIX~VV>#ogy)s(-QJ5*0_lpA+<#fif3BJQR@l`;;B$F#U3Xe!Q1c0!?&8|` p`NhnIwNGXl**28_py5q6L650ss8(04es8Aiv=MV89^d&Flsg z;wG9EM5Y*~f(;&&& zlftUw(cs1mdxI1*?WgQu&X%Q~lo FCIIRXJSzYI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/rad_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/rad_door.png new file mode 100644 index 0000000000000000000000000000000000000000..7f0f2489532e989aaeffb386c754c329abb32450 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilg0(?ST!@YSkB89iiQE|8BeR8#fnUPIGguT5?UQwE}AW>@j0!^U8noM4M z6XB{96;?*hj#5#e$Std4kbOcWL4Lvi(E-Dw{riQ0vYZ7Tk;M!Qe1}1p@p%4<6rf;> zr;B5Vh5y|N-h77@cvzV;Kk{Gt^>4av@0t^ig}Xa;d89X9y!=Aa@TK@a-x-q*A2kaN zE>q#&Yw-QgwoCe(TNf9^|5TWhuaV%ckf4~RCBfOCbVey6duu^P2Fq!tE3Y1BK2$Jh z7D?c1y(6!1#4_gMbcJo-|J-$-n}5SXq%7h^YXdjOD*b~hW>@YqG}Z&%!{F)a=d#Wz Gp$PyVp?mHC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/rad_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/rad_open.png new file mode 100644 index 0000000000000000000000000000000000000000..2beb8fd4d6cdd73a1b0bff71fc7c2daeb475fce8 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil21AIbU-EDcN)k{~Ti@I2GF*CBY6o?nai=>4L0p$(Ng60A#&XOR%;Qvs- z5bR$8lH)A!h%9Dc;5!V$jK}j=qyPmgJY5_^Ec~xda^yRpz`-Io_1AxK@d?7bx1BGm z&7Hklc#%t#`5&(Zr@qYTi2D3k^zEA5818FY4hipMxodfJcx)2iaT+)Ea7HB`T*-Qi z$$i34mkZ~TVK!s literal 0 HcmV?d00001 From 521edf50675d8a6830237b1d07f06645eb0d9d5c Mon Sep 17 00:00:00 2001 From: Ichaie Date: Fri, 1 Nov 2024 22:07:48 -0300 Subject: [PATCH 4/6] add uranium crate sprite --- .../Structures/Storage/Crates/crates.yml | 12 +++++ .../Storage/Crates/uranium.rsi/base.png | Bin 0 -> 337 bytes .../Storage/Crates/uranium.rsi/closed.png | Bin 0 -> 285 bytes .../Storage/Crates/uranium.rsi/icon.png | Bin 0 -> 364 bytes .../Storage/Crates/uranium.rsi/locked.png | Bin 0 -> 147 bytes .../Storage/Crates/uranium.rsi/meta.json | 45 ++++++++++++++++++ .../Storage/Crates/uranium.rsi/open.png | Bin 0 -> 303 bytes .../Storage/Crates/uranium.rsi/sparking.png | Bin 0 -> 206 bytes .../Storage/Crates/uranium.rsi/unlocked.png | Bin 0 -> 142 bytes .../Storage/Crates/uranium.rsi/welded.png | Bin 0 -> 294 bytes 10 files changed, 57 insertions(+) create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/base.png create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/closed.png create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/icon.png create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/locked.png create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/open.png create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/sparking.png create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/unlocked.png create mode 100644 Resources/Textures/Structures/Storage/Crates/uranium.rsi/welded.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 11c963ed228..bd76a87f557 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -252,6 +252,18 @@ - type: AccessReader access: [["Engineering"], ["Research"], ["Chemistry"]] +- type: entity + parent: CrateBaseSecure + id: CrateUranium + name: uranium crate + components: + - type: Icon + sprite: Structures/Storage/Crates/uranium.rsi + - type: Sprite + sprite: Structures/Storage/Crates/uranium.rsi + - type: AccessReader + access: [["Engineering"], ["Research"]] + - type: entity parent: CrateBaseSecure id: CrateSecure diff --git a/Resources/Textures/Structures/Storage/Crates/uranium.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/uranium.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..b0b2f0aef576045d4cd9358f75cdf175debb65a9 GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUeGMdbmbsigdp6fgJ#ct`=+hcuF@~FeV3%ptNObJ1($D%%~ z*}YAWT#_LB#hKyl10jAZi6sXt^6*ChHP2N!SRJ` zA}lLD@bAxE?{LgetK!#`We+}e*1GRho_Htl@ntqOQG@r<6FxJR^=qD1t@+~$bQOcA LtDnm{r-UW|BK&?3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/uranium.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/uranium.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..71706982943bb5fbe888ebc2c5628366e996c0cd GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*F9YvLn2z= zPT9!S6d>W&zi>;-rDspBN!hww2zvh@*u?s`$lhjMCw{?wj(iWry1XT>B%He1W1unp zzt8s~J$d=>MfCzKjuH}UqjJQ)?S1V~;IpOtU-a@{ZjAS1lh)WWbnQJ}R-Ry5&cLx) z;(qKk#@blx?OF>~uhok@XW`4ZBh8Y*_;wB3)VQVn+0VmzcCC9p--A&z;D6KAJBe9- z20Gjghvr;~_x$>5A5fm{_>xG4o}{#Gopn}>1=i{*u|H99QhkR^QaW_(yoi fZmh)Yp7a2TV{an^LB{Ts5aOrZj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/uranium.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/uranium.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f56c7ef4e1f413dad6f0a24bc56b7004624e483c GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUeGMe8Pl&m5=gyQkvtvyGXV0G9S?02L?_PU#5d#B*|2G)Y($Y8@ zEd2fbr-|?_UAh#guSW5`F_0203Gxg6j|Lc2*Un4=N^%x>L>4nJ@ErzW#^d=bQh zJzX3_Ed1a0ALKi%z~ju!skvd@)BpR+3KKcX5+;|;GFd%I_46!?kb5uqLnIxh&pOYx z{e0#7j+t|2^JKEBuqcKK&E$Fco}s5XV(Qy{7bjff+?CsP`szPvo|o+hoN}AKhwkg0VQzx)CM}+V*1Hs|dsj570U;8b{ zSjDrcVYBB{XY=yUt>QgAK%jGi%f9~Sp#%RuD$kkwc-i3wJ$~jTrxa&*^90Bo0D^+Y z$9UW3US55%Rg?XAljI%aXi1j~Erv21imObS?d7e%$}*T*-|}L0?deoAo5*JX@*Q8o*J##>sb(K)f ulUu%_#%>2SBv=j+$89ZJ6T-G@yGywo%`*oK9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/uranium.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/uranium.rsi/sparking.png new file mode 100644 index 0000000000000000000000000000000000000000..87b78b9b4653d54a703643d161f7f8bf353995df GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^2|(QXSZ^$5X5FCBsLJs@fG2hgpXAxzo?UdK185n8r>mdKI;Vst0DN#gB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/uranium.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/uranium.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..94b89fa655da949cd72a05f4ca4438bb89764b66 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY-_ zFCOG%P!w>!nBl!LLFdle1Jma0)vpjq{rP@YBa0goP~nI2d3^rIwe)wN4!xr4xzg-a n#Xj@W=MCBxvgf{XH$0BhzQQx>vT)Q^pi%};S3j3^P60oneEP)Px#;7LS5R9J=W&@pPmFcik|zaXFl(jeJ6O@`tl=oZdmyk;mg&>^$8rgN@rKUr+ydP+h^u7-Xlu}A5rBsKA++{7(RQ}s(h7P+y+uhDA(^O99 zGi6z}b0Gxr&S9-(?meHE3v=%QxHV0i6?xC=di|@fw-G`R06QAtl)`= zFW~EXWjdPy@Vr=1Rn<>n6!E^_1CS(1ZzjvKws-IcUREpVzT#;z;np-1MPc$h7l708 sh>v6Jc-*`9w%PodZOmY;Qc69TZ;Wzr1AKHN?EnA(07*qoM6N<$f;^dk6951J literal 0 HcmV?d00001 From e1faf0c2b3e523d127847814feafe13893311ac9 Mon Sep 17 00:00:00 2001 From: Ichaie Date: Fri, 1 Nov 2024 22:20:59 -0300 Subject: [PATCH 5/6] minor fixes --- .../Objects/Devices/pda.rsi/pda-cenano.png | Bin 399 -> 391 bytes .../Objects/Devices/pda.rsi/pda-cmonano.png | Bin 400 -> 390 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cenano.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cenano.png index fe92a1fbbb3c67ee7b9e8100407c03da4f17ea8a..d01b5b830b592c5398413460b251d3c4fbf55d97 100644 GIT binary patch delta 281 zcmV+!0p|XX1BU~UK>elftbI*hUZuLWc4cPX3Fu|=f)ZPGt_p*Vx6fV*G{+&Ch+b8$5 f=?PrrFF>tN`Yu7w$`U}r00000NkvXXu0mjfNQ!dV delta 289 zcmV++0p9+H1CIlcK>$}4@9W@>&`06B2~*Z}_k00000 zqgc;H0000Mk&PIC{{R8fz~le`010qNS#tmY4#NNd4#NS*Z>VGd006W}L_t(IPvwz8 z62l+}MH>Y*#Aqw^{#PwzOwt9JcH8M+!kdS}t$)a`0XF+RFu6UGW>inWc>t7v#`|y( z2LN#hq7umf+)SF;r9}WY>hD0#nJ8zMRsa(yr4W_klFTq@06Yx1)QT3c8*r^LTEO;3 zB8T4x9J400000NkvXXu0mjf>9cnB diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cmonano.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cmonano.png index 394fd4f802a66e06c5359fa473ea62a5bd0fdacf..0fab5ebc0f1cddcaffe9c55d66845b240ab2b70b 100644 GIT binary patch delta 286 zcmbQh+{Qe?k8b@+dW+zLoEECP7LI4R^Vw#&tw!``S}0;8?n4yof6-7y*U*8{;}7~)iy7# zH`x8QHMp?uV907-h2uH`v**-*W-nxr$#O7IDr1mRzwA-S=CHMn?SYz17x!n`3BjjC zE-q$1F>S(S7o*1;YZ>bNRJvOVn3ve3ZpyUg^x`;?;cS(y@0e*Ko&0Lis_+H1S5DpW zK9HfcNIUQLjO+7D^20=DJo{WK-u&GopjYtt?``K~HEvIuo%NOF&P)AlC T#jHpGdV;~z)z4*}Q$iB}>;Hbo delta 296 zcmZo;p1?f8kR+Fb2zl{|q2duu14GkPg8k^DqMmRCx3saz{ikm-qGv9#vp9&J0XpA!SVAB=Vn@_ zdvGt}oDwv{yK#vrPXizOtgVsUH)JywO6VrMo+x>1OIx$X22sYDM~ehxH{ap5cMucY z$&?(Zz3AzJ#heq@{My}Hd3QWPd`?1i#J(yELo!8Qg}{w#qEjhRbOOS_FRr< c*t(D5WQ^nD$9p|Bf!<*7boFyt=akR{0N-VSvH$=8 From 7444f3debfda45d69d9b23b4414829c9bbfa764f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 1 Nov 2024 21:47:29 -0400 Subject: [PATCH 6/6] Update Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml Signed-off-by: VMSolidus --- .../Entities/Structures/Storage/Closets/Lockers/lockers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 854807c7340..c1efc5a63f8 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -30,7 +30,7 @@ stateDoorOpen: bartender_open stateDoorClosed: bartender_door - type: AccessReader - access: [ [ "bar" ] ] + access: [ [ "Bar" ] ] # Basic - type: entity