From 3299b523a9b8a2b457f14c007fe82c84540e6327 Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Thu, 22 Aug 2024 16:12:05 -0300 Subject: [PATCH 01/11] teste --- .gitignore | 1 + .vscode/settings.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 270daebf4e82a2..49cc35565353f9 100644 --- a/.gitignore +++ b/.gitignore @@ -308,3 +308,4 @@ Resources/MapImages # Direnv stuff .direnv/ .vscode/settings.json +.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 0e0d3ae890cd79..f641dcf9c86c54 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { "omnisharp.analyzeOpenDocumentsOnly": true, - "dotnet.defaultSolution": "SpaceStation14.sln" + "dotnet.defaultSolution": "SpaceStation14.sln", + "dotnet.preferCSharpExtension": true } From e6218860c5da8d10a09964fe1ed3e96e0e03b8e3 Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 18:52:46 -0300 Subject: [PATCH 02/11] adiciona o handheld power monitor pro CE parar de ser horroso!! (Affers vao aprender a jogar) --- .../Engineering/handheld_power_monitor.yml | 43 ++++++++++++++++++ .../handheldpowermonitor.rsi/icon.png | Bin 0 -> 6577 bytes .../handheldpowermonitor.rsi/meta.json | 25 ++++++++++ .../handheldpowermonitor.rsi/scanner.png | Bin 0 -> 621 bytes estacao-pirata.code-workspace | 10 ++++ 5 files changed, 78 insertions(+) create mode 100644 Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml create mode 100644 Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/icon.png create mode 100644 Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/meta.json create mode 100644 Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/scanner.png create mode 100644 estacao-pirata.code-workspace diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml new file mode 100644 index 00000000000000..10fff87502c3f2 --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml @@ -0,0 +1,43 @@ +- type: entity + name: handheld power monitor + suffix: DO NOT MAP + parent: + - BaseItem + - PowerCellSlotSmallItem + # CE apenas carambolas!! para de dar pros outros + id: HandheldPowerMonitor + description: A hand-held power monitor that display the station powers level. + components: + - type: Sprite + sprite: Objects/Specific/Engineering/handheldpowermonitor.rsi # arrumar a bomba do sprite -- arrumei, fiz um sprite proprio por que eu sou legal + state: scanner + - type: PowerCellDraw + drawRate: 0 + useRate: 20 + - type: ActivatableUIRequiresPowerCell + - type: ActivatableUI + key: enum.PowerMonitoringConsoleUiKey.Key + - type: UserInterface + interfaces: + enum.PowerMonitoringConsoleUiKey.Key: + type: PowerMonitoringConsoleBoundUserInterface + - type: PowerMonitoringConsole + # aqui em baixo tinha o codigo de netorking, nao botei por que nao acho roubado o suficiente pra quebrar o jogo funcionando sem energia + # até por que o objetivo desse COISO é mostrar aonde nao tem energia né.................... + - type: StaticPrice + price: 500 #o preço dessa coisa (nao que alguem vá vender ne) + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: HandheldPowerMonitor #objetivo IRADO de synd + +- type: entity # coisa pros admin nerd 🤓 spawnar + id: HandheldPowerMonitorEmpty + parent: HandheldPowerMonitor + suffix: Empty + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default diff --git a/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/icon.png b/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4593188502707d4f325719e2682f90c159dbde70 GIT binary patch literal 6577 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/meta.json b/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/meta.json new file mode 100644 index 00000000000000..e0c78b57f3ebd5 --- /dev/null +++ b/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Feito por @AgentePanela.", + "states": [ + { + "name": "scanner", + "directions": 1, + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "icon", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/scanner.png b/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/scanner.png new file mode 100644 index 0000000000000000000000000000000000000000..2f97a86aba67d0f2cb9b46b50b4021c8ebfe9ff0 GIT binary patch literal 621 zcmV-z0+RiSP)O{k=69d^i(Q`2 z@7qda9-1#@CWI^i;QYcx>G>O!p1oM}T>bfltKZ+zJcvfFBV*tSG%b%Ff=O~xUYc22?aU4tj zGr4iUKr&r^`X5~+Q^0Xv3cl68 zE*1H`8@4XK)B?;vSmpCA&<;B05|E}T0C5lQGXdN9dr3g0QUS0z0YP^tB!K&MX&b*CbTAy8 z2?^_Kf}$s}LuZ?IT_w;v)L14yu}K+qiuZPBkw+xWx5nb4~8r4}GfQ&39b z` z4U94Tc=!r Date: Fri, 23 Aug 2024 20:02:34 -0300 Subject: [PATCH 03/11] =?UTF-8?q?adiciona=20icone=20e=20tradu=C3=A7=C3=A3o?= =?UTF-8?q?=20iradas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engineering/handheld_power_monitor.ftl | 2 ++ .../Engineering/handheld_power_monitor.yml | 2 +- .../handheldpowermonitor.rsi/icon.png | Bin 6577 -> 2392 bytes .../handheldpowermonitor.rsi/scanner.png | Bin 621 -> 567 bytes 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/pt-BR/estacao-pirata/Entities/objects/specific/engineering/handheld_power_monitor.ftl diff --git a/Resources/Locale/pt-BR/estacao-pirata/Entities/objects/specific/engineering/handheld_power_monitor.ftl b/Resources/Locale/pt-BR/estacao-pirata/Entities/objects/specific/engineering/handheld_power_monitor.ftl new file mode 100644 index 00000000000000..84870a8f55d425 --- /dev/null +++ b/Resources/Locale/pt-BR/estacao-pirata/Entities/objects/specific/engineering/handheld_power_monitor.ftl @@ -0,0 +1,2 @@ +ent-HandheldPowerMonitor = monitor de energia portátil + .desc = Um dispositivo capaz de monitorar o nivel de energia da estação remotamente usando Magia Nanotrasen™. \ No newline at end of file diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml index 10fff87502c3f2..76befb32825400 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml @@ -9,7 +9,7 @@ description: A hand-held power monitor that display the station powers level. components: - type: Sprite - sprite: Objects/Specific/Engineering/handheldpowermonitor.rsi # arrumar a bomba do sprite -- arrumei, fiz um sprite proprio por que eu sou legal + sprite: EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi # arrumar a bomba do sprite -- arrumei, fiz um sprite proprio por que eu sou legal state: scanner - type: PowerCellDraw drawRate: 0 diff --git a/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/icon.png b/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/icon.png index 4593188502707d4f325719e2682f90c159dbde70..c190c8f07ebdc6816e7a1cb332999074d58c5669 100644 GIT binary patch delta 1259 zcmdmJd_!o0WIZzj1B1(wu44=gj4heY&H2`7VPRa_tgEJs8M|`TlIthUIJvH?G5m+Yqi=K0 z=qS&N@>!f*d-t;Es@)vt5B*=|e>RfmL+6pev>9d}**>0GmRoR7op0l!HA3@+`)8Lp zK5}2DEw{f=Z->r@GZSX|ofB^FIO-&=oqMKhnVXHTOql81Ppv)2wVvyqi`sc=*7qm+ zJkP#N6}i5$UGT8bBM*m`rg|+ejl*s&VRJ>eJ#S67`q3U!-xR~O(<|XggafNo%60yK z?EBNRpDtJ1yJP`N$$pD-$2A0Quu7R8|7lk?=NRXMdbV|6rtJ@6PqX)2zjez8!3+C& zV`8?Or1I~$!^k$D=jN2ylm5C-J|FlkSsN@Sv4geh`ktMp-wS^+EXfQzZGPZjwxU7U zf;V6J-oMM7e|vuVou7`s825%39nEoQc?*mgtpJ}8S1AQK6&+1uTT9ol03$mqzt~7V zevwzVo9}J2eKFnbUYU-Du5M~o2~hdMpn4l1#a9yK7yKU?Ft{GLb7Jy&ad9TLs>$~` z{26&C>v6g;^KvOnF6MM%0n!SSw{gl(zR9UKnVZXgvLBbuy`h1gk%iLaL>|$}l{~U3Am@O9O+{{j zudkIyW^qY=QKcPB7${Mcl4cd0T8JbB70k(0C@yg=E3ryUE&&@}oLH8cq68I8&PdEl zPff8^(pQ@Nm&ai;Bfr*ULw@PWeY|Y83i_0pCO!E(uPW3;87BiP10yBMjl9MOGg7f0 z#WWjz^dPX&#}--;buOvJ$wiq3pb!Cj5+WMp;s)da^;rRR=BAb;f_U~71&PVosU-@j zdBAWgQnI%*Qq64zCaU@+o-U3d7XD8!S&AK2;9&_k>6pm5?|-Q=i@|ImuIV!m{pjou zV4OQ!BSB|vL&XYB*&S;vMGXX%e=J~@ch`((`0CD8+ce)>WWuUtr@35uP96{LDVVz? zt}*z_8pZ{ZH}c|H&-EqjJhWTzjC0Y4;P&u)8P0986V8g(bDa3c_GE6Tl|!|jnuEpy z?iMDOMFBl6u1(>L-2!szV!~++<@U>_NdK6%`+?27pVkNm1cc zE)@>BBvf=kDY}WMTp~Iy`SwtqdcN3%WZ>_c8ckeyU8|;)6 zmMTCX5GATT#RdF_Ne(#~@GKOIMiP5vju~XauJrbTAJ=Zw^O)5lW-B1ap`hLjH5NqKtKp2}sP`iT)A zrN{Yk8HJy#6()`Js%{dZuU(}t)ol0-NnKFYJUHnzw9YqW-fR8=Dc_IkSs62XprQo* z^~|EuGUlb-5X;z{CC3|}GF4vscM)4%R8C@|-ogCnZ{z$oqEgcK(hlV;#Pc6G7$g_71>vAdL5I)6yRn5*b!H-&)FB@+s$E{v)BH4@c)a#JC)piA{WA%N? znWmJ-dF^*Ag8C}1rr}m zLw~?UcHJ$NH5b!7OKHMhCD)Fi5$=}YXAGy^c_h8UyItPplS6;e-&?)iJ*eT?w4kk# zW~AS^7oU`9X45UVQY&NE9|!$qUM*CsI_1C*{^%Vb-xGZ$KrK{SBk*7hw&{kZ=Ec<- zV^iHGsmJg64(tzgaH)KeKV>2`%$V7VT-OzCLu^C!*>sp=Y8yKES6-{O*mN!dWCt zRj~NJ??eAoid=LfU}CF<3f6wa9#=~CdNK4V%t|TF!%``@QRRHDrs>IR zDr>T;?dKQvl8)j{$3>X@hx#6ITS$j|g!zwJ`rACxh&@p=xrx;Sff^if@Skn>54aDX z3-fYYo;8ejPap7?-J>;pqrPK$`-NK$Wp}o$?Io3Pv)VZ=7A}0%2knOr>AatjV)b-A<-q}-RF?R6#spqsuJoG8*)b)(Xa%E?O*yjg-U$Q49?0K>x%anfe zppZ@?M(26Xe#e0*K&aAI%cG)jWk@}^{i`?zE9!Omtrm;k^ zUOL0|Xf3t1qgaVP4R<)uG|295d`X^qG;$rXJ=SX1soM#9f5@oC_n-RfNQ|F?X49_i zXE$!PRqKdUhXqXdM7i16BnKSRf2UQFuxh=n@z|#Q4JF!-uRTj67#%L#YbLwge^*6$ zV%+MtHslFvfkWk?3wOBwg9`)aogLVybB_YGbyHfS)2X?tF!`NQ(#n1VSiYiHZ1~|E zQfa63Ij1Ae2M3|?Q2C=;VbWNGVPQr6ffh@(vv!x(J{{Ubu%f#?l=hX`ot9(TCBD-_ z)*{m?;$5qPs&DGlc8orrXN>p#E&g5d6}i)$Rk!@#tlqcw6vwtW=;&_!b8-QDHY~B- zSXf;Im0z}RU&gW?{R0nY!g@KKV=v-Hcf1;_S%&Z6UE@!zemyah4y#A=&&>SRymecg zx1oLn1R@p7wzhVrT3dfzDZ%wIBjUhn`xbqHRa9>~XBsCYzS(r%6RMb# z-*P^t!EtNL8C~l3?P}hN$`Fem<}EUIX=>%{nupVNt?x)r*}|<5RnZ z&C;>9ae1tE=qdjr2NLUR1G(<=%d2;*uIydG>fbX;mpL&UQ>O>*TlOvyQRCZOs307tuFo2qZ+M`QH{DvzYogPwf0D0$x_ z|2$Hrps1v>1HxKEEi5e_Qf;YJ^7byphb_4JR7&Qgs3AqG!O2ifp=xqTgsZaVRcUei z(~9DO?Gq5DpGOn1>V__A)0wWf+JggqPoGrc^QWgF6&`{*?uGm^2t>J!4ene#9oLf? zJdO#C$)f`%p&UNAvw=X&)`aqDi~v9cqXXO6TyywfStT6CW}3r2@Qx@)zBS;-wigQk zSMdfnhB$yhV#3#0D42zkK>!XQqQOErfm|Uu)EqvGO9rncVk8_kt0D?8hkH6Y!>oA% z0ERQcnV=9hq3mD`+(H3nCSbD2E)?4@5a69T+)pIplaa`fkPwp)tO-xB4T&a^NJtb0 ziNPR14TLa^E24!WxWeTUh&c=jAY=&Gd=Z<+g-I}JbY76i91aJ^VPE~@@Esk$!E=RQ zSOEDzhSK;*vyZn`C4*obMe0 z&A;LPp#3%WS!Gbm(UDByF@hxSQ7Ptd$^2v{kHKb=XD?9<5{5`bV-N%ugMq-|=tKkw zXUan0Pym1-Vn8V#^&J$ID-_YV3_t<}f}5~G90m$a0+=MwnvMevF#ric$1*VpA_KrP zX#mL-#WMX4!b!jetCAM@y;l+_CJ2RNvT#fqlZas9aCijH6a^sYBs_p%nvzfi41op^ zu*_K~CWCCt6L4r?I@uiBHUP=zZkrvD5KgvorkcYsCUcI@N}K~}A{J->_5hp9zzG1Tz>e<`W2a`t~o7n+7=(lG=qf(a%bfnzW*2oi>c zM_>R96N_b%uvjc+HjHoRLLN&LLK6U1+rUV{XuuMhjRt1$g-pXA^+Wss2~#Mrzfoue z7UhN}kud}^9uG(U^WkA|EDWAWA|fyhECGRI5eWzq9t$AQ1XCP~#R32n@gE2eiz1^i z|Bvu!bUcZK0dNQ`zyQGPvFHe}HHZizi$Eix=?pZ>l<{LW{ukN9V#!$I*YM1ck|*-l zS~WxdM>WqWeD??kvpy#Smj-a9L4I3mzLbNc0sg_?moEATX8@spP4ZLx{-Wy_T|dRZ zPbvSZu3vQh6azn{{HwbDXLKq2{jv&h!ToCp_$oT((Pj_6#>&tg>?jaBh%Lm1h7NZC zCGvdx%|Zx7agpSZf~03?fp!Q{s`Kk#!{_* zCO;=Rc+W#UU)4-Zf~Zd;m!TUo{o4SM+Bu~V{owu1XyskOBa76|Bv`ME$>8tJ+U0Up zJ#bk^t@j1ON~-i7o$995pZUnj@CL;cqt-|d+qxY)AEf7xJoU){=*TD+^1P^lTFc-W z=;Ml*#m%E1mpnKs>o%eVv6O45b%ErFSn2vWN9)3N>k#^mzWg4NQL2J>yEMbtMfIA2 z`;jJKbTR@`HT-1J%~xoJxaxJ#k{8ztToy3hkL#D`6})x%yy&&t?bwuJ?I$IN46801 zKTP-b`h959X-7~F{IJ}cGQr(t;Kxm?oDI1jR4M&Zx=={f@3#xvQl)qhzmBZ#Eq58K zd`-1vpaTWT&wb=phW3-QRH~^bqL3$}BB7jh2bZIkCT|k^Wn|5OQGQ;x=Z`tViJ|P%4C5-ANWm@`Ssz=P&>c+hg-*kOV zM#KEy8r+H diff --git a/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/scanner.png b/Resources/Textures/EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi/scanner.png index 2f97a86aba67d0f2cb9b46b50b4021c8ebfe9ff0..eda5956de646a44f5f61b98f7476d40ffd2db7e8 100644 GIT binary patch delta 553 zcmaFMvYlmuWIZzj1H)A3zHLB?u{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g^fKQ04 zl!Ba!j;67#rE6G#k)4%aY-C%c#NkHeSGSvwZBoD1t9E&>*1c`ETeC%fFfhEB?sl(C zM?+UPwW zx;Tb-cpsh8nRi5i$K|ZpiHkA5|Nh5YCn#{or zCvAka;x)`(u6_9~y+P4PpzgxKJ#m>kJ-!Mvyq0$qX|)%1{4T6ezvfnVRs&E)@in)q zDW%J9t$g)dx4~;)a;3-x*#*BPFR<4qlrky&c&wg1g(2Ag;{0^I725>MQ1H%y9m{szLOR;N6S+vjQ0O zd>Yh6uS7TWbADLDc2+E@o>8db2u~8T3d2ds0!NOAiA@rR9~EvVCb)7Hhd z;HUZnrI0NR-Ru5w7UY$0dEYYq_BF8uKf)Ud`#yX;d^%6a;fpZC{kOX>6)6Qq>3N-2 he{lR){(-_8=C3*FYy0&k`2pjB!PC{xWt~$(699a7^Rxf} delta 607 zcmV-l0-*i31nmTn8Gi-<005$$euMx30yIfPK~#90?U*r(8bKVzUrabRu`!rtArg{m zix6!50+&+Q!YysmZxu|JuW*oR`ZQN+F`!*iUULv6q_B#F32c+a1zA`R?!3aA&5oWr zbD2@d%>x-{dCYH||C@DZ0V^vjE35mf2P)=wpZbekp3m>wN`GS>nlEK0ge(By{K7@) z`5Tm;y;$>H{rQEf-`~+ZiU0s%7;0Mxll+|~Lde4NJUEVn(P)J83wNWpc@&}1XdsSb zFvhejf@%IEnMu^^b&SVj0Kn_ZpP0|*D3{A?E$|p|983N*d70#wR3}q}R;yK^zYpo= zOC^9S48xrsN`L8{CUPjg^aA+4kK=A6T$@JUZt=B@EP^S%QUa<^#eOuIU_ky>r4iUKr&r^`X5~+Q^0Xv3cl68E*1H`8@4XK)B?Tj@Efwvzb90N$OtU%Bm3T@G^OWXLv!I{vi@}(9aO;b=x;rp8pB3zVGBMC6YS9%a4 zgdj;0;aFLGwGRNE=YcV%GW5at%7>xi>8l7|p2o~eH(xpdwOS2~G5mP=3V3pJaiwh{ t%6+ Date: Fri, 23 Aug 2024 20:09:18 -0300 Subject: [PATCH 04/11] deixa essa bomba amostradinha no locker do CE --- Resources/Prototypes/Catalog/Fills/Lockers/heads.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index d7df7508c38bf1..b2f2b8f8796879 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -156,6 +156,7 @@ - id: AccessConfigurator - id: RCD - id: RCDAmmo + - id: HandheldPowerMonitor - type: entity id: LockerChiefEngineerFilled @@ -176,6 +177,7 @@ - id: AccessConfigurator - id: RCD - id: RCDAmmo + - id: HandheldPowerMonitor - type: entity id: LockerChiefMedicalOfficerFilledHardsuit From d54145779a54319a5b99856440e4bb86e8526d2a Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 20:23:25 -0300 Subject: [PATCH 05/11] TENTA nerfar isso por que eu sou do mal haha --- .../Objects/Specifc/Engineering/handheld_power_monitor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml index 76befb32825400..a6b5944add4285 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml @@ -12,7 +12,7 @@ sprite: EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi # arrumar a bomba do sprite -- arrumei, fiz um sprite proprio por que eu sou legal state: scanner - type: PowerCellDraw - drawRate: 0 + drawRate: 0.60 useRate: 20 - type: ActivatableUIRequiresPowerCell - type: ActivatableUI From 1a14c7422b3ed09e7724ed642455828c7cf0f20c Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 20:30:08 -0300 Subject: [PATCH 06/11] arruma arquivos desnecessarios --- .gitignore | 1 - .vscode/settings.json | 2 -- 2 files changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 49cc35565353f9..270daebf4e82a2 100644 --- a/.gitignore +++ b/.gitignore @@ -308,4 +308,3 @@ Resources/MapImages # Direnv stuff .direnv/ .vscode/settings.json -.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json index f641dcf9c86c54..1c74a42d97c798 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,3 @@ { "omnisharp.analyzeOpenDocumentsOnly": true, - "dotnet.defaultSolution": "SpaceStation14.sln", - "dotnet.preferCSharpExtension": true } From 3d3307fde584518405dbbe69bf4ad141d0297d26 Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 20:30:56 -0300 Subject: [PATCH 07/11] affers --- .vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1c74a42d97c798..0e0d3ae890cd79 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { "omnisharp.analyzeOpenDocumentsOnly": true, + "dotnet.defaultSolution": "SpaceStation14.sln" } From 7db130d4df5822a769d15a6417d710294712d4b2 Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 20:35:24 -0300 Subject: [PATCH 08/11] esqueci desse tambem!! --- estacao-pirata.code-workspace | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 estacao-pirata.code-workspace diff --git a/estacao-pirata.code-workspace b/estacao-pirata.code-workspace deleted file mode 100644 index bc5d1331d1fe33..00000000000000 --- a/estacao-pirata.code-workspace +++ /dev/null @@ -1,10 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ], - "settings": { - "dotnet.defaultSolution": "SpaceStation14.sln" - } -} \ No newline at end of file From 064b4414118de5c919ef7c54a2bae79b4e6c217f Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 21:45:16 -0300 Subject: [PATCH 09/11] arruma os cabos nao tarem aparecendo --- .../Objects/Specifc/Engineering/handheld_power_monitor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml index a6b5944add4285..9586f4b444e99d 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml @@ -22,6 +22,7 @@ enum.PowerMonitoringConsoleUiKey.Key: type: PowerMonitoringConsoleBoundUserInterface - type: PowerMonitoringConsole + - type: PowerMonitoringConsoleCableNetworks # aqui em baixo tinha o codigo de netorking, nao botei por que nao acho roubado o suficiente pra quebrar o jogo funcionando sem energia # até por que o objetivo desse COISO é mostrar aonde nao tem energia né.................... - type: StaticPrice From 68ec8ea6d24b86292eef9adece28a99562221bac Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 21:56:24 -0300 Subject: [PATCH 10/11] Adiciona o monitor como objetivo synd --- Resources/Prototypes/Objectives/objectiveGroups.yml | 1 + Resources/Prototypes/Objectives/stealTargetGroups.yml | 7 +++++++ Resources/Prototypes/Objectives/traitor.yml | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index fb787fe80d4879..4f0a97d4b4ed02 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -16,6 +16,7 @@ RDHardsuitStealObjective: 1 NukeDiskStealObjective: 1 MagbootsStealObjective: 1 + HandheldPowerMonitor: 1 # monitor do CE CorgiMeatStealObjective: 1 ClipboardStealObjective: 1 CaptainGunStealObjective: 0.5 diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 52117b9ce9caa4..ef4c6a87bc02f3 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -14,6 +14,13 @@ sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi state: scanner +- type: stealTargetGroup + id: HandheldPowerMonitor + name: handheld power monitor + sprite: + sprite: EstacaoPirata/Objects/Specific/Engineering/handheldpowermonitor.rsi + state: scanner + - type: stealTargetGroup id: ClothingOuterHardsuitRd name: experimental research hardsuit diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 2fd8d6e01567e6..6f6a63bc3430b0 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -231,6 +231,15 @@ - type: StealCondition stealGroup: ClothingShoesBootsMagAdv owner: job-name-ce + + - type: entity + noSpawn: true + parent: BaseTraitorStealObjective + id: HandheldPowerMonitor + components: + - type: StealCondition + stealGroup: HandheldPowerMonitor + owner: job-name-ce ## qm From e0a415b2ed093086598b8d7af07d8ad2ca949af6 Mon Sep 17 00:00:00 2001 From: AgentePanela Date: Fri, 23 Aug 2024 22:24:21 -0300 Subject: [PATCH 11/11] =?UTF-8?q?arruma=20errinho=20de=20digita=C3=A7?= =?UTF-8?q?=C3=A3o=20AMOSTRADINHO=20que=20quebrava=20tudo.............?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Specifc/Engineering/handheld_power_monitor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml index 9586f4b444e99d..496635d74eaa56 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Specifc/Engineering/handheld_power_monitor.yml @@ -22,7 +22,7 @@ enum.PowerMonitoringConsoleUiKey.Key: type: PowerMonitoringConsoleBoundUserInterface - type: PowerMonitoringConsole - - type: PowerMonitoringConsoleCableNetworks + - type: PowerMonitoringCableNetworks # aqui em baixo tinha o codigo de netorking, nao botei por que nao acho roubado o suficiente pra quebrar o jogo funcionando sem energia # até por que o objetivo desse COISO é mostrar aonde nao tem energia né.................... - type: StaticPrice