From b9dea5749a2e7e79e6a3e6dc8a5dfb3c75cb58d1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:40:49 +0200 Subject: [PATCH] [MIRROR] Power cell tiers consistency (#28251) * Power cell tiers consistency (#84074) ## About The Pull Request Tier 3 had both 20 and 30 MJ cells for some reason, while 10 MJ cell was considered tier 2. Now the scaling is proper: 10 MJ is tier 1, 20 MJ is tier 2, and so on... Also updated plasma crystal sprite, and gave unique sprites to the smallest cells. ![image](https://github.com/tgstation/tgstation/assets/3625094/308a88b2-a834-4256-894d-88743311c0b4) ## Why It's Good For The Game The scaling was off, and the sprites made them look out of place for their tier. ## Changelog :cl: fix: Made 10 MJ & 20 MJ cells properly correspond to tiers 1 & 2 in lathes. image: Updated cell sprites to correspond to other stock parts of their tiers. image: Updated plasma cell, 500KJ cell and 2.5MJ cell sprites /:cl: * Power cell tiers consistency * Fix cell --------- Co-authored-by: Andrew Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com> --- code/modules/power/cell.dm | 10 ++++++++++ .../modules/research/designs/power_designs.dm | 4 ++-- icons/obj/machines/cell_charger.dmi | Bin 3287 -> 3629 bytes .../modules/aesthetics/cells/cell.dmi | Bin 6163 -> 6621 bytes 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 92db899cec8..6aec34116ed 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -319,19 +319,29 @@ /obj/item/stock_parts/cell/crap name = "\improper Nanotrasen brand rechargeable AA battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT + icon_state = "aa_cell" maxcharge = STANDARD_CELL_CHARGE * 0.5 custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.4) +/obj/item/stock_parts/cell/crap/Initialize(mapload) + AddElement(/datum/element/update_icon_blocker) + return ..() + /obj/item/stock_parts/cell/crap/empty empty = TRUE /obj/item/stock_parts/cell/upgraded name = "upgraded power cell" desc = "A power cell with a slightly higher capacity than normal!" + icon_state = "9v_cell" maxcharge = STANDARD_CELL_CHARGE * 2.5 custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) chargerate = STANDARD_CELL_RATE * 0.5 +/obj/item/stock_parts/cell/upgraded/Initialize(mapload) + AddElement(/datum/element/update_icon_blocker) + return ..() + /obj/item/stock_parts/cell/upgraded/plus name = "upgraded power cell+" desc = "A power cell with an even higher capacity than the base model!" diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index 85704c0c5b7..700f99a6435 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -24,7 +24,7 @@ construction_time = 10 SECONDS build_path = /obj/item/stock_parts/cell/high/empty category = list( - RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_1 ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING @@ -37,7 +37,7 @@ construction_time = 10 SECONDS build_path = /obj/item/stock_parts/cell/super/empty category = list( - RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_3 + RND_CATEGORY_STOCK_PARTS + RND_SUBCATEGORY_STOCK_PARTS_2 ) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING diff --git a/icons/obj/machines/cell_charger.dmi b/icons/obj/machines/cell_charger.dmi index 5ce285fc817826755ca6e66f3593fb9b74c0097a..0c9ca53544286bb1d40e6be608b5cbbf22623c56 100644 GIT binary patch literal 3629 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 literal 3287 zcma)92{hZy7XK3@)}*U7M7^pms;#}B5K>zD)xLX@(8kt&wh~K(=n}f1Xp7ieq*U#S zT0-+#N{d!eR6{9kQVr5rD_(led++p|_r7=DIWu$T%)N7dbMM@__s$Jl>(kN_3K9SS zNL!vcWiO!Zf?fa-6O8T}=RF046Yc04b_##_e5ikLn14_p07T~GzV5imK)}e;wZ@%; zn2BP`?1vfq@h=KV*H1jIwW|t|FD?vXq9w-AW-mXQPjBz;(u~QYQxCt*urN-1C<)gv zASo4n&b8dTTj}h$t3g{mGsS5yr35%-c$>ijAwq zbyD`$mG~5ShQ%#@O=%`ZYYre=X+{xDHkU+CqY%F($5t$?l9(LN{8%k7s(PZMliDVb zc)=Su<1YmqOcFvA9|wwb#K?EMfIDyG0DEc>kgUw^S3!>CrYz$UA2{m(r&Ge`T`J#H zMc)&nkjuuTJDpePqY3A-^*{iI#Di2Vbew^fW%A=w&0yPWvuf}7%UB`61{notwYJcz zn7wlzyJ}c*1LIe?HkpNQO_oR4*Ec|$7*pfOd&{so05CYr^J(gqd#3w1yPBK#8vrSH zo4j4WY9ujTUWqk;GBS)$Gn+x{Rc6OLw+y#ir5otpvy1?dB+b5%(6bU`)cL;9AJKhm zSpP;>aZ+ROl5lbhFWR^q_Pa}5|HQTwj~(RNA{Fr=M2w7Le8jiIT@ZlZtqh@t1Myt{ zshQKCqxURc9^f6>H8G{S!Q5k|MCpAS>?S zpdvG2vti66n~0oH^thj(aODeYpo#s|mTgkYwebCdX?e<30#IBfQvoFYx&R==kshoZ z%m2Re{354Df~T0F_aJ0`KpjK8@AN2TB7N<(O4{{|51+EAx#k0*SQ5(!TFVb`jH>6kvwZcW_(%}H%S0Fh(vVq@{F(%gFdZ)z?rmimd0!s zUpDD*h}f1lkhR`|Zu5)*T<7@SmMtpsR4&sM>l#tQu7h7$HA%CNn<$M|@_9{v)v(@8*wOgoLdx(+r|QB?ZeJ=~{kmeO^m>@srv?cQ1^t{+v`= z@mi5&;v5}=$ATKg72$B6CxLj|iklaoo$W%gSL^4s`c5_R^bfl*CqQx=qlcFb`y|>w zf7WQ*ery3G0aMLNl=%2qDXH%n@4wYY%^>YrSpI2gv9<~9(uNC#-hOXd%PJ7+Fu0-R z6A)ZnzufKZzJ1kS`rbR^sEHJiO#IGHzDDe5#n$>grW>f8|75YusSl*`Xmp(m+Czt_ zmlZugwr61Z;4Kbs&wXap{MXyY>(dN6eun0HcpL;Py%GmSS)Ko@N3H<+YbKRfV{r(3 zvB*a!9123!V$#R*0DvT>iUTx8>@D>2Pki@RT*(~EgK3zENCBcg`d#Bj!6Zg zaTMYV#An|kQ$)pR&3hU!W=Daz6Ut&h&R6;8l&3e=-3gozFHEjgo;awM-JrM+2S%Zr z{r3kXIbuLKL-d{C6t4$?rCYtolA37pvuC1f<@3^jaCo?6aE&kIxm%_GMO&8!oW1Sy z5_U9ZlwqhnDAKS5Y9E8f#@DXX0iX^#C%o?YCi(HsUS;7|K}0$3L@Wq+H#kC`A6Fk3 zm2-l;r)ZJkQl^bHd4-A)NxLMCN5LJ?c`*$#J03ezj1|_dK37x11>nv=Xp>Sua!W?9WgRv*uRUwzx7Q=oQxrn-Cu<7rd>tk3JMM)8XP&UJ@;bOBp?MtQ0v zJ5b^i`Nx`Wj4I+982~iJ3x(jq1So8dM=r0X-;$=E5C-F7Vw7fPX7)F@P$OPKac>Z3 z*j1py{kdJ7oCVE3t80ee3t2l2fa*+^kvIbRdaclus}~cYuNNzEXoVxXtk^Btyu_#} z7g02N<@gnJjQ7oE`AFKJ?FR<#M$Dflf&2LV@0C$Qh&0Q;tt;Znid?}!CM2HdLW4oX z;t%1RjrSd7H6U$yhc*p6LfR=d_jYco!t62yIqiSB`>#yR#b(nX85ozAo5k*zB?!7kz(Q34aZhtQ5@@QyWM~!HjMDm%~%WB zi7o&dQ#wP;4YgvbH^#x2ci>577$J`E*nr;~-q|z?Je}>KMjTr!-6t&CPO_En@5@R) zO%TY`hB`yaVxvc@R8Vg&P)>>;i`!vQJ)^_F4eMz%g-C*64$o5EX^P8v{C%};!xvV} z{8BCsD*HkU5VUE$$eq;Jkn?sXN!Fj*dTChy?}zq!;pzJ2!rW@me(p-;S8|%p1 zA_C@f3BIIycK3>&hTU%OD8;)PhyH85^NZRGVq;)bs60h=6ISH?*Wr`w_PNn(Hbv0_ zvl8M6;_th3-!M>ay{Ohmop+`TL?pYZi{oDE>>|S{r4s_FHbO6$C>bZ!e&j^G>H*rN zO5Tc0Nmj5)nmJ!J%=0dhuRd_FjXJ1UY~7I<<4tyXmfH=49WklzMtH>JLlK+e$9K+mYY|HFSghg4 z=?Y=z&Lwg9fiv^E?e#Y?pvXDjfkx9rD!zWz>f#T#^Kg-q<_ftrZG8I*Oe@tS+%ImL zSBl=O6c@qi|FBQWkD;KP)5jjG*dQx}s;Ff|!jyNpdacWV!V{``B{-+w<*@tU@Gze4 z`ubxtc6>b}iQf1?C|ChY0}5ykD!n->7=8QH0UPL_4bvHduu}H`ji7bZ_eL6+DY0B` zAtES_^F-M*1V*|iwnT?qq)qTulaXag$)Y{ZX{Qo|tLl4Js8s5oCFin*nWFpRq)@+~ t(5z~i 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 C4~q=| literal 6163 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