From 48adf7f5cff99279603bc74ced73c52d479d884d Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 4 Aug 2021 16:21:40 -0300 Subject: [PATCH] New scc shuttle walls and windows (#12284) --- code/game/objects/structures/window.dm | 8 ++++++++ code/game/turfs/simulated/shuttle_turfs.dm | 12 ++++++++++++ html/changelogs/alberyk-newshuttlewalls.yml | 6 ++++++ .../turf/shuttles_unique/scc_shuttle_pieces.dmi | Bin 0 -> 6000 bytes icons/turf/smooth/scc_shuttle.dmi | Bin 0 -> 2184 bytes 5 files changed, 26 insertions(+) create mode 100644 html/changelogs/alberyk-newshuttlewalls.yml create mode 100644 icons/turf/shuttles_unique/scc_shuttle_pieces.dmi create mode 100644 icons/turf/smooth/scc_shuttle.dmi diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 288bc9de225..6d3b4088e78 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -485,6 +485,14 @@ /obj/structure/window/shuttle/skrell ) +/obj/structure/window/shuttle/scc + icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi' + icon_state = "scc_window" + basestate = "scc_window" + health = 160 + maxhealth = 160 + smooth = 0 + /obj/structure/window/shuttle/crescent desc = "It looks rather strong." diff --git a/code/game/turfs/simulated/shuttle_turfs.dm b/code/game/turfs/simulated/shuttle_turfs.dm index 94fbe327f6a..c5e103dd4b2 100644 --- a/code/game/turfs/simulated/shuttle_turfs.dm +++ b/code/game/turfs/simulated/shuttle_turfs.dm @@ -150,6 +150,12 @@ smooth = null canSmoothWith = null +/turf/simulated/wall/shuttle/scc + icon = 'icons/turf/smooth/scc_shuttle.dmi' + +/turf/simulated/wall/shuttle/scc/cardinal + smooth = SMOOTH_MORE + //--Unique Shuttles--// /turf/simulated/wall/shuttle/unique @@ -399,6 +405,12 @@ icon = 'icons/turf/shuttles_unique/distress_shuttle.dmi' icon_state = "6,2" +//scc shuttle pieces + +/turf/simulated/wall/shuttle/unique/scc + name = "shuttle hull" + icon = 'icons/turf/shuttles_unique/scc_shuttle_pieces.dmi' + icon_state = "c1" //--Floors--// diff --git a/html/changelogs/alberyk-newshuttlewalls.yml b/html/changelogs/alberyk-newshuttlewalls.yml new file mode 100644 index 00000000000..9506b206c76 --- /dev/null +++ b/html/changelogs/alberyk-newshuttlewalls.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added new SCC themed shuttle walls and windows." diff --git a/icons/turf/shuttles_unique/scc_shuttle_pieces.dmi b/icons/turf/shuttles_unique/scc_shuttle_pieces.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c53ee02156b8c91e7231a50c5582ec1d9882936a GIT binary patch literal 6000 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 e#i7Se*ZvQ(pNDQnLt1zM0000)qay!{vAdYjNt& z!zjATz+Y~qaF60B%%S0I3pV+@=$13@!qumJp)@6z$7-1#lKeBJo2xjpVWoVkIGfjL zar^vZl?+9u1sDx524IwofKQpxk^rAFqvQtolzY}djsbFVKZsC7j0jO8#AybU%8UjW z127hmw#fA@Qlv$mv&YuS|)&*R2uFvR~RhRFToy-BUhET;1ffOP*1{yH}F&v^vHnP5B! zMj#k*f{{tEObLO-L7-woRYI@_1ZrQFWi>zS5}99PL;t+O1GRbwc1y5g9_+OQdUA5o zKRf|k$AQiflCG#1ZxRFexqFz6nStT0puJk7v=636F3i$oqXj% zf42vB6Kr2x0vKvf382oc7X&lYgYk9c!HjRTx##Tzah)pgTr@MINIaDif1l|-*nSJ8 zHj02*5Bgj#8m{ZfyeY+z?>5?(CB6?OKexjZBnOCZn!p>$5y%rXF5&S)e25DO>VqI8 zI3GhjL1P$)1WS&fZ6ihmr&fSNYbuEdPR$I5)@1n81XD`TSdhMr;HNyG_Cb!IP1b}2 z?H&-RV$MZTo3xAwL`u*ojt_#kJ@3#e@8cIT1l$9PDb0!f8?JU|mWWu}kRY*-2y!2p zNzji%e=3~7YRp`i5-GqFjKfo9!u;C^^z!JEd?x`oa7ADXQhq0cHY5qafm=NQ2WSuS z1&8HYIbzhN^%j)2hr4(7EF zaY10DUrss_`aiH&IDr$dDFLPb3Hvu%^*<`#TL&QR$s>?M^%9bYIEU&WAdjJ*pf-%j zgS12SMkHGS4%MlI6s>Q9%4B#u0ohOr-m54`Wgb+NRI;h(Q0>9(1Y~2inSj#u!Fv_b zl5B1V1Qp`A@c$3W<^5)5H%Sl;_}n7GPs~7;5p-@vKi|K&2dG|=`f#SDHhOyUX;C?#RF2MYoCtLJ<^%SKDzGWwS?Z6~IfndqIFpDpibkuu5 zuf{&fpt!=dUZ>R%oLBEepm@>|_Q3G9%&%aKZhkEvJ?sTdunb?B($3ZY57SP1#p+-; zH+N+S^slK4T>0KjJA~vCjnFL+s;m4oe?KuwT%Az*9~)qw#s&U71DU`9O8;X^(7_Td zazK{w0CtG;L4bb5{i8Po*&v8L$Q(m`7^7hb+ZhP5VSEC1koFr9-AE>>0zqaY1_Vee zz^4*46_})I+Ma1D2?&s8hEIlQGBYlieUv1_h#=pN@#!2*$Kb-&50)uR=OF>oQ1S%{ zEhsSXAPhlNkRk%4CFV;iS`v*5)`O^|Mg&Mx&x-=Is2dktE(=6KOn|f{y{tiHiFLsx z%d@PBfHhXVFhhlveajJ?gjqs>w1&O3M5Un}*r)qLS|$WYbK8q!ycuWU|3op?#0f!0 z|677f2lT+l`}uQ3w`!%S)R^XbeTdVajXc9)_HSY>J|-n|`F=8wC<4sh4>N%J$WB1J z0BMpUKMix@V0fh54~t?a-z;lpfair``sTj6x&0JuOA;Py`XT{!?QPz1OGPP`Ib zK{`xPODDgv3HW(X1epE%08u*tHG%gLh(hHO9)~yzl|gVELn+jS@#!E

89dS^*TQ zQpvfQK@!v?!%ID%5R|9$prJ&erXU3^F$xtWHEilps1OBVTarS#tce<{6v~BJ)EcHx zEG=;%pGUDc#&kS}YI)Dq|JC5?|9UX>e?6G`zX3e`-vFNeZvjjHw}7Spo50ckP2lMN zHZb&m8yNb(5w!kq1g-yDac`JD82Y~%pLb87^$10x^$60I#Y60J=^60L1b60MC{60NOe60OZ~60Pn182