From 43f63ecc52569c59d70550f0e2a65a6fed5e44d5 Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Tue, 10 Dec 2024 07:14:59 -0600 Subject: [PATCH 1/8] Adds Squirm Emote --- modular_splurt/code/modules/mob/living/emotes.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/modular_splurt/code/modules/mob/living/emotes.dm index 08aac4e945d5..34baa21e3b7a 100644 --- a/modular_splurt/code/modules/mob/living/emotes.dm +++ b/modular_splurt/code/modules/mob/living/emotes.dm @@ -1627,3 +1627,12 @@ To add randomization to your emote, copy and paste this line of code: emote_cooldown = 4 SECONDS vary = FALSE volume = 30 + +/datum/emote/sound/human/squirm + key = "squirm" + key_third_person = "squirm" + name = "squirm" + message = "squirms in place!" + message_mime = "squirms in place!" + emote_type = EMOTE_VISIBLE + emote_cooldown = 0.8 SECONDS // mrrp mrrp meow From e4f949c9b3d423160abdc2cd7544044bd527a567 Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Tue, 10 Dec 2024 07:21:52 -0600 Subject: [PATCH 2/8] Adds Glass Gasmasks to the prolathe --- .../code/modules/research/designs/tool_designs.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modular_splurt/code/modules/research/designs/tool_designs.dm b/modular_splurt/code/modules/research/designs/tool_designs.dm index 6c9622ff6983..5920d1eb6bbd 100644 --- a/modular_splurt/code/modules/research/designs/tool_designs.dm +++ b/modular_splurt/code/modules/research/designs/tool_designs.dm @@ -18,3 +18,13 @@ build_path = /obj/item/construction/rld category = list("Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/rld + name = "Glass Gasmask" + desc = "A face-covering mask that can be connected to an air supply. This one doesn't obscure your face however." + id = "glass" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 20000, /datum/material/glass = 10000) + build_path = /obj/item/clothing/mask/gas/glass + category = list("Tool Designs") + departmental_flags = DEPARTMENTAL_FLAG_ALL From 2e4deac693841a973f49a08be166284f474cf237 Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Tue, 10 Dec 2024 12:58:20 -0600 Subject: [PATCH 3/8] Added unused cc uniform sprites. --- .../modules/clothing/under/jobs/centcom.dm | 53 ++++++++++++++++++ modular_splurt/icons/mob/clothing/centcom.dmi | Bin 0 -> 3776 bytes modular_splurt/icons/obj/clothing/centcom.dmi | Bin 0 -> 960 bytes tgstation.dme | 1 + 4 files changed, 54 insertions(+) create mode 100644 modular_splurt/code/modules/clothing/under/jobs/centcom.dm create mode 100644 modular_splurt/icons/mob/clothing/centcom.dmi create mode 100644 modular_splurt/icons/obj/clothing/centcom.dmi diff --git a/modular_splurt/code/modules/clothing/under/jobs/centcom.dm b/modular_splurt/code/modules/clothing/under/jobs/centcom.dm new file mode 100644 index 000000000000..7649f1fab3a5 --- /dev/null +++ b/modular_splurt/code/modules/clothing/under/jobs/centcom.dm @@ -0,0 +1,53 @@ +/obj/item/clothing/under/rank/centcom + name = "centcom base uniform" + desc = "Shouldn't be seing this, and not just cause it's CC's!" + icon = 'modular_splurt/icons/obj/clothing/centcom.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/centcom.dmi' + icon_state = "debug" + item_state = "debug" + +/obj/item/clothing/under/rank/centcom/highranking + name = "high ranking centcom officer jumpsuit" + desc = "Oh shit, boss is here." + icon_state = "centcom" + item_state = "centcom" + can_adjust = FALSE +/obj/item/clothing/under/rank/centcom/highrankingfem + name = "high ranking centcom officer jumpskirt" + desc = "Oh shit, boss is here." + icon_state = "centcom_skirt" + item_state = "centcom_skirt" + can_adjust = FALSE +/obj/item/clothing/under/rank/centcom/officer + name = "centcom officer jumpsuit" + desc = "Lean, Green and Mean. Smells of self importance." + icon_state = "official" + item_state = "official" + can_adjust = FALSE +/obj/item/clothing/under/rank/centcom/sweater + name = "high ranking centcom officer sweater" + desc = "Favored by a certain bridge \"advisor\"." + icon_state = "officer" + item_state = "officer" + can_adjust = FALSE +/obj/item/clothing/under/rank/centcom/sweaterfem + name = "high ranking centcom officer sweaterskirt" + desc = "Favored by a certain femboy bride \"advisor\"." + icon_state = "officer_skirt" + item_state = "officer_skirt" + can_adjust = FALSE +/obj/item/clothing/under/rank/centcom/intern + name = "centcom intern jumpsuit" + desc = "Cheap and mass produced, very itchy." + icon_state = "intern" + item_state = "intern" +/obj/item/clothing/under/rank/centcom/tactical + name = "tactical centcom uniform" + desc = "No technorussian." + icon_state = "military" + item_state = "military" +/obj/item/clothing/under/rank/centcom/tacticalengi + name = "tactical engie centcom uniform" + desc = "\"I solve practical problems.\"" + icon_state = "military_eng" + item_state = "military_eng" diff --git a/modular_splurt/icons/mob/clothing/centcom.dmi b/modular_splurt/icons/mob/clothing/centcom.dmi new file mode 100644 index 0000000000000000000000000000000000000000..df196a85d53aee3f4df95419946e3188464af36f GIT binary patch literal 3776 zcmYjUdpHy9|9)mzgfZviD2FIf&Lc??* ze9`MvNv1hWylgCNGxptkUBBP^``v#$*YmkQ*K=Rj=XvhyzOE-7>*gXWtsxBnkUi{* z@c;lK+JcEKP|^CG;`)b((7+x$FxCD>&KcA$Z^43LHaNihIX0SIegwi6f_gY6nX1q#GOlfi+E z9?;qYOtt~-eZW)-z(ivj0X=n~Yy-?Sf$ELG1NCHIHK62Zv-^y*nH-Qo0JtsKvlU2b z19f>Is|*kdK+Y5xB7ufJKxzRsbbjTZA{9uKhucYjp7|OiDr#a+c|~C^UJJMy8W|Oe zivR%sIB%d=`klE9jD2lg>Ehel{+?#FdUlPTYW2Mh6C+L<%JgwJ_icYr4cI+M#Jz&} zn6j{wT07$(xqR!Z^@=C8m&e) z6HYf7&og+baL`Ko&<%?}F-n%$|bdf3HtjXc?XPU;;ri*`HbfPCC*vU?3yWOz|oP3|u zn`d7dXsHZ_xS!VKZWA0J+{SNLohH><)6VHuCto$Spe^)Qy#M);kM4oXn;G5%WAA)z z@{?l8#suRER;emRqh=bGrmCm`enZ!QG(|Ge>ga<+jr!u<|FK7JPWB#>CZIEeBeU>X zpJTx}*@56pzc!W)x*yWKSyLX{o=?JEj`j1Ae86epejF*gbIV)vwY3wNue+O`i= z9sdDZzMG#eq_%geXK9ya#y8A=f}Y}9);3`+39RHbI+U<4%%3EDe~TI$KUGW*KhCi1 z&7uw!>tGV&sxBQ2Q8fFuVoy%&Ey`W|8PVo)u)yzNqjKe~>*wG*Kir)iJ#G>p&P{Rh zI?&?MQ}Xv7Nho#j-o;02wYsz<>*m_5Wd6$hBLwzKnZ&wQ!krkoYR^gTx8lWi@e`cE zLmA^?`Un7>lGQMMKPs;TZ9H~@G}N9aE;Ik)#hl(TAn~>8FQ9PhI?~V;fyEk}C#4^L zph!EZNXi>P8Z%X))9L* zsi!NYcHqAGDFhb3>|aYHgH?b1jdjRa@QS40Qh$!GGvrL}6nx^fXc9%G24SQ7B zS|@bqgD;%lCq(tsL46Z%Yza}GmCdsyKT4Cy75~bQF0kx6sW}|7J)2SZa=xfxOC)k( zc%_*iobbW_9QXKjxe}|O7_1{Naa6y6SuVw_6gQM$^-Y^#z#4jS3YrJx+M|2 z9dhI2`eAq;_MtK(f(gy-pBh;w&^&Zlcn5TL=NB#kZJY>;8FP8jIL9O9qFTq9Q12M( zdmeBjjX;k)a0sa0B<{G|*$>m|p6uq4Jn}n_P7_GwsMafsV+t{X#*}_0RBrmp0)aF@ z!(6vPlBbs}@;jYJ7oAo{FTZA3h0ug?F;ud&t3h9iyLwb!=k4L?rA8;`YjOCGjy|mJ z=Q7RRlfxc5E}Qww_#smNA=d?N?gw?Yaq^42&YlaXq_D=^&O~7;DobECy;Rm7v~P-| z@cxC)nHr~|Ja_d=8K~V+>D~FpO6$S*2e7(A%l%2R=Ci{GV-gRS?4<17AxO%?<$3;Q z!M+M4#UZ5~cg$Te_Q`$w*||hn-&#DitAV_d29u`V1rNs|`vA2RfDM%;!Ne8X{)tn>@&7 zns8R$hJkcX4i%C($&61NXhy(UU$()-N87bN4`KqkTr1o5_g$Wc9g%k3l@A*WML8BT z);B$1`rHn5@eggj=UkP<>;bVTVfV-9906%aQJ>8N;ldf1{;LfR2ioUvL+9}zOtWHX zUz;i&a`kHe_O}ePD9(HutFS5@kDDobQ39rUkYfj-;lc>79;nj9k2X~NX}sK4xGQbt z8X{?#BoQw3h0LAzmMDRmSktd+8bnY$O+psvUBj2es^p?^0jh$`J0E^b?yGF87nURs zn~*O-Le4Kxv@;u3jg_%H^N!!rApt|9ZJB$XXVxeogPvd{a&142I#wb6WKRYXywVVB ztofI@<-}->HP-XRzAvV)Hi85H7u1*4Bg_p3jG+iO_xg3~UA+U6Mwt%~-WnKCgV53t~(itg=h-HO8Jt!KL;} zsU1nEDkF4GXFjBetST%Q4`D*@!Q}h6qz|F`fZl>!q`PaAv2b1em?nE4$Kv9@pY8N} z-vth9Za1T*HanG}6K|$gE082d_|$shwfON-$MDW&)>djA6Y8EL_^H+1Dkk^Da@O%AvPkqWYY^8ydY3oj&I&o!VeY?7zuifW&+M=q(!EChjY5a|;lagmC{d~d* zv(DlF(y->f+TG6Jv($PAR>y+%lu=H4w{J=4Zp+l=tF-2aU$1ASmro{&8|#lg155czjVo(WBt~d0Fz)nlFS8 z5)Q>McU$G6w_Q-Q_U#B9^A)eR9%eRel&4xL^5Uu4-U&(gth<*(5Tt{FyDTs2`q}!# zxBl!t5oOtP!r-pw9`;Z=g!N9V{o;hU>(3BGjXe@Q%xK=)(Ys_Qhl)-N%~dV^M8c!0k*eo~Np*Za8=5frUJM%QsQ8 zgJT81Nz+VZ-#j3r`d*G~ZvKTClk+_@M(Kmk1JB4Hqa$J=`DHEIN*Y0*yeavG&F>3% zL8Hs~ho9*?n^$EG7PocqQP&gq+=-fAFfV=9PM8(z-a-z=YHsV8STk{pvB+TeOYfG}Lb_8A-cKjgAh?ii>>QALQw{F>4{mmYjHlOW1Uo!6h!g zIdc@4iz2B!rs?V%mf%;!>x|3OtRM7rPGGxWwb!f_v-wcS9fYkt&G(t-`1n}2F{B;F zTIyB9^)rYCyei~)+HyoTsj4+5MPNZ(D8RMd_PbosKPb3yu35M_uBAU=$hjLmNex$w zT;V6PvWYW}JP!O#fTu{UuA+b<{G>ca>1SqN+5bH(^;6D93)DQz0OC*J4W68$@F>WQ zWt$sIb^a9XznHu#8%GI3HE-ptcTv#GkZJ8ZETeVA7(v(@gXJQLu?a5RKb3F=Lt(Zt1WN4ond#e6VqZ->tmWAGp4KW-U+*lz7h4jZ8tT>@8!%r# z9;-fKx)LMBo^KnI{XuMvroyl!ihawq?c!;O$dzDI$PgruQUk+_u6UK-Rq>VUzw9_R z-c-7D8)OR?!rScsNRSgXH|@%Osc{yq$Ju+OHdk=zboVaLtD z&CS+Rn9++br0~?Yj+FM%hjW}oRyv?m-Xnc+U#%fBq8A7DY6SPL@a)oozY(|LW=&i} zu^g$=`U^8SdTk~oXFKY&Ux9w%dZ#069+!_}h5Yk87NZh&rjR#L<4r_+VyV%@aODl# z1(siP{?fT|6RM(zXK<+uN&Pz52Z`fg#5Ol#UED!i&Iid_m)p3ZGmPY$MPT~sS%^N3 zt80)@xso?;17Xl}}Q0&PK{H8}D~sE3=hTfpq-hg-LxDlX>ad s8CGPVkG^w=l`JQV_*oGnCc{Ry{8jVl@2>lyqW={*?CgfAJa9hgzYtg{3jhEB literal 0 HcmV?d00001 diff --git a/modular_splurt/icons/obj/clothing/centcom.dmi b/modular_splurt/icons/obj/clothing/centcom.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7ea33803f122e465cb85396458d589e5034f7fbe GIT binary patch literal 960 zcmV;x13&zUP)DU5Iz*IJM!7~`WNX1KF#P=dARr(B006jr7Kw?8O-)Vz0Nf!V zArTZ5c4R_rdl6g!0004WQchCV=-0C=2@(LD~r zFboCYIXOkt?ufsY1+}U=&?{7-by|xiksJf!_Cyr1p=9&3zUA4aI@e9xsp`_o2T(xo z)JYvTTPdD6@*KlqFU1Tv&Af)dnjwzG0FDQ5`*1_zLW&V7#QjbRL)yYR|Fky-2cS%C zaY5Gf%7#6-DTzn8-qY&aE3XmiB?-|nkjuT$KUb={t3Ho<0}Rc5!P&-se%U0L)1MAiyi3#2bL=!N=!zFY=!s z9DwRaBcR`20QtWaz{PP0t^yo;hL(9D01zPm^#=fG0+mAZQ?&s$E`RN1z!6BZbUFc8 zxmtrEAjlts5)WeBxovYr5@6dlJU7@1@z^BvAGg{H$M;#nW|*R{9rRq>d5^j2G>{ZK;48PC|?zi=U&gi{(P`}Ul6$G2~H`&V}91lWS%vD zuT4{^Barf|{=U~>02sM{&EKojwAVl=f#&ZuKsJ?ldm(yD)!%DHj%nX_dI?3k`c)BA zB0!P=s=wD}QA`m5QOs{LnM@|rKcbXc!>g|T58~wS#djnCjAJ7nUnRvAf8SP3#rT@n z&w*W8uWuOp`?~%wx%1Qd|KRw6zyHZUcz)4W&xJRP{5`a17lXJ482Wn^5IR6QM~c5M z4>0KQg%EH3A1$tr{QY?GeL6kA7$kUqbzcW){$BkYDASbueL`z2y61~=)!$!@tN#9K iT=(}^<0g~oztt}|Ix$hy;m^we0000 Date: Tue, 10 Dec 2024 12:58:56 -0600 Subject: [PATCH 4/8] added "Coder Build.bat", intended to be ran by coders to compile instead of "Build.bat", has pause. --- Coder Build.bat | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Coder Build.bat diff --git a/Coder Build.bat b/Coder Build.bat new file mode 100644 index 000000000000..39821527ee27 --- /dev/null +++ b/Coder Build.bat @@ -0,0 +1,4 @@ +@echo off +call "%~dp0\tools\build\build.bat" %* + +pause \ No newline at end of file From 164cf82d717a6a10069c3aa43923c0bcd8f97094 Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Tue, 10 Dec 2024 13:20:53 -0600 Subject: [PATCH 5/8] Adjustable CC uniforms --- .../code/modules/clothing/under/jobs/centcom.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modular_splurt/code/modules/clothing/under/jobs/centcom.dm b/modular_splurt/code/modules/clothing/under/jobs/centcom.dm index 7649f1fab3a5..7d7a24f0e219 100644 --- a/modular_splurt/code/modules/clothing/under/jobs/centcom.dm +++ b/modular_splurt/code/modules/clothing/under/jobs/centcom.dm @@ -11,31 +11,31 @@ desc = "Oh shit, boss is here." icon_state = "centcom" item_state = "centcom" - can_adjust = FALSE + can_adjust = TRUE /obj/item/clothing/under/rank/centcom/highrankingfem name = "high ranking centcom officer jumpskirt" desc = "Oh shit, boss is here." icon_state = "centcom_skirt" item_state = "centcom_skirt" - can_adjust = FALSE + can_adjust = TRUE /obj/item/clothing/under/rank/centcom/officer name = "centcom officer jumpsuit" desc = "Lean, Green and Mean. Smells of self importance." icon_state = "official" item_state = "official" - can_adjust = FALSE + can_adjust = TRUE /obj/item/clothing/under/rank/centcom/sweater name = "high ranking centcom officer sweater" desc = "Favored by a certain bridge \"advisor\"." icon_state = "officer" item_state = "officer" - can_adjust = FALSE + can_adjust = TRUE /obj/item/clothing/under/rank/centcom/sweaterfem name = "high ranking centcom officer sweaterskirt" desc = "Favored by a certain femboy bride \"advisor\"." icon_state = "officer_skirt" item_state = "officer_skirt" - can_adjust = FALSE + can_adjust = TRUE /obj/item/clothing/under/rank/centcom/intern name = "centcom intern jumpsuit" desc = "Cheap and mass produced, very itchy." From 9e9661677dc88b67654aa0185b610076e79c0dfc Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Tue, 10 Dec 2024 13:42:25 -0600 Subject: [PATCH 6/8] Removes Glass Gas Mask from Autolathe I need more time to experiment and figure out how the lathe system works --- .../code/modules/research/designs/tool_designs.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modular_splurt/code/modules/research/designs/tool_designs.dm b/modular_splurt/code/modules/research/designs/tool_designs.dm index 5920d1eb6bbd..6c9622ff6983 100644 --- a/modular_splurt/code/modules/research/designs/tool_designs.dm +++ b/modular_splurt/code/modules/research/designs/tool_designs.dm @@ -18,13 +18,3 @@ build_path = /obj/item/construction/rld category = list("Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE - -/datum/design/rld - name = "Glass Gasmask" - desc = "A face-covering mask that can be connected to an air supply. This one doesn't obscure your face however." - id = "glass" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 20000, /datum/material/glass = 10000) - build_path = /obj/item/clothing/mask/gas/glass - category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ALL From 56eb2a36214606de256e60319b3da15bd4948ab8 Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Tue, 10 Dec 2024 21:50:09 -0600 Subject: [PATCH 7/8] Requested Fixes --- .../code/modules/clothing/under/jobs/centcom.dm | 9 +++++++++ modular_splurt/code/modules/mob/living/emotes.dm | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/clothing/under/jobs/centcom.dm b/modular_splurt/code/modules/clothing/under/jobs/centcom.dm index 7d7a24f0e219..f2d08f2c6a06 100644 --- a/modular_splurt/code/modules/clothing/under/jobs/centcom.dm +++ b/modular_splurt/code/modules/clothing/under/jobs/centcom.dm @@ -6,46 +6,55 @@ icon_state = "debug" item_state = "debug" +// Actual CC uniforms + /obj/item/clothing/under/rank/centcom/highranking name = "high ranking centcom officer jumpsuit" desc = "Oh shit, boss is here." icon_state = "centcom" item_state = "centcom" can_adjust = TRUE + /obj/item/clothing/under/rank/centcom/highrankingfem name = "high ranking centcom officer jumpskirt" desc = "Oh shit, boss is here." icon_state = "centcom_skirt" item_state = "centcom_skirt" can_adjust = TRUE + /obj/item/clothing/under/rank/centcom/officer name = "centcom officer jumpsuit" desc = "Lean, Green and Mean. Smells of self importance." icon_state = "official" item_state = "official" can_adjust = TRUE + /obj/item/clothing/under/rank/centcom/sweater name = "high ranking centcom officer sweater" desc = "Favored by a certain bridge \"advisor\"." icon_state = "officer" item_state = "officer" can_adjust = TRUE + /obj/item/clothing/under/rank/centcom/sweaterfem name = "high ranking centcom officer sweaterskirt" desc = "Favored by a certain femboy bride \"advisor\"." icon_state = "officer_skirt" item_state = "officer_skirt" can_adjust = TRUE + /obj/item/clothing/under/rank/centcom/intern name = "centcom intern jumpsuit" desc = "Cheap and mass produced, very itchy." icon_state = "intern" item_state = "intern" + /obj/item/clothing/under/rank/centcom/tactical name = "tactical centcom uniform" desc = "No technorussian." icon_state = "military" item_state = "military" + /obj/item/clothing/under/rank/centcom/tacticalengi name = "tactical engie centcom uniform" desc = "\"I solve practical problems.\"" diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/modular_splurt/code/modules/mob/living/emotes.dm index 34baa21e3b7a..1bab4e918801 100644 --- a/modular_splurt/code/modules/mob/living/emotes.dm +++ b/modular_splurt/code/modules/mob/living/emotes.dm @@ -1635,4 +1635,4 @@ To add randomization to your emote, copy and paste this line of code: message = "squirms in place!" message_mime = "squirms in place!" emote_type = EMOTE_VISIBLE - emote_cooldown = 0.8 SECONDS // mrrp mrrp meow + emote_cooldown = 0.8 SECONDS From cb078c5db0c234112cf4e2f6ce08d040944d4134 Mon Sep 17 00:00:00 2001 From: SpaceCat404 Date: Thu, 12 Dec 2024 13:43:09 -0600 Subject: [PATCH 8/8] Deleted Coder Build.bat --- Coder Build.bat | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 Coder Build.bat diff --git a/Coder Build.bat b/Coder Build.bat deleted file mode 100644 index 39821527ee27..000000000000 --- a/Coder Build.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -call "%~dp0\tools\build\build.bat" %* - -pause \ No newline at end of file