From 052311fff83abb300e574c1bd0879fca07a889ac Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Mon, 7 Oct 2024 20:43:28 +1300 Subject: [PATCH 01/18] protein powder sprites --- PentestModules/icons/obj/containers.dmi | Bin 0 -> 1318 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 PentestModules/icons/obj/containers.dmi diff --git a/PentestModules/icons/obj/containers.dmi b/PentestModules/icons/obj/containers.dmi new file mode 100644 index 0000000000000000000000000000000000000000..de4e33c461e6891dc6d64d9c4709febfa0fcc5ab GIT binary patch literal 1318 zcmV+>1=;$EP)V=-0C)j~jynp3KoCUZ=~FbCFZ)Y3SrjqQD~LF)(}AP(G>W%(P%t&CN7aK$ z@t+rEjagN~LK1lL_`~nx31(%hF2d&x#t{!rPYBv7#h47_Nw{lfnUvTkU@S|B%?nH~ z?MP?7_F?muyC~loDdu%{T-pI;axMy6admwF00dr1L_t(|+U=N2Y#T)w$N&3^y>%L# zmtC7aaBC8h5~&HP5cI+!Eg{G^I3OW}xF8g`AaM!@Xay&Vc&Hr8qX#&EIG`#jNWDco zio~OCj7zJ=O=`;tO`XJc>iD(0!_2s`oVY?39b0PZ&$4HBX1qK9-+VLk%}Th(O=<#Y z0%!tg0=T<6tdd&V%`eV#Z623v>j3EP^peEVBDy+nFUmAcE@>s1;BBV=4oX4+%*W2y_D{GWJT#4`_I;!M+^R|K2@k$IlL;!{CU zHJFAWb`4ZDldO1HAjlwXCC>lkiQY!)hw6<22 zudU^H%0``e0)xQ5tE;O>rB{Rkcz=A1Onm+$^)dyrq?S8QBmz1td@Zo7(l*F;2(3lK z8_y2l^%LLM2SBlC(r>Y00N&ZXhvc#dmk#>z#cwm>0kDzh z5GqE$Q2_Sdr{cL#gkK-(-HBswzJ>hdE3oxGh<87D4<8+U4UXfV(#27QLbt|K!DxK| ztc!0nfDT>3E0?e0;+Ye?tpDlpQXh;05=#lV++IYF4D#qurBn9QbW9uor?dJXv{^i} zdd2~_wl$nR{T(LWK8nW=J;v)k{P+{(NEUWU$F-3IJSLEI2fp3aCMFKJ9e{Q5n@67+ z1F*c3Kp+qh27rb)Vvu^uWix$spVQ~>X`+A5;V-J~*vdm)=X@e97r Date: Wed, 9 Oct 2024 23:17:09 +1300 Subject: [PATCH 02/18] moves stuff into a module folder. --- .../modules/protein_powder/icons}/containers.dmi | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename {PentestModules/icons/obj => modular_pentest/modules/protein_powder/icons}/containers.dmi (100%) diff --git a/PentestModules/icons/obj/containers.dmi b/modular_pentest/modules/protein_powder/icons/containers.dmi similarity index 100% rename from PentestModules/icons/obj/containers.dmi rename to modular_pentest/modules/protein_powder/icons/containers.dmi From 820be7b2c95bd04bb0d0590c70bb22a9017f8d54 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sun, 13 Oct 2024 22:27:45 +1300 Subject: [PATCH 03/18] added some code and one more sprite --- .../protein_powder/icons/containers.dmi | Bin 1318 -> 1511 bytes .../modules/protein_powder/protein_powder.dm | 24 ++++++++++++++++++ shiptest.dme | 1 + 3 files changed, 25 insertions(+) create mode 100644 modular_pentest/modules/protein_powder/protein_powder.dm diff --git a/modular_pentest/modules/protein_powder/icons/containers.dmi b/modular_pentest/modules/protein_powder/icons/containers.dmi index de4e33c461e6891dc6d64d9c4709febfa0fcc5ab..348b943d2940c178c1b8aff5b81d5c4bdd97b6e7 100644 GIT binary patch delta 1350 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 Date: Sat, 14 Dec 2024 19:25:27 +1300 Subject: [PATCH 04/18] Protein powder new sprites --- .../protein_powder/icons/containers.dmi | Bin 1511 -> 1510 bytes .../modules/protein_powder/protein_powder.dm | 21 ++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modular_pentest/modules/protein_powder/icons/containers.dmi b/modular_pentest/modules/protein_powder/icons/containers.dmi index 348b943d2940c178c1b8aff5b81d5c4bdd97b6e7..8d9385a3b47a8a1e17f42bd1e1c4806dafaa346d 100644 GIT binary patch delta 1505 zcmV<71s?k63+4-u7k@wq1^@s6s%dfF0001hdQ@0+L}hbha%pgMX>V=-0C)k7j=Ktl zKnz6d%~u5NFZb2jh$0sH3$kEz1HQ-x{e2fLMX;MQ9EOQ8&5N?etSVt8@jOqM;Q#do zvvI2~!0!vj5%*3{@M@Jpj24-dcxpDsN)ecr#fSa_rV~5TnSU?#V5NU-->t@&*V%D; z2O;G*G-}rBrvLy2AxT6*RCwC$ntx1FR}{xjT>$wt3q?i=t*G4)TpXAMH6sq)78eOY z*w8U&a1q#${hosv-Onsbz|0?+EU~&c|JYE7pfDz~O#T=%OlKrB7*VGD=%`{#*#@jJ0<{d z{Ev@xfI2pYAfQAL&Kl~!PWJtE3q6jn_~Dk8=6?zw=tHQyIJZJ}2K1aNC;L&a9oi~t zm;hLzOA$)T7E!s_cu95!RDGCEwxax3Xz4r84nXQ^J)Ca%396sYlEIW>DF2wlB>WSiU0kexOF&%C)7zBL|) zwPkr=x7p$7u4<}7YZ@@YOWTXR2B7t!7=QR8+~Ts&w7dc$fPkJEPo2!}p-TLKVS@Cdc#ls2*r zg&$wOf+9g%`##ye6S`-~dSfqu;c(NA4Efh}{g-5MKfnwC9x*i>J4X9)+!LVOMS|!! zDs#;mX4_#Le_nhNjsJjQ^1Q(@5`T0Q?g3C&yDzfa4x1g~ei4K_q2pqiB>+((2zNrq zm5$F(g*gBYfCJzFH~MSn{KJc)I@ zi+2$>n00000NkvXX Hu0mjfsv*6L delta 1506 zcmV<81s(e43+D@v7k?lK1^@s6qMd$(0001kdQ@0+L}hbha%pgMX>V=-0C)j~jynp3 zKoCUZ=~FbCFZ)Y3SrjqQD~LF)(}AP(G>W%(P%t&CN7aK$@t+rEjagN~LK1lL_`~nx z31(%hF2d&x#t{!rPYBv7#h47_Nw{lfnUvTkU@S|B%?nH~?SDvTzV>1Bmb)n587by< zc3j#4WpXYGTXA)L000FaNkliFOcs;<;mb^>j=_K}yhuSP zR0`#-K-=dz?|-hep^?o-uNt@h8n}Dze$e}U?(X;UNVv^K3IhlO2m=UOe)#Sp2}WKr1MqhLQBJNi2YtmKNgJ=j8qEQE7jgA8-u%`%xD*qOPtk zWB`JZm6b)Y0DKS%@(R|STXZ^cwYQu1Lt(s6B6J2~Fl>S>(|xDkBGF%jcuxSk0vcIE zuYg^=4}X{(w~=6V+rRoUWG8?brzjr!M8F9UnfD1)eibxY9Tbm8tPk)xKv^RrGIG

mE0aVTzuCBj_cPMd=>IN7@&01}{NUgaE_ZoP;7>pPjP9%5 z_;utOI~USF2GG&bK?(~C*PWZ2n+v=O)OaSM0e_gHV#oq@es{&D(oN6@%o+3se}8yn z1Rli=x5tgy*%>hajx>~!U8#3s_km`(TrU5($D{IArQTQZDAe(+@E_YZN6@(D>1}(CIXgC9QwqL?V#shxr0k^@c$fA#@vbc(E$`FV_&%0xM2c^85d+Jqn4L ziGSD}7w?~&w~hzsj`oe>n90HWXKUJo0eE9u5;0Wl#N$sr#Gf5w1CX_wLFk>=X*WPo zT_CO%=%b_2`e8fQSvuQ;#u1Ac0BLDybjKB#<6;8lY}Vglu?z={ZQW|3zQ8UVz~A{h zVE|H+Q&6877@xoU86In@!Rc2{@qc+X#)OTte*OamApuZ&`cs%w63|_cje7?t z;a+ya@n{L6J~{8bl9N_wW8?7s&J^VL44@_F9)SQ-Qc<7tWB>r?jMHy4Yke?61%S2B zbY8*5ug@WGe<>Dg?&ot1fDZ&W{>mU)@^S^AfHeSg78$K=t*EZ7=Iy_A0&?ARxPPpR z3`+k%{&swPX+RtR)+Q!y!@<0#q2HiK)uC#fdA$|Ou4TU-Grp*5FD51@__JsLsds4c zNVhlTF3L#2;X|)t<$6CNGIrq2qwnCorh_mxpP4_7cs{r;6lEh zLs%>B)v)L@n#sOP%hWmkhPT?fgnt6qYS5tm`Ve~09p__NcUuz=|gG_D|3RxI56x5=J)&(NdVU`E1hBcgT{{oG#HDOPY zH#s}@{s&klOVCROSc-FaP9PbKIFlGDCJ$gmPH&`;6~dtp=HhE`}HYBYhjic2}0@5!Y&9r=YX5?&kB|z1Lvc5=)Ku(02kX z8`RT{u!;k4BN%HXlx48hW?MsgS~^kOZd#OScsU%ne2K&Hwlb{)rfErR75hHmzZ3>w zt;Cz-2&+z2MfIAo`fgxsVl2R>TLwU=Bn%)7APgW3;I@`O03Y*OKiiO Date: Sat, 14 Dec 2024 19:26:17 +1300 Subject: [PATCH 05/18] Update sprites again so I can test it --- .../protein_powder/icons/containers.dmi | Bin 1510 -> 1509 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/modular_pentest/modules/protein_powder/icons/containers.dmi b/modular_pentest/modules/protein_powder/icons/containers.dmi index 8d9385a3b47a8a1e17f42bd1e1c4806dafaa346d..1674e255c15261f99f0b20ee397665c39b53ada4 100644 GIT binary patch delta 1350 zcmV-M1-bg>3*`%tuzw&)L_t(|+U=TaOjJh{$IsdT@~R7qlqKwnx-Ei@1=FCW#G-9u zBOwSaT51h80xi;aE!1eAX_|nkk5rnt+E_odC`3>w6=^CTN)6Q-NexDnDvvFzxXaQO z7Acln&!P7QHoKQ=I!m(G`F}aHGqag{ewlmc%*@fiJuVFgz<&X7035*Gs_e>cL9V^{ z!8bJ4zCJ4JBO{qV^w)`rvg5CBZB;z}T>+TNaaV1a^}L29fTrlwDZX>6P7RqaDH71jeoIyP_|z}TnO2y&#T!2NdGEJm>WA6QWvJm_B&XA z5U}6Ygc7Cz-hVMI6%s>kNe+6_H|K5x_G3B&%x1Gt=ifk%UF*E2$Ub~I4hjkin5;B` zK@q|$(I#@Nb#SI4n|Ij)!%mxq8Gw|O6u57OA8ctUk#+p#$W8R0=H_Om077&TRNfe% zm36$x;(!t75cOpWAR{9KBJWJ8zWCZmCV|IqR?**VeC(AC=u?cEkI z?K68HKw(loR9S1lcHK6q9hX2+Z6_{3+~Sp9c?Ghn_DT>sx_ihrwwxh5Z2+Emb1i&p zJ`QV3a=__u!qHuoREO5mXMvZt7kUjq^FvYaMX1efpJ{moL;!wWGoa>V4P>s$gu~T` zsecZ&XX{R{132*7MydYBO&k0*SqpFwU;8YKUC+B*Pn9q!DIr*FUurst>*XFz3X z1&j=hNc|AR{N*P420V3Vin5FYtS9>=0IB)!N^J+WZ6=El%45PL0Qyzo?BW271PyM&182~(DsylX!_T#uGKzWJ; z(Q#Dznl;R}!#MuD*aRB?0n_+-!^B8%qHqs@y4rb>-FDbIA?_DJcoI4;mRSN2C4YkO zBy?Qq`219u1KH#Q8PvHR63;?q*0Pq?*U#s_+l7dn#fY?P#1U!kI zco#oWcnlp76bu8lE_DLXM$8f7lYf(-h`glJ;o;xZG_U3vl}iU;?9(J9(d<0X6Y{^xHKg#&|&00Pq`t_wVjzfIk=^syY%B zAv8T%swYXATM delta 1351 zcmV-N1-Sa<3+4-uuzw**L_t(|+U=TuOjB1B$4^}V`85kgMhUH`-4I+Hm<2T>4&4?P z2|?J7%~CbCTa7&A;~Br_OMru^urVoTWu zMTX=1Sl#hVzSZ% zheQdl#2U!4_Tia|Y{6v{jM^l_`MPx&=aL#4OOp zX~AqVQ{9N|52<~8bW|z_1P7BHwp!Q$*jch#$ar-Rs3Yzt2q+PRv(R}|Q{@(TtMWT0 z0C4<|k92@KHijUeL=esz>c39*{dEgHj<5LPmX_uUALv7S{flZukkRpU#x+`}*(a;P#E# zV6zS~1@LH45WVBecI3+Tt=eRSp+GJCGB)NN0HOv>R)~z#z z3dTmpq<#ou{&E9-1D?7wMOnrH=97aGfb_z5rM3gxHj_mNm2nXg0PU(sc5whkg1Wya zSAermE|C2OY#t6L+ZXs4(@?m!B7@3$Lw`1Ob@x*FRL3PaRMiNFK6zUL5LxgDwdIsH zvJHhFU%rAOL0kJi*}fCHXUTeFFM#22(~b=J*LD4uWN|;h3;-T6H5@xe`*GY8pxi}* z=r}5K%^GIgVH|&6d=icSfMN2y!7&na6z%~~SGzB=+YXx@;(if?JE7xZnI!;GB7X>X zLdTVk&rgLp01kiy-~c!P4uAvT05|{+fCJzFl*-*bJ!WS3Jpd)?DI9=51Hdc|cNrRZ zTa$96)qert74>e-Ot%>tn3=J+zsut}oX-Q0%gpe50C){usMfkoNkRE7fcQmA1U!j# zyo+}f9zzF(gu;-e$3Fq6qvi;SsedWZbzw3=!5IXmrYK2E@o4~ZDJqznqU18drvaS! z{wU<-m(XwLiwT?&eh=VE=b0(@@(KDlDr17euJ_9Q8vtf%)`SRfwxymRU}lEsJPHA% z1V?(jlJ;o;xZG`<2y*!fU;?9(J9(d<0dp2=SM|OW0sb!l{v-~71K Date: Sat, 14 Dec 2024 19:31:43 +1300 Subject: [PATCH 06/18] sounds :) --- modular_pentest/modules/protein_powder/protein_powder.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modular_pentest/modules/protein_powder/protein_powder.dm b/modular_pentest/modules/protein_powder/protein_powder.dm index 1e6b728e2f..731e43d9ca 100644 --- a/modular_pentest/modules/protein_powder/protein_powder.dm +++ b/modular_pentest/modules/protein_powder/protein_powder.dm @@ -3,6 +3,8 @@ desc = "A container of protein powder. This one has a soy protein content. It advertises that it is a protien concentrate." icon = 'modular_pentest/modules/protein_powder/icons/containers.dmi' icon_state = "protein_white" + drop_sound = 'sound/items/handling/drinkglass_drop.ogg' + pickup_sound = 'sound/items/handling/device_pickup.ogg' w_class = WEIGHT_CLASS_NORMAL spillable = FALSE list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/nutriment/vitamin = 10, /datum/reagent/consumable/nutriment/protein = 40, /datum/reagent/consumable/nutriment/peptides = 20) From c96b15fa18a31737bb56d4641839fc33640918a6 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 19:44:15 +1300 Subject: [PATCH 07/18] makes readme --- modular_pentest/modules/hair_styles/readme.md | 30 +++++-------- .../{ => code}/protein_powder.dm | 0 .../modules/protein_powder/readme.md | 45 +++++++++++++++++++ 3 files changed, 55 insertions(+), 20 deletions(-) rename modular_pentest/modules/protein_powder/{ => code}/protein_powder.dm (100%) create mode 100644 modular_pentest/modules/protein_powder/readme.md diff --git a/modular_pentest/modules/hair_styles/readme.md b/modular_pentest/modules/hair_styles/readme.md index 716c88a5ab..4d28f1b751 100644 --- a/modular_pentest/modules/hair_styles/readme.md +++ b/modular_pentest/modules/hair_styles/readme.md @@ -1,45 +1,35 @@ -https://github.com/Constellado/PentestOld/pull/3 -https://github.com/PentestSS13/Pentest/pulls/11 -## \ Maple Hair Styles! +https://github.com/PentestSS13/Pentest/pull/30 -Module ID: MAPLE_HAIR_STYLES +## Protein Powder + +Module ID: protein_powder ### Description: -Adds all of Maplestations hair styles +Adds protein powder! ### Shiptest Proc/File Changes: - N/A -<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed. -E.g: -- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var` ---> ### Modular Overrides: - N/A -<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file. -E.g: -- `modular_pentest/master_files/sound/my_cool_sound.ogg` -- `modular_pentest/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var` ---> ### Defines: - N/A -<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. --> + ### Map additions - N/A -<!-- If you have any map changes they go into the zmap folder, please post the name of the file here--> -### Included files that are not contained in this module: +### Included files that are not contained in this module: - N/A -<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. --> + ### Credits: -Maplestation - Hairstyles -TheDragMeme - Porting +Constellado - code, two sprites +MTandi - small protein powder sprite diff --git a/modular_pentest/modules/protein_powder/protein_powder.dm b/modular_pentest/modules/protein_powder/code/protein_powder.dm similarity index 100% rename from modular_pentest/modules/protein_powder/protein_powder.dm rename to modular_pentest/modules/protein_powder/code/protein_powder.dm diff --git a/modular_pentest/modules/protein_powder/readme.md b/modular_pentest/modules/protein_powder/readme.md new file mode 100644 index 0000000000..716c88a5ab --- /dev/null +++ b/modular_pentest/modules/protein_powder/readme.md @@ -0,0 +1,45 @@ +<!-- This should be copy-pasted into the root of your module folder as readme.md --> + +https://github.com/Constellado/PentestOld/pull/3 +https://github.com/PentestSS13/Pentest/pulls/11 +## \<Title Here> Maple Hair Styles! + +Module ID: MAPLE_HAIR_STYLES + +### Description: + +Adds all of Maplestations hair styles + +### Shiptest Proc/File Changes: + +- N/A +<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed. +E.g: +- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var` +--> + +### Modular Overrides: + +- N/A +<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file. +E.g: +- `modular_pentest/master_files/sound/my_cool_sound.ogg` +- `modular_pentest/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var` +--> + +### Defines: + +- N/A +<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. --> +### Map additions +- N/A +<!-- If you have any map changes they go into the zmap folder, please post the name of the file here--> +### Included files that are not contained in this module: + +- N/A +<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. --> + +### Credits: + +Maplestation - Hairstyles +TheDragMeme - Porting From c88ea2186f056fef573ba35d21c8cab0c360a68e Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 19:54:54 +1300 Subject: [PATCH 08/18] add to cargo --- .../modules/protein_powder/code/protein_powder.dm | 11 +++++++++++ shiptest.dme | 1 + 2 files changed, 12 insertions(+) diff --git a/modular_pentest/modules/protein_powder/code/protein_powder.dm b/modular_pentest/modules/protein_powder/code/protein_powder.dm index 731e43d9ca..078e5abaf8 100644 --- a/modular_pentest/modules/protein_powder/code/protein_powder.dm +++ b/modular_pentest/modules/protein_powder/code/protein_powder.dm @@ -31,3 +31,14 @@ nutriment_factor = 10 * REAGENTS_METABOLISM color = "#997634" taste_description = "power" + +/datum/supply_pack/food/ration + name = "Protein Powder Crate" + desc = "A whole crateful of protein powder!" + cost = 450 + contain = list(/obj/item/reagent_containers/food/drinks/protein_container/small + /obj/item/reagent_containers/food/drinks/protein_container/small + /obj/item/reagent_containers/food/drinks/protein_container/donk + /obj/item/reagent_containers/food/drinks/protein_container) + crate_name = "protein powder crate" + crate_type = /obj/structure/closet/crate diff --git a/shiptest.dme b/shiptest.dme index f8f5542301..594ef2eb8b 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3610,6 +3610,7 @@ #include "modular_pentest\_maps\ships\_areas_ships.dm" #include "modular_pentest\modules\hair_styles\code\hair.dm" #include "modular_pentest\modules\protein_powder\protein_powder.dm" +#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "modular_pentest\modules\serenity_clothes\code\turf.dm" #include "modular_pentest\modules\serenity_clothes\code\worn.dm" #include "modular_pentest\modules\spessknife\code\spess_knife.dm" From 007fd02bc492ee4736fb3974e80b07c04e77fba0 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 19:55:43 +1300 Subject: [PATCH 09/18] DME fix --- shiptest.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/shiptest.dme b/shiptest.dme index 594ef2eb8b..c9fe7fdaeb 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3609,7 +3609,6 @@ #include "modular_pentest\_maps\ruins_wasteplanet\_modular_wasteplanet.dm" #include "modular_pentest\_maps\ships\_areas_ships.dm" #include "modular_pentest\modules\hair_styles\code\hair.dm" -#include "modular_pentest\modules\protein_powder\protein_powder.dm" #include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "modular_pentest\modules\serenity_clothes\code\turf.dm" #include "modular_pentest\modules\serenity_clothes\code\worn.dm" From e1337513bebcbce8de149e873c60270338f1bb31 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 19:57:15 +1300 Subject: [PATCH 10/18] fixes --- .../modules/protein_powder/code/protein_powder.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_pentest/modules/protein_powder/code/protein_powder.dm b/modular_pentest/modules/protein_powder/code/protein_powder.dm index 078e5abaf8..572bb3c7f4 100644 --- a/modular_pentest/modules/protein_powder/code/protein_powder.dm +++ b/modular_pentest/modules/protein_powder/code/protein_powder.dm @@ -32,13 +32,13 @@ color = "#997634" taste_description = "power" -/datum/supply_pack/food/ration +/datum/supply_pack/food/protein name = "Protein Powder Crate" desc = "A whole crateful of protein powder!" cost = 450 - contain = list(/obj/item/reagent_containers/food/drinks/protein_container/small - /obj/item/reagent_containers/food/drinks/protein_container/small - /obj/item/reagent_containers/food/drinks/protein_container/donk + contains = list(/obj/item/reagent_containers/food/drinks/protein_container/small, + /obj/item/reagent_containers/food/drinks/protein_container/small, + /obj/item/reagent_containers/food/drinks/protein_container/donk, /obj/item/reagent_containers/food/drinks/protein_container) crate_name = "protein powder crate" crate_type = /obj/structure/closet/crate From 05d427ebf01d938d282c8b70353f0a3dde895ea8 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 20:00:46 +1300 Subject: [PATCH 11/18] made it cheeper --- modular_pentest/modules/protein_powder/code/protein_powder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_pentest/modules/protein_powder/code/protein_powder.dm b/modular_pentest/modules/protein_powder/code/protein_powder.dm index 572bb3c7f4..60c3d17ba6 100644 --- a/modular_pentest/modules/protein_powder/code/protein_powder.dm +++ b/modular_pentest/modules/protein_powder/code/protein_powder.dm @@ -35,7 +35,7 @@ /datum/supply_pack/food/protein name = "Protein Powder Crate" desc = "A whole crateful of protein powder!" - cost = 450 + cost = 300 contains = list(/obj/item/reagent_containers/food/drinks/protein_container/small, /obj/item/reagent_containers/food/drinks/protein_container/small, /obj/item/reagent_containers/food/drinks/protein_container/donk, From bbcdb635ea8c0f867d46b8f313c3833d2b58d3b1 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 21:55:34 +1300 Subject: [PATCH 12/18] oops, swaps the readmes --- modular_pentest/modules/hair_styles/readme.md | 30 ++++++++++++------- .../modules/protein_powder/readme.md | 30 +++++++------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modular_pentest/modules/hair_styles/readme.md b/modular_pentest/modules/hair_styles/readme.md index 4d28f1b751..716c88a5ab 100644 --- a/modular_pentest/modules/hair_styles/readme.md +++ b/modular_pentest/modules/hair_styles/readme.md @@ -1,35 +1,45 @@ <!-- This should be copy-pasted into the root of your module folder as readme.md --> -https://github.com/PentestSS13/Pentest/pull/30 +https://github.com/Constellado/PentestOld/pull/3 +https://github.com/PentestSS13/Pentest/pulls/11 +## \<Title Here> Maple Hair Styles! -## Protein Powder - -Module ID: protein_powder +Module ID: MAPLE_HAIR_STYLES ### Description: -Adds protein powder! +Adds all of Maplestations hair styles ### Shiptest Proc/File Changes: - N/A +<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed. +E.g: +- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var` +--> ### Modular Overrides: - N/A +<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file. +E.g: +- `modular_pentest/master_files/sound/my_cool_sound.ogg` +- `modular_pentest/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var` +--> ### Defines: - N/A - +<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. --> ### Map additions - N/A - +<!-- If you have any map changes they go into the zmap folder, please post the name of the file here--> ### Included files that are not contained in this module: -- N/A +- N/A +<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. --> ### Credits: -Constellado - code, two sprites -MTandi - small protein powder sprite +Maplestation - Hairstyles +TheDragMeme - Porting diff --git a/modular_pentest/modules/protein_powder/readme.md b/modular_pentest/modules/protein_powder/readme.md index 716c88a5ab..4d28f1b751 100644 --- a/modular_pentest/modules/protein_powder/readme.md +++ b/modular_pentest/modules/protein_powder/readme.md @@ -1,45 +1,35 @@ <!-- This should be copy-pasted into the root of your module folder as readme.md --> -https://github.com/Constellado/PentestOld/pull/3 -https://github.com/PentestSS13/Pentest/pulls/11 -## \<Title Here> Maple Hair Styles! +https://github.com/PentestSS13/Pentest/pull/30 -Module ID: MAPLE_HAIR_STYLES +## Protein Powder + +Module ID: protein_powder ### Description: -Adds all of Maplestations hair styles +Adds protein powder! ### Shiptest Proc/File Changes: - N/A -<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed. -E.g: -- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var` ---> ### Modular Overrides: - N/A -<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file. -E.g: -- `modular_pentest/master_files/sound/my_cool_sound.ogg` -- `modular_pentest/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var` ---> ### Defines: - N/A -<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. --> + ### Map additions - N/A -<!-- If you have any map changes they go into the zmap folder, please post the name of the file here--> -### Included files that are not contained in this module: +### Included files that are not contained in this module: - N/A -<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. --> + ### Credits: -Maplestation - Hairstyles -TheDragMeme - Porting +Constellado - code, two sprites +MTandi - small protein powder sprite From 6f3dd4c36fee1fa7730411dd29866ddd79c79c75 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 21:56:15 +1300 Subject: [PATCH 13/18] fixes typos --- modular_pentest/modules/protein_powder/code/protein_powder.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_pentest/modules/protein_powder/code/protein_powder.dm b/modular_pentest/modules/protein_powder/code/protein_powder.dm index 60c3d17ba6..da321e1091 100644 --- a/modular_pentest/modules/protein_powder/code/protein_powder.dm +++ b/modular_pentest/modules/protein_powder/code/protein_powder.dm @@ -1,6 +1,6 @@ /obj/item/reagent_containers/food/drinks/protein_container name = "Protein Powder" - desc = "A container of protein powder. This one has a soy protein content. It advertises that it is a protien concentrate." + desc = "A container of protein powder. This one has a soy protein content. It advertises that it is a protein concentrate." icon = 'modular_pentest/modules/protein_powder/icons/containers.dmi' icon_state = "protein_white" drop_sound = 'sound/items/handling/drinkglass_drop.ogg' @@ -19,7 +19,7 @@ /obj/item/reagent_containers/food/drinks/protein_container/small name = "Protein Powder" - desc = "A small container of protein powder. It advertises that it is a protien concentrate." + desc = "A small container of protein powder. It advertises that it is a protein concentrate." icon_state = "protein" w_class = WEIGHT_CLASS_SMALL list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/nutriment/protein = 25, /datum/reagent/consumable/nutriment/peptides = 10) From 0772a3d920b17da71ec8bbc644fa092986e14c74 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Sat, 14 Dec 2024 22:42:30 +1300 Subject: [PATCH 14/18] stops dme conflicts --- shiptest.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shiptest.dme b/shiptest.dme index c9fe7fdaeb..166b42a4bd 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3508,6 +3508,7 @@ #include "code\modules\tgui\external.dm" #include "code\modules\tgui\states.dm" #include "code\modules\tgui\status_composers.dm" +#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "code\modules\tgui\tgui.dm" #include "code\modules\tgui\tgui_alert.dm" #include "code\modules\tgui\tgui_input_list.dm" @@ -3609,7 +3610,6 @@ #include "modular_pentest\_maps\ruins_wasteplanet\_modular_wasteplanet.dm" #include "modular_pentest\_maps\ships\_areas_ships.dm" #include "modular_pentest\modules\hair_styles\code\hair.dm" -#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "modular_pentest\modules\serenity_clothes\code\turf.dm" #include "modular_pentest\modules\serenity_clothes\code\worn.dm" #include "modular_pentest\modules\spessknife\code\spess_knife.dm" From 6176ef7a84ce8eac164cc229c2e55e420afceb20 Mon Sep 17 00:00:00 2001 From: vect0r <71346830+Vect0r2@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:43:01 -0800 Subject: [PATCH 15/18] Update readme.md --- modular_pentest/modules/protein_powder/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_pentest/modules/protein_powder/readme.md b/modular_pentest/modules/protein_powder/readme.md index 4d28f1b751..ab50ef75d4 100644 --- a/modular_pentest/modules/protein_powder/readme.md +++ b/modular_pentest/modules/protein_powder/readme.md @@ -4,7 +4,7 @@ https://github.com/PentestSS13/Pentest/pull/30 ## Protein Powder -Module ID: protein_powder +Module ID: PROTEIN_POWDER ### Description: From f486decff7e1c3246f6841c52c6cc5e10a8e3245 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:05:54 +1300 Subject: [PATCH 16/18] reorders DME to be in alphabetical --- shiptest.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shiptest.dme b/shiptest.dme index 166b42a4bd..c9fe7fdaeb 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3508,7 +3508,6 @@ #include "code\modules\tgui\external.dm" #include "code\modules\tgui\states.dm" #include "code\modules\tgui\status_composers.dm" -#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "code\modules\tgui\tgui.dm" #include "code\modules\tgui\tgui_alert.dm" #include "code\modules\tgui\tgui_input_list.dm" @@ -3610,6 +3609,7 @@ #include "modular_pentest\_maps\ruins_wasteplanet\_modular_wasteplanet.dm" #include "modular_pentest\_maps\ships\_areas_ships.dm" #include "modular_pentest\modules\hair_styles\code\hair.dm" +#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "modular_pentest\modules\serenity_clothes\code\turf.dm" #include "modular_pentest\modules\serenity_clothes\code\worn.dm" #include "modular_pentest\modules\spessknife\code\spess_knife.dm" From a11e5d1f449321afada8193953ae5598ab469a54 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:08:17 +1300 Subject: [PATCH 17/18] Revert "reorders DME to be in alphabetical" This reverts commit f486decff7e1c3246f6841c52c6cc5e10a8e3245. --- shiptest.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shiptest.dme b/shiptest.dme index c9fe7fdaeb..166b42a4bd 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3508,6 +3508,7 @@ #include "code\modules\tgui\external.dm" #include "code\modules\tgui\states.dm" #include "code\modules\tgui\status_composers.dm" +#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "code\modules\tgui\tgui.dm" #include "code\modules\tgui\tgui_alert.dm" #include "code\modules\tgui\tgui_input_list.dm" @@ -3609,7 +3610,6 @@ #include "modular_pentest\_maps\ruins_wasteplanet\_modular_wasteplanet.dm" #include "modular_pentest\_maps\ships\_areas_ships.dm" #include "modular_pentest\modules\hair_styles\code\hair.dm" -#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "modular_pentest\modules\serenity_clothes\code\turf.dm" #include "modular_pentest\modules\serenity_clothes\code\worn.dm" #include "modular_pentest\modules\spessknife\code\spess_knife.dm" From 12a3e94ce67d7e9a6addd30bd3fc0335eba68156 Mon Sep 17 00:00:00 2001 From: Constellado <64122807+Constellado@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:09:45 +1300 Subject: [PATCH 18/18] woops --- shiptest.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shiptest.dme b/shiptest.dme index 87cd4e1377..41aeddbb1c 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3508,7 +3508,6 @@ #include "code\modules\tgui\external.dm" #include "code\modules\tgui\states.dm" #include "code\modules\tgui\status_composers.dm" -#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "code\modules\tgui\tgui.dm" #include "code\modules\tgui\tgui_alert.dm" #include "code\modules\tgui\tgui_input_list.dm" @@ -3616,6 +3615,7 @@ #include "modular_pentest\modules\pi_items\code\loadout_selfrelated.dm" #include "modular_pentest\modules\pi_items\code\outfits.dm" #include "modular_pentest\modules\pi_items\code\plushes.dm" +#include "modular_pentest\modules\protein_powder\code\protein_powder.dm" #include "modular_pentest\modules\serenity_clothes\code\turf.dm" #include "modular_pentest\modules\serenity_clothes\code\worn.dm" #include "modular_pentest\modules\spessknife\code\spess_knife.dm"