From f8413517bb23ef5b18a2afff7a3312a5cab510af Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 2 Sep 2017 07:43:34 -0500 Subject: [PATCH] testing --- code/citadel/custom_loadout/custom_items.dm | 9 +++++++++ icons/cebusoap.dmi | Bin 0 -> 996 bytes icons/obj/custom.dmi | Bin 0 -> 996 bytes tgstation.dme | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 icons/cebusoap.dmi create mode 100644 icons/obj/custom.dmi diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm index 37e6e478b7..d620dd9017 100644 --- a/code/citadel/custom_loadout/custom_items.dm +++ b/code/citadel/custom_loadout/custom_items.dm @@ -1,2 +1,11 @@ //For custom items. + +/obj/item/custom/ceb_soap + name = "Cebutris' Soap" + desc = "A generic bar of soap that doesn't really seem to work right." + gender = PLURAL + icon = 'icons/obj/custom.dmi' + icon_state = "cebu" + w_class = WEIGHT_CLASS_TINY + flags_1 = NOBLUDGEON_1 \ No newline at end of file diff --git a/icons/cebusoap.dmi b/icons/cebusoap.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3b812e445a7784e4f574a81106a16a9212c4f825 GIT binary patch literal 996 zcmWlXT})F46vxlK?fvl94p2~Fdtk;Tqe?>TOxVLRap(k*Fj{mEWZ^@;WC*J)TlU1* zz?F|uE-gh{gxL)SxW(b3i!51}Ih~^jw1u`5+S+1ODk8L{6xw@N9?m)c^Kj1ZB>yAL z&-;*1B~t*v&pwq^5UnXYL2{xw>xb6+04P5{SA0UJ(;?%=E+2btg+**Zm|rE_3^E^q z#Ryo!q;VY295pDG01ru097~MK7e1}n)GKgpAa_m3?MckE zflsh}nHJ_Y!RyBzYq&}SrZtEjHp_zS3QR=l0p!~u&ippoJP39_I9IUtD}*})3t?p3 zM0yy$hXtt$=8?zfps1fM*XthlZjxq*8%fU&PF@T!kjCX9!o)AXDQGA2Pqi zGXx2TkGsf%BM7q$nAedVy@5zW!xa_PzgRK z0)G6p7sRNF7^x^Pd+JE;sUUT4p_WIAIrEb^WJ>9gZz-SO2xixl45=X7C^QgAg(>W9W9TJR=)Lif` zzn-kVTEf6^RdsF6>a!QiFQ2b?`_n%&ETxKu-VE=OaNYhSVddmC;TQHW#@nCv$ykF` zazCNI4lTS<)SP^3)O@47=s{Dw;@Ahhe|^nAu20N7lQDJ@$pjGm_MV_Cjbn=%0@)|> KvVJ*U-1I-M^yF0l literal 0 HcmV?d00001 diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3b812e445a7784e4f574a81106a16a9212c4f825 GIT binary patch literal 996 zcmWlXT})F46vxlK?fvl94p2~Fdtk;Tqe?>TOxVLRap(k*Fj{mEWZ^@;WC*J)TlU1* zz?F|uE-gh{gxL)SxW(b3i!51}Ih~^jw1u`5+S+1ODk8L{6xw@N9?m)c^Kj1ZB>yAL z&-;*1B~t*v&pwq^5UnXYL2{xw>xb6+04P5{SA0UJ(;?%=E+2btg+**Zm|rE_3^E^q z#Ryo!q;VY295pDG01ru097~MK7e1}n)GKgpAa_m3?MckE zflsh}nHJ_Y!RyBzYq&}SrZtEjHp_zS3QR=l0p!~u&ippoJP39_I9IUtD}*})3t?p3 zM0yy$hXtt$=8?zfps1fM*XthlZjxq*8%fU&PF@T!kjCX9!o)AXDQGA2Pqi zGXx2TkGsf%BM7q$nAedVy@5zW!xa_PzgRK z0)G6p7sRNF7^x^Pd+JE;sUUT4p_WIAIrEb^WJ>9gZz-SO2xixl45=X7C^QgAg(>W9W9TJR=)Lif` zzn-kVTEf6^RdsF6>a!QiFQ2b?`_n%&ETxKu-VE=OaNYhSVddmC;TQHW#@nCv$ykF` zazCNI4lTS<)SP^3)O@47=s{Dw;@Ahhe|^nAu20N7lQDJ@$pjGm_MV_Cjbn=%0@)|> KvVJ*U-1I-M^yF0l literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 4a1a0f3925..8b939ee590 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -13,7 +13,7 @@ // END_PREFERENCES // BEGIN_INCLUDE -#include "_maps\basemap.dm" +#include "_maps\runtimestation.dm" #include "code\_compile_options.dm" #include "code\world.dm" #include "code\__DATASTRUCTURES\globals.dm"