From aaf461379127d126104beb0a7adff005b3dd6c86 Mon Sep 17 00:00:00 2001 From: Enric Gabriel <43283559+SandPoot@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:26:19 -0300 Subject: [PATCH 1/2] push --- .../game/objects/items/storage/backpack.dm | 18 ++++++++++++++++++ .../modules/crafting/recipes/recipes_misc.dm | 9 +++++++++ .../research/designs/autolathe_designs.dm | 16 ++++++++++++++++ sandcode/icons/obj/storage.dmi | Bin 685 -> 1229 bytes 4 files changed, 43 insertions(+) diff --git a/sandcode/code/game/objects/items/storage/backpack.dm b/sandcode/code/game/objects/items/storage/backpack.dm index 2d124e0ef7..9d2e1434bc 100644 --- a/sandcode/code/game/objects/items/storage/backpack.dm +++ b/sandcode/code/game/objects/items/storage/backpack.dm @@ -36,3 +36,21 @@ desc = "A large case for holding tools and supplies for large constructions." icon_state = "infiltrator_case_engineering" item_state = "infiltrator_case_engineering" + +/obj/item/storage/backpack/case/mining + name = "mining compartment case" + desc = "A large case for holding both loot and equipment." + icon_state = "infiltrator_case_mining" + item_state = "infiltrator_case_mining" + +/obj/item/storage/backpack/case/science + name = "science compartment case" + desc = "A large case for holding science supplies." + icon_state = "infiltrator_case_science" + item_state = "infiltrator_case_science" + +/obj/item/storage/backpack/case/cosmos + name = "cosmos compartment case" + desc = "A large compartment case for holding lots of things.\nThis one has been designed to look like space, neat." + icon_state = "infiltrator_case_cosmos" + item_state = "infiltrator_case_cosmos" diff --git a/sandcode/code/modules/crafting/recipes/recipes_misc.dm b/sandcode/code/modules/crafting/recipes/recipes_misc.dm index 2500a2cab7..44274af012 100644 --- a/sandcode/code/modules/crafting/recipes/recipes_misc.dm +++ b/sandcode/code/modules/crafting/recipes/recipes_misc.dm @@ -27,3 +27,12 @@ tools = list(TOOL_WELDER) subcategory = CAT_MISCELLANEOUS category = CAT_MISC + +/datum/crafting_recipe/case_cosmos + name = "Cosmos Compartment Case" + reqs = list(/obj/item/storage/backpack/case = 1, + /obj/item/bedsheet/cosmos = 1) + result = /obj/item/storage/backpack/case/cosmos + tools = list(TOOL_SCREWDRIVER) + subcategory = CAT_MISCELLANEOUS + category = CAT_MISC diff --git a/sandcode/code/modules/research/designs/autolathe_designs.dm b/sandcode/code/modules/research/designs/autolathe_designs.dm index 6beacafc18..5cd509a60f 100644 --- a/sandcode/code/modules/research/designs/autolathe_designs.dm +++ b/sandcode/code/modules/research/designs/autolathe_designs.dm @@ -37,3 +37,19 @@ materials = list(/datum/material/iron = 2500) build_path = /obj/item/storage/backpack/case/engineering category = list("initial","Tools") + +/datum/design/infiltrator_case_mining + name = "Mining Compartment Case" + id = "infiltrator_case_mining" + build_type = AUTOLATHE | PROTOLATHE + materials = list(/datum/material/iron = 2500) + build_path = /obj/item/storage/backpack/case/mining + category = list("initial","Tools") + +/datum/design/infiltrator_case_science + name = "Science Compartment Case" + id = "infiltrator_case_science" + build_type = AUTOLATHE | PROTOLATHE + materials = list(/datum/material/iron = 2500) + build_path = /obj/item/storage/backpack/case/science + category = list("initial","Tools") diff --git a/sandcode/icons/obj/storage.dmi b/sandcode/icons/obj/storage.dmi index 073a86aaf1695f20348dfed07ae25bf0d9e3420b..c6a01690fc54e8c7565e46cd292282b8f9474d5b 100644 GIT binary patch delta 1213 zcmV;u1Va0*1(~$jBBnMG6-oWN2})m;f0<6g)mey1GqLjk*Ay!fI-2 z>HrLb006OuL=F%SY*Q>16%|kF>M+yO1X)`ERA_B}j?Dl6PE1V41rJ>S0B}?)Pdgm| z005wHCW}00$!))EFHo9Nl1(T)`xW#Se*gdg0d!JMQvg8b*k%9#0Ka-vSad{Xb7OL8 zaCB*JZU6vyoSl-v3c@f9hR^L&ld}g zgFhjux)j&4Qu(cvPjsFvtFt<8cT&8l34Jt&Oo|?<>%(MxfPhgZ#4QcML9njYf8eo3 z?uZc`ahFKZkn?eDFGcIX;H2kagAHjImV??F1KcbJ@8C%<$2{tXqcE;mk$BZ2%udF2LcbLjaCoUoD(-y)mHvpy;{iz6aF51z;5eIR2Fe`n=bNvHOh;@Y4po zmr4fuJ_L5`_~D}aMyQViNCTY!Ec`LX4>FqsIOF^l>rS8{6WeSkFToHRGPKQx zs6UUOAtT#ti2BPI8Zx%chGho8tvhoQ+8JQF9c*Ya0O@vTZbExLrrW`WXy6rr!CoCq zh;Q(Qz_D)*CX^XKVD&vaf0$5a0D%);98CCszUw18K@bE%5Cn05n%>hT0nX9c6q(It z)9L#=mk%8Rcvt%Y%;$61rYY2AX`0%O573hgScpX?GRsnS0EwgLrCvDtkpUoN0N_;v z%i{qu-+=W~r+Wr)ba;jgaA@@zI59v>KQbUw5HP^gkbz~yfYe2ke+=+6XdttrV8^m9 z1G)Gqa#z1-4RE;%P8yg;E`ic38CW6f^?J4XrO_dP1~veU2ixBo+p)RH8khw@1M>iA zKmdz1Mpt{HP#(TT)+Qs0YMN1K@bFS zf12LY#q{VsCDd!jm5Z+5g}JLOd|lL6K1C@zI{Q(sm;eqC4`gU@8A22Q007|G(f`ZHrLb002BbMCS4O z0ABo600001bW%=J06^y0W&i*HpL$eSbVOxyV{&P5bZKvH004NLmC!p1!!Qs8&{{f$ zu=|i-nBMVD8 zv?&CLt{grglPzZ%?Tbmid$Km|(EJbm0is@QUN^*eBLDyaUr9tkR9J=Wmg{nYe?Sa{ z-2$o5x`IwYdH)A(vTWiq)Uay#(N4a2nL{*Z&%&U)onaXN0ypDrrj~v8c)uXZvMh=U z0enV@;3wR>008lYq5giNPKn3%Zec+4pEPKoZg6(9Y5?~QW^aoGO$|`jpc>%vKuMq* z&~VTV!uS`?0R;#fb>EbfydsCWL-t2g3~W^y3pOHLNKTfSj0g} zWY{8)MR+NZ)IYXZL@OoomH>A)T{%lh&~;t9aFLt1F@*1x&#OM(71^u#a>eSf(?ctnZhI6P*6YHVph)A6~b zL5T2&6Fhegyn^FCPW1i~iE`?%8>nD^P{=a4dMv_Ai6n#8V-a3TWPSpQn;?=CjN_QD yoMm1D0%u(lScU`y4r>!w=G`kcz84vWu{qyDK}j6H(A?Mn0000 Date: Tue, 8 Sep 2020 14:52:00 -0300 Subject: [PATCH 2/2] Automatic changelog generation for PR #65 [ci skip] --- html/changelogs/AutoChangeLog-pr-65.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-65.yml diff --git a/html/changelogs/AutoChangeLog-pr-65.yml b/html/changelogs/AutoChangeLog-pr-65.yml new file mode 100644 index 0000000000..c2c610c20e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-65.yml @@ -0,0 +1,6 @@ +author: "SandPoot" +delete-after: True +changes: + - rscadd: "Added the mining compartment case." + - rscadd: "Added the science compartment case." + - rscadd: "Added the *cosmos compartment case*."