From 70fbb4bbd958c9c0717019a8f1b0aae9584a494e Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Mon, 17 Aug 2026 22:13:22 -0400 Subject: [PATCH 01/13] bimb --- _maps/map_files/Vampire/generic/forest.dmm | 2 +- .../modules/clothing/code/outdoorboots.dm | 4 ++-- .../modules/clothing/icons/outdoorboots.dmi | Bin 484 -> 989 bytes .../clothing/icons/outdoorboots_onfloor.dmi | Bin 308 -> 323 bytes .../clothing/icons/outdoorboots_worn.dmi | Bin 373 -> 683 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/Vampire/generic/forest.dmm b/_maps/map_files/Vampire/generic/forest.dmm index 39d80811a9e3..83762a166ad5 100644 --- a/_maps/map_files/Vampire/generic/forest.dmm +++ b/_maps/map_files/Vampire/generic/forest.dmm @@ -6111,7 +6111,7 @@ "TB" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/vampire/gangrel, -/obj/item/clothing/shoes/vampire/jackboots/work/jimbs, +/obj/item/clothing/shoes/vampire/jackboots/work/bimbs, /obj/item/clothing/under/vampire/gangrel, /obj/item/clothing/under/vampire/gangrel/female, /obj/item/clothing/under/vampire/gangrel/female, diff --git a/modular_zapoc/modules/clothing/code/outdoorboots.dm b/modular_zapoc/modules/clothing/code/outdoorboots.dm index 9c1b03475786..f9bdaf9c9a63 100644 --- a/modular_zapoc/modules/clothing/code/outdoorboots.dm +++ b/modular_zapoc/modules/clothing/code/outdoorboots.dm @@ -1,7 +1,7 @@ -/obj/item/clothing/shoes/vampire/jackboots/work/jimbs +/obj/item/clothing/shoes/vampire/jackboots/work/bimbs name = "bimberton boots" desc = "For walking in the Appalachian mountains. Or Chicago." icon = 'modular_zapoc/modules/clothing/icons/outdoorboots.dmi' - icon_state = "jimbs" + icon_state = "bimbs" ONFLOOR_ICON_HELPER('modular_zapoc/modules/clothing/icons/outdoorboots_onfloor.dmi') worn_icon = 'modular_zapoc/modules/clothing/icons/outdoorboots_worn.dmi' diff --git a/modular_zapoc/modules/clothing/icons/outdoorboots.dmi b/modular_zapoc/modules/clothing/icons/outdoorboots.dmi index cfa5c99b14794d5a30ff4b6c9adf4a8c232c056d..39496ceffc720d64a6cfb03977680e062a1c52d2 100644 GIT binary patch delta 878 zcmV-!1CjjX1KkIZ7zqdl0001UdV2JcTTKBek*OblHrE;$mtmz~0009oNklcO?;#IOM^R|K5B5_rCZ3_dhOLwOXZa zN?%uhqxT5(2>cHOB7Vh*#8ETMu~2!Sh3Uor()a)w*;|^i<(Jub*B9y=CYsCvY!qdA zdP;FhUBBtB1ss7FKi+5E+wu+m9ZH>J`=5|t0@$#7;{<21DP=H_7ZmIF6UKRq*L-BAUw0ly!A9+xPVK1`8suUHRI(Ln%ue*B90=;cK^ zwEZfbPJCuP?0&yaD&Y1&=6Ief0D$__CDNM>);IMvH0*$*0vn>w%`eNZxeEDv85an9 zMo_)I39gKhO?DDry#+<9buAFi~$$wIu+5 zXK5&uTyNGnIKZ%m4g#O~(gDil)^V@kfeh~-;U0n9&CKyH_6l}e0_a$j^kn{&ViYh4 zZ1BOenjmPdG0$uC0Q#!kZBXU_$_YWaV`&@gf^m!zRC0aB`b{@mRB0$hw$H&RZFSCH z#NUWAGrTiJA%MUD5;8(aY}Tb=yYvHpQ7hQBqWun1Adg@YNCMxm$Qc+gz(gg_THvG%RPZg`2&l1-vb1s0)Aa9YgKP&PBe1_Rj`N@>J%?7 zvTf2KDuSbvn^m69ni$;?KcGxPRqUy_U|lb%h7gVGHZcUpy4H*al0ab0msom#l=}rD z4Iiigt{j{IBmr#ah7uSRflpjl_uGV`O2*Qt5W!ur24A6)3^rk{SYiOl3>#__CFfn^ z3IUkU-pSlAzyWF8ihYAq4zZT~tF}U+O~{#AcVAd~vw{t*aXiRK2F)3LN%2JkLhKnb z$ALKs>p@`h1P>6vNR@!zBk8JtxsRVBLEypLb=1{%bJC;hf)3UX+vxbXB$S=;O4N6Ft=z`kHr{)it*8i4u;)diz_(3b+$W&}SVILkPt6@T z-B4#?=in52_{&bH<59tI3Tv;y!CMXv5AMgK=*EliNgfy{W7X(a{Na29tCv25hTlRD P00000NkvXXu0mjfP_YUp~nr zJdI6IL|JUZghdtqr)}rCZ@IkTrg{TVwMj7pM?u|w&nXfc8=hzcdFVdQ&MBb@ E0LZgUz5oCK delta 191 zcmX@iw1sJcgaZpR0|P^2NcwRgB^Tfm;tHhg%u7v0T(uaq=Y(oMdAe`c(%NWFiOF$6 z`{w#TWKYims$eV$@(X5gcy=RgqM|RO_QZVod<%Xl1>J26^?JbN&!N$0@5z<`T=N)Lhp9`z|1Y+g`g)g@^xYqNX- q#}11fI~G{1nbWwp!NZ;>j)9?LA&-~v*1&L}(F~rhelF{r5}E+^Hbhwf diff --git a/modular_zapoc/modules/clothing/icons/outdoorboots_worn.dmi b/modular_zapoc/modules/clothing/icons/outdoorboots_worn.dmi index f49a813881c1972eb1f7fab4a9578dce6e2257ca..175a5c6bb114577f4f44157e29e9beb25622d640 100644 GIT binary patch delta 569 zcmey$w3>B-1Sba@0|UdV%))yUBYYV(CoWT{HY zJ4m$YKU&cDR>49<)9+P`i@=!_R(5t)){85D#P29C5}WIC;o!yv(MIJ(0qUaa2N!Oh zJ@Nagsf*qAT1($kyw9w-f8BT6%Go~OT{CB`GBQ3UmY~eIf%S$5Lk^>v5JPlBFUtXl zP(2ngG@;;M499BO=C6C7^3g4Hu8Q%iz2)oAO+KArfA8$F)!nZQ>ViF&FOM=04-DM2 z!u0ly%g5K>?RNb8Fx#%UinXDgy`p0Fzsl5t{Tc#aj(@(p{Z~c7ox{(%KdU#?@4q)E zxc)}pHm$5wrOVeh9^bjMz3`qGUyYr7`rB_)>MjRdUf0iiy-@yf&9l-f<}<7R7ybV7 zSfZH!u|eIG`AsYTiyu>bx#M~{*MkRZmOcwluKhDZt!lr?&kOhS^;h4z)nsRuoHe`i z^paWkc5qfi;e@_BP$R~5)eugK=9KP1q9U+ zkZe#=5)e{SMB)P#An_U4JIW_auV_c`+bbu`EJyH1!6+C70|i)&6j23)lpRnNxFw+~ zP)k8oz=$wXJOKH?5&}(u5{ex_E~)}f(?>>0000 Date: Mon, 17 Aug 2026 23:32:14 -0400 Subject: [PATCH 02/13] loadout --- .../modules/clothing/code/eyepatches.dm | 103 +++++------------- .../loadout/code/categories/glasses.dm | 19 ++++ .../modules/loadout/code/categories/shoes.dm | 3 + 3 files changed, 48 insertions(+), 77 deletions(-) create mode 100644 modular_zapoc/modules/loadout/code/categories/glasses.dm create mode 100644 modular_zapoc/modules/loadout/code/categories/shoes.dm diff --git a/modular_zapoc/modules/clothing/code/eyepatches.dm b/modular_zapoc/modules/clothing/code/eyepatches.dm index 8d2a8b432565..c4845838ae80 100644 --- a/modular_zapoc/modules/clothing/code/eyepatches.dm +++ b/modular_zapoc/modules/clothing/code/eyepatches.dm @@ -1,56 +1,13 @@ -/obj/item/clothing/glasses/apoc/eyepatch - name = "eyepatch" - desc = "Put this over your eye if you don't want your eye to see, or if you don't want to see your eye." +/obj/item/clothing/glasses/eyepatch/rose + name = "rose eyepatch" + desc = "Put this over your eye if you want people to think your head is full of roses." icon = 'modular_zapoc/modules/clothing/icons/eyepatches.dmi' worn_icon = 'modular_zapoc/modules/clothing/icons/eyepatches_worn.dmi' ONFLOOR_ICON_HELPER('modular_zapoc/modules/clothing/icons/eyepatches_onfloor.dmi') - icon_state = "eyepatch" - base_icon_state = "eyepatch" - inhand_icon_state = "blindfold" - var/wornunder = TRUE - var/flipped = FALSE - - -/obj/item/clothing/glasses/apoc/eyepatch/attack_self(mob/user) - wornunder = !wornunder - alternate_worn_layer = wornunder ? GLASSES_LAYER : FACEMASK_LAYER - to_chat(user, span_notice("You adjust [src].")) - - -/obj/item/clothing/glasses/apoc/eyepatch/examine(mob/user) - . = ..() - . += span_notice("Alt-click to flip the eyepatch to the other eye.") - - -// /obj/item/clothing/glasses/apoc/eyepatch/AltClick(mob/user) -// if(isliving(user)) -// swap_eye(user) - - -/obj/item/clothing/glasses/apoc/eyepatch/proc/swap_eye(mob/user) - flipped = !flipped - icon_state = flipped ? "[base_icon_state]_flipped" : base_icon_state - if (!ismob(user)) - return - var/mob/living/carbon/human/H = user - H.regenerate_icons() - - -/obj/item/clothing/glasses/apoc/eyepatch/medical - name = "medical eyepatch" - desc = "Used by weeaboos to pretend their eye isn't there, and those who actually lost their eye to pretend their eye is there." - icon_state = "eyepatch_medical" - base_icon_state = "eyepatch_medical" - - -/obj/item/clothing/glasses/apoc/eyepatch/rose - name = "rose eyepatch" - desc = "Put this over your eye if you want people to think your head is full of roses." icon_state = "rosepatch" base_icon_state = "rosepatch" - -/obj/item/clothing/glasses/apoc/blindfold +/obj/item/clothing/glasses/blindfold/apoc // TODO: GAGS name = "blindfold" desc = "Fold it over your eyes to go blind." icon = 'modular_zapoc/modules/clothing/icons/eyepatches.dmi' @@ -60,69 +17,61 @@ base_icon_state = "blindfoldwhite" worn_icon_state = "blindfoldwhite_both" var/wornunder = TRUE - var/trick = FALSE var/adjusted_state = "both" var/oldname = "blindfold" - -/obj/item/clothing/glasses/apoc/blindfold/trick +/obj/item/clothing/glasses/blindfold/apoc/trick desc = "Fold it over your eyes to not go blind, because this one is too thin to obstruct your vision. Cheater." - trick = TRUE + tint = NONE +/obj/item/clothing/glasses/blindfold/apoc/click_alt(mob/user) + . = ..() + adjust_blindfold(user) -/obj/item/clothing/glasses/apoc/blindfold/attack_self(mob/user) +/obj/item/clothing/glasses/blindfold/apoc/attack_self(mob/user) wornunder = !wornunder alternate_worn_layer = wornunder ? GLASSES_LAYER : FACEMASK_LAYER to_chat(user, span_notice("You adjust the [src].")) - -/obj/item/clothing/glasses/apoc/blindfold/proc/on_examine(datum/source, mob/user, list/examine_list) +/obj/item/clothing/glasses/blindfold/apoc/proc/on_examine(datum/source, mob/user, list/examine_list) // TODO: Make this Context examine_list += span_notice("Alt-click to adjust the [name]. Use in hand to change layer.") - -/obj/item/clothing/glasses/apoc/blindfold/equipped(mob/living/carbon/human/user, slot) - . = ..() - if((slot == ITEM_SLOT_EYES && !trick) && adjusted_state == "both") - user.become_blind("blindfold") - - -/obj/item/clothing/glasses/apoc/blindfold/dropped(mob/living/carbon/human/user) - ..() - user.cure_blind("blindfold") - - -// /obj/item/clothing/glasses/apoc/blindfold/AltClick(mob/user) - // if(!ishuman(user)) - // return - // adjust_blindfold(user) - - -/obj/item/clothing/glasses/apoc/blindfold/proc/adjust_blindfold(mob/living/carbon/human/user) +/obj/item/clothing/glasses/blindfold/apoc/proc/adjust_blindfold(mob/living/carbon/human/user) // TODO: Make this remove flag GLASSESCOVERSEYES + var/mob/living/carbon/human/human_user = user switch(adjusted_state) if("both") adjusted_state = "left" name = "eyepatch" desc = "A fabric eyepatch over your left eye." oldname = "blindfold" - user.cure_blind("blindfold_[REF(src)]") + if(human_user.get_eye_scars() & RIGHT_EYE_SCAR) + tint = INFINITY + else + tint = NONE if("left") adjusted_state = "right" desc = "A fabric eyepatch over your right eye." + if(human_user.get_eye_scars() & LEFT_EYE_SCAR) + tint = INFINITY + else + tint = NONE if("right") adjusted_state = "head" name = "headband" desc = "A tied fabric headband." oldname = "eyepatch" + tint = NONE if("head") name = "blindfold" adjusted_state = "both" desc = initial(desc) oldname = "headband" - if((user.glasses == src && !trick) && adjusted_state == "both") - user.become_blind("blindfold_[REF(src)]") + tint = initial(tint) worn_icon_state = "[base_icon_state]_[adjusted_state]" to_chat(user, span_notice("You adjust the [oldname], wearing it as [name].")) + if(ismob(loc)) + human_user.update_worn_glasses() - user.update_worn_glasses() + human_user.update_tint() diff --git a/modular_zapoc/modules/loadout/code/categories/glasses.dm b/modular_zapoc/modules/loadout/code/categories/glasses.dm new file mode 100644 index 000000000000..bda67a5f06fe --- /dev/null +++ b/modular_zapoc/modules/loadout/code/categories/glasses.dm @@ -0,0 +1,19 @@ +/datum/loadout_item/glasses/eyepatch + name = "Eyepatch (Black)" + item_path = /obj/item/clothing/glasses/eyepatch + +/datum/loadout_item/glasses/eyepatch/medical + name = "Eyepatch (Medical)" + item_path = /obj/item/clothing/glasses/eyepatch/medical + +/datum/loadout_item/glasses/eyepatch/rose + name = "Eyepatch (Rose)" + item_path = /obj/item/clothing/glasses/eyepatch/rose + +/datum/loadout_item/glasses/blindfold + name = "Blindfold" + item_path = /obj/item/clothing/glasses/blindfold/apoc + +/datum/loadout_item/glasses/blindfold/trick + name = "Blindfold (Trick)" + item_path = /obj/item/clothing/glasses/blindfold/apoc/trick diff --git a/modular_zapoc/modules/loadout/code/categories/shoes.dm b/modular_zapoc/modules/loadout/code/categories/shoes.dm new file mode 100644 index 000000000000..0da85b8a46a1 --- /dev/null +++ b/modular_zapoc/modules/loadout/code/categories/shoes.dm @@ -0,0 +1,3 @@ +/datum/loadout_item/shoes/punk_boots + name = "Boots (Outdoor)" + item_path = /obj/item/clothing/shoes/vampire/jackboots/work/bimbs From 5b9057c8f07644f8cee328b0a78cc3438ae60f1e Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Mon, 17 Aug 2026 23:32:19 -0400 Subject: [PATCH 03/13] e --- .../modules/clothing/icons/eyepatches.dmi | Bin 909 -> 567 bytes .../clothing/icons/eyepatches_onfloor.dmi | Bin 964 -> 610 bytes .../modules/clothing/icons/eyepatches_worn.dmi | Bin 1009 -> 746 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modular_zapoc/modules/clothing/icons/eyepatches.dmi b/modular_zapoc/modules/clothing/icons/eyepatches.dmi index b3d6800975797d7f1dd7340ed53aeb7334719386..09f552ba8d75c74924f12d7536f59a1c890cd82c 100644 GIT binary patch delta 506 zcmVQvd)i008;<`M|)yqu6U;00001bW%=J z06^y0W&i*HiII0ne<>$3FC{HMC#5_ivm{lCi!&v&s2C_=$i}ATo=V`pa1{?DM>^@R7i>Klrc`jFcgOE zAr)htc4KP90V;BX)EkQzON^Zwivy&Fi3R(~7w8SZ>deOFe@LCise@|<29|uA_5S>R z?}Sv z&dUq#DD`cy8&Jw>r|?q{Qmy&}2WgcMK^KcPB6&Y*CK?Mu1ykgka*h2iK=1ADBNRM* zZA$O(2u6r-e-HTflUCk=!Fvs8q#(<}3pko-jmF?%+3kYZk9q*-zX&EK{u>v=X4YK$ zSKT`x;TaH**1PXO*y9lQ09Ti79N{%Ca2+TmjE49X4xzx*DiNrco!QHAqyyS#3EonX wgysq2J)V(rdu0th+2z9-74Wpd#2@(vT?hCQrEm~Syv$L~saB$Mn(suv=ivR#i002_}04@Lk z`T6<4z`(1=_5J_=00DGTPE!Ct=GbNc005tQR9JLGWpiVZZ9#vvGPNMFBsoKgi!&v& zs2C_@$i8jH58)r+G51+g9r^t4M(9o2CmCc7iY) z({Uh4L;^@(*O5Yy1eK>-1*$6VLwL*wCMD7>Rle1AU21;=&Fi`}gCbY}gH7CIy$R^@ zG*lpo?h^qHGs#u3D7@jPF3`L){yi>IsPiT#3Ow@@ejgWQz+KSC{OfYEyX$y0>5WqR zw|5E`1hQMbJ`qsG=fjoI^zk4N2m}Jb|BAlvpXDEh;WrwAqtwbf{t)9h4%4(KBtmEc zth36x016>Uz>;7?2@;#Ugb%K?B34n@n~$GZhg1bSRQX3+Q3G>l`E0KVoK zX0QNZR)ys=KbqK9mjqa0$~(ac0Mgre&mr=0fvMkYctLyKKKOK zhi6Uhxh~XzT)~2))l-dZi8fVe!|j|G7$&@s#_WF*B2ass!zS3-WhZk5ZgQr80bcGVA1N&>VnNV7w{vuI!xdc?i28! zO$1WX&u9YS5g%pQ;$s#L>?1zSp+$xntv-C_lYfA9r}a>UNB}oOq;O-4W1z+7ZPt@k kx%mIUtpZ~81p+~gZ;@sb19JcAN&o-=07*qoM6N<$g35}4JOBUy diff --git a/modular_zapoc/modules/clothing/icons/eyepatches_onfloor.dmi b/modular_zapoc/modules/clothing/icons/eyepatches_onfloor.dmi index e30dcf6c5766588ab5e173891a37490d07fb3311..835de28a21cddcc4133f578031d1dbcb84f6df48 100644 GIT binary patch literal 610 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 From f9d48868c06814272dd8f737d63a1cd098889b3b Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Tue, 18 Aug 2026 03:07:48 -0400 Subject: [PATCH 04/13] tsk --- modular_zapoc/modules/clothing/code/turtleskirt.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_zapoc/modules/clothing/code/turtleskirt.dm b/modular_zapoc/modules/clothing/code/turtleskirt.dm index 63b5a4f97391..7ca058995e2b 100644 --- a/modular_zapoc/modules/clothing/code/turtleskirt.dm +++ b/modular_zapoc/modules/clothing/code/turtleskirt.dm @@ -8,7 +8,7 @@ /obj/item/clothing/under/vampire/turtleneck_skirt/black name = "black turtleneck skirt" - desc = "By those in the know, it's called the Tactleneck, the premier clothing for secret agents.Features a fashionable pencil skirt." + desc = "By those in the know, it's called the Tactleneck, the premier clothing for secret agents. Features a fashionable pencil skirt." icon_state = "turtleneck_black" /obj/item/clothing/under/vampire/turtleneck_skirt/red @@ -23,5 +23,5 @@ /obj/item/clothing/under/vampire/turtleneck_skirt/endron name = EVIL_OIL_COMPANY + " turtleneck skirt" - desc = "An Endron International employee uniform. This one is a nice turtleneck! Features a fashionable pencil skirt." + desc = "An " + EVIL_OIL_COMPANY + " employee uniform. This one is a nice turtleneck! Features a fashionable pencil skirt." icon_state = "pentex_turtleneck" From 8381f458fffb4a28bf3bdc4152d42b087d60ccdf Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Tue, 18 Aug 2026 03:32:32 -0400 Subject: [PATCH 05/13] t --- .../modules/clothing/code/turtleskirt_loadout.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_zapoc/modules/clothing/code/turtleskirt_loadout.dm b/modular_zapoc/modules/clothing/code/turtleskirt_loadout.dm index 76c4b08a45c0..faa3c23b7c65 100644 --- a/modular_zapoc/modules/clothing/code/turtleskirt_loadout.dm +++ b/modular_zapoc/modules/clothing/code/turtleskirt_loadout.dm @@ -2,17 +2,17 @@ abstract_type = /datum/loadout_item/uniform/skirtleneck /datum/loadout_item/uniform/skirtleneck/black - name = "turtleneck skirt, black" + name = "Turtleneck (Skirt, Black)" item_path = /obj/item/clothing/under/vampire/turtleneck_skirt/black /datum/loadout_item/uniform/skirtleneck/navy - name = "turtleneck skirt, navy" + name = "Turtleneck (Skirt, Navy)" item_path = /obj/item/clothing/under/vampire/turtleneck_skirt/navy /datum/loadout_item/uniform/skirtleneck/red - name = "turtleneck skirt, red" + name = "Turtleneck (Skirt, Red)" item_path = /obj/item/clothing/under/vampire/turtleneck_skirt/red /datum/loadout_item/uniform/skirtleneck/white - name = "turtleneck skirt, white" + name = "turtleneck (Skirt, White)" item_path = /obj/item/clothing/under/vampire/turtleneck_skirt From 8a737cde7d71381a60170e079057e0aaa2a57ffb Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Tue, 18 Aug 2026 04:46:00 -0400 Subject: [PATCH 06/13] paynt and sage melee --- .../modules/weapons/code/bowie_knife.dm | 22 ++++++++++++++ modular_zapoc/modules/weapons/code/waraxe.dm | 28 ++++++++++++++++++ modular_zapoc/modules/weapons/icons/melee.dmi | Bin 0 -> 554 bytes .../weapons/icons/melee_inhand_left.dmi | Bin 0 -> 470 bytes .../weapons/icons/melee_inhand_right.dmi | Bin 0 -> 462 bytes .../modules/weapons/icons/melee_onfloor.dmi | Bin 0 -> 535 bytes .../modules/weapons/icons/melee_worn.dmi | Bin 0 -> 449 bytes tgstation.dme | 2 ++ 8 files changed, 52 insertions(+) create mode 100644 modular_zapoc/modules/weapons/code/bowie_knife.dm create mode 100644 modular_zapoc/modules/weapons/code/waraxe.dm create mode 100644 modular_zapoc/modules/weapons/icons/melee.dmi create mode 100644 modular_zapoc/modules/weapons/icons/melee_inhand_left.dmi create mode 100644 modular_zapoc/modules/weapons/icons/melee_inhand_right.dmi create mode 100644 modular_zapoc/modules/weapons/icons/melee_onfloor.dmi create mode 100644 modular_zapoc/modules/weapons/icons/melee_worn.dmi diff --git a/modular_zapoc/modules/weapons/code/bowie_knife.dm b/modular_zapoc/modules/weapons/code/bowie_knife.dm new file mode 100644 index 000000000000..c85f1e2a37c3 --- /dev/null +++ b/modular_zapoc/modules/weapons/code/bowie_knife.dm @@ -0,0 +1,22 @@ +/obj/item/knife/vamp/bowie + name = "bowie knife" + desc = "Now this... is a knife." + icon = 'modular_zapoc/modules/weapons/icons/melee.dmi' + lefthand_file = 'modular_zapoc/modules/weapons/icons/melee_inhand_left.dmi' + righthand_file = 'modular_zapoc/modules/weapons/icons/melee_inhand_right.dmi' + worn_icon = 'modular_darkpack/modules/weapons/icons/worn_melee.dmi' + ONFLOOR_ICON_HELPER('modular_zapoc/modules/weapons/icons/melee_onfloor.dmi') + icon_state = "bowie" + inhand_icon_state = "bowie" + slot_flags = ITEM_SLOT_MASK + custom_price = 125 + icon_angle = 210 + +/obj/item/knife/vamp/bowie/silver + name = "silver bowie knife" + desc = "If it can take down an alligator... it can take down a dog." + custom_price = 4000 + +/obj/item/knife/vamp/bowie/silver/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers) + . = ..() + fera_silver_damage(target, 1) diff --git a/modular_zapoc/modules/weapons/code/waraxe.dm b/modular_zapoc/modules/weapons/code/waraxe.dm new file mode 100644 index 000000000000..b06904606edf --- /dev/null +++ b/modular_zapoc/modules/weapons/code/waraxe.dm @@ -0,0 +1,28 @@ +/obj/item/melee/vamp/handsickle/waraxe + name = "war axe" + desc = "Deceptively light. Only eight pounds. (That's 4 kilos for the rest of you.)" + icon = 'modular_zapoc/modules/weapons/icons/melee.dmi' + icon_state = "waraxe" + lefthand_file = 'modular_zapoc/modules/weapons/icons/melee_inhand_left.dmi' + righthand_file = 'modular_zapoc/modules/weapons/icons/melee_inhand_right.dmi' + worn_icon = 'modular_darkpack/modules/weapons/icons/worn_melee.dmi' + ONFLOOR_ICON_HELPER('modular_zapoc/modules/weapons/icons/melee_onfloor.dmi') + attack_difficulty = 5 // Easier to use than a sickle, harder than a knife + icon_angle = -45 + custom_price = 850 + +/obj/item/melee/vamp/handsickle/waraxe/Initialize(mapload) + . = ..() + AddComponent(/datum/component/butchering, \ + speed = 8 SECONDS, \ + effectiveness = 100, \ + ) + +/obj/item/melee/vamp/handsickle/waraxe/silver + name = "silver axe" + desc = "Get some!" + custom_price = 5000 + +/obj/item/melee/vamp/handsickle/waraxe/silver/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers) + . = ..() + fera_silver_damage(target, 2) diff --git a/modular_zapoc/modules/weapons/icons/melee.dmi b/modular_zapoc/modules/weapons/icons/melee.dmi new file mode 100644 index 0000000000000000000000000000000000000000..42915e4c2a8977c0ddb78386e40e78ae100fa343 GIT binary patch literal 554 zcmV+_0@eMAP)FdJ6z*$yPmXwmUy1JH+jxsJabp{ZcJs>dwBxYS{MKL=#FFj0AOc(+JPlUO|00001 zbW%=J06^y0W&i*Ha(Yx)bVOxyV{&P5bZKvH004NLQ&wIK@n{85nm0snCEA_b65fEE|-Jhdj6dOujIV=ABGIP zr@s|=ndfC$z8_7wpVxO%)>RE#h6w|7_s4IkpDP^UWdJ|+Enrs~Vs6KjZLmMWX28F^ s3Umbz1VN99dOxA=@^;AFh5l!K0g-?TM5(&5LjV8(07*qoM6N<$f~HvO{r~^~ literal 0 HcmV?d00001 diff --git a/modular_zapoc/modules/weapons/icons/melee_inhand_left.dmi b/modular_zapoc/modules/weapons/icons/melee_inhand_left.dmi new file mode 100644 index 0000000000000000000000000000000000000000..758dacb78430710fbecea54e1576c5ebad6a4c00 GIT binary patch literal 470 zcmV;{0V)28P)FdJ6z?P4WI4?aI0s@wllC`?JSyoe;Js@=k5HSHHz`(#&JSQXo0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJj1^GgXO;GbOXA7^I1dGp#5wHxd1@9yQGp{kJDLR|xq_Lc{}HY~6rfT)h0(q55y&5T0y}LQX?0))j{pDw M07*qoM6N<$f=`*i+5i9m literal 0 HcmV?d00001 diff --git a/modular_zapoc/modules/weapons/icons/melee_inhand_right.dmi b/modular_zapoc/modules/weapons/icons/melee_inhand_right.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4adfb78fb6f992a551120cd7cdbb6462047bb774 GIT binary patch literal 462 zcmV;<0WtoGP)FdJ6z?P4WI4?aI0s@wllA1jrSyofEy1I1+5HSHHz`(%BgqbV=0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJj1^GgXO;GbOXA7^I1dGp#5wHxViwJXaIH{f$)%F3`LP(Qoyc32`h6HjDk@x z3I+tEvEi2&K;yHwW#ZSMh{mt#n2D)q0d5WKRcsUR+rWg%zOy#cqYM!_f;1*3p|fGr^b&SXo#tqu+<(%=O)XIeX9_3SG;5gKN65!O(? z0IANI#zk1eDr9#P2f^@*0ZuGYCT=Yuzd8eBAf@JQ#pkLF2+qMqIz7REuwmyNv?<~*8o zWKxJiu%_mI8{^QsKY8S%?RCbtb;H9|r-ZwOv_W1{&CODjS z=uex+KD$5UN9Frl2ROVL7aU;t=xN&jLWkkgjb*;sl8F*3VRu7LaU3$JjH;HCW;klI z!iHffQ_&{oi;)Q%m;<;NSeY~oJUls_m&rPCG}y$xn8D=3sKj$m<%P5vBLmal-_I|s tFY58By|Q5nmr(vl#*FiQ^3H$wYs{%z`&fBl9DGI1COCR00001 zbW%=J06^y0W&i*Ha(Yx)bVOxyV{&P5bZKvH004NLQ&wz^FV zpML+j`BKVFrWQz%sRfJd`=#>%0KgT*j-9*b>{HLuI<$aN@COCbQ!ucj*Lv6wAGLND r>{9H9i}bJQ(+kc9``M9v0QjOi_!I-Zzp>VF00000NkvXXu0mjfP?gI* literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index d816d166eefa..4b7992154569 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8317,4 +8317,6 @@ #include "modular_zapoc\modules\mapping\code\transfer_zones.dm" #include "modular_zapoc\modules\mobs\code\cockroach.dm" #include "modular_zapoc\modules\smites\code\crystal.dm" +#include "modular_zapoc\modules\weapons\code\bowie_knife.dm" +#include "modular_zapoc\modules\weapons\code\waraxe.dm" // END_INCLUDE From c65da0a8c078ebbc83201f2ba05aaa97e9d7c9d0 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Tue, 18 Aug 2026 04:49:07 -0400 Subject: [PATCH 07/13] stores --- modular_darkpack/modules/retail/code/stores/camping_store.dm | 1 + modular_darkpack/modules/retail/code/stores/gun_store.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/modular_darkpack/modules/retail/code/stores/camping_store.dm b/modular_darkpack/modules/retail/code/stores/camping_store.dm index 165c7eff855e..c79f30beead6 100644 --- a/modular_darkpack/modules/retail/code/stores/camping_store.dm +++ b/modular_darkpack/modules/retail/code/stores/camping_store.dm @@ -14,6 +14,7 @@ new /datum/data/vending_product("9mm ammo box", /obj/item/ammo_box/darkpack/c9mm), new /datum/data/vending_product("12ga shotgun shells, buckshot",/obj/item/ammo_box/darkpack/c12g/buck), new /datum/data/vending_product("machete", /obj/item/claymore/machete), + new /datum/data/vending_product("hunting knife", /obj/item/knife/vamp/bowie), new /datum/data/vending_product("hunting shotgun", /obj/item/gun/ballistic/shotgun/vampire), new /datum/data/vending_product("Elite 92G", /obj/item/gun/ballistic/automatic/pistol/darkpack/beretta), new /datum/data/vending_product("rescue fireaxe", /obj/item/fireaxe/vamp), diff --git a/modular_darkpack/modules/retail/code/stores/gun_store.dm b/modular_darkpack/modules/retail/code/stores/gun_store.dm index ed069c2c8443..4c03989ffaf3 100644 --- a/modular_darkpack/modules/retail/code/stores/gun_store.dm +++ b/modular_darkpack/modules/retail/code/stores/gun_store.dm @@ -22,6 +22,7 @@ new /datum/data/vending_product("knife", /obj/item/knife/vamp, 100), new /datum/data/vending_product("baseball bat", /obj/item/melee/baseball_bat/vamp, 200), new /datum/data/vending_product("real katana", /obj/item/katana/vamp, 1500), + new /datum/data/vending_product("war axe", /obj/item/melee/vamp/handsickle/waraxe, 1500), // APOC EDIT ADD - MELEE new /datum/data/vending_product("machete", /obj/item/claymore/machete, 500), new /datum/data/vending_product("taser", /obj/item/melee/baton/security/handtaser, 250), new /datum/data/vending_product("pepperspray", /obj/item/reagent_containers/spray/pepper, 200), From 265e60487879a40ab1bc56fd73d92d410d486be2 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Tue, 18 Aug 2026 04:51:26 -0400 Subject: [PATCH 08/13] balance --- modular_zapoc/modules/weapons/code/bowie_knife.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modular_zapoc/modules/weapons/code/bowie_knife.dm b/modular_zapoc/modules/weapons/code/bowie_knife.dm index c85f1e2a37c3..3278f73a4000 100644 --- a/modular_zapoc/modules/weapons/code/bowie_knife.dm +++ b/modular_zapoc/modules/weapons/code/bowie_knife.dm @@ -9,8 +9,10 @@ icon_state = "bowie" inhand_icon_state = "bowie" slot_flags = ITEM_SLOT_MASK - custom_price = 125 + force = 3 TTRPG_DAMAGE // stronger than knife + custom_price = 200 icon_angle = 210 + attack_difficulty = 5 // harder to use than a normal knife /obj/item/knife/vamp/bowie/silver name = "silver bowie knife" From 444931b6cab982d151cf8aa2ec259d36b2bd3f5b Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Tue, 18 Aug 2026 04:58:45 -0400 Subject: [PATCH 09/13] yeah ok --- _maps/map_files/Vampire/special_fran/special_francisco.dmm | 2 +- modular_darkpack/modules/retail/code/stores/gun_store.dm | 1 + modular_zapoc/modules/weapons/code/waraxe.dm | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index 0b4070679051..40c84302e377 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -11251,7 +11251,7 @@ /area/vtm/outside/unionsquare) "gCx" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/glasses/apoc/blindfold{ +/obj/item/clothing/glasses/blindfold/apoc{ color = "CC0000" }, /obj/effect/spawner/random/bedsheet/double, diff --git a/modular_darkpack/modules/retail/code/stores/gun_store.dm b/modular_darkpack/modules/retail/code/stores/gun_store.dm index 4c03989ffaf3..1608c053d555 100644 --- a/modular_darkpack/modules/retail/code/stores/gun_store.dm +++ b/modular_darkpack/modules/retail/code/stores/gun_store.dm @@ -20,6 +20,7 @@ new /datum/data/vending_product("9mm pistol magazine, 18 rounds", /obj/item/ammo_box/magazine/semi9mm, 100), new /datum/data/vending_product("Colt M1911 magazine", /obj/item/ammo_box/magazine/darkpack45acp, 50), new /datum/data/vending_product("knife", /obj/item/knife/vamp, 100), + new /datum/data/vending_product("hunting knife", /obj/item/knife/vamp/bowie, 200), // APOC EDIT ADD - MELEE new /datum/data/vending_product("baseball bat", /obj/item/melee/baseball_bat/vamp, 200), new /datum/data/vending_product("real katana", /obj/item/katana/vamp, 1500), new /datum/data/vending_product("war axe", /obj/item/melee/vamp/handsickle/waraxe, 1500), // APOC EDIT ADD - MELEE diff --git a/modular_zapoc/modules/weapons/code/waraxe.dm b/modular_zapoc/modules/weapons/code/waraxe.dm index b06904606edf..0c9da70c9a71 100644 --- a/modular_zapoc/modules/weapons/code/waraxe.dm +++ b/modular_zapoc/modules/weapons/code/waraxe.dm @@ -9,6 +9,7 @@ ONFLOOR_ICON_HELPER('modular_zapoc/modules/weapons/icons/melee_onfloor.dmi') attack_difficulty = 5 // Easier to use than a sickle, harder than a knife icon_angle = -45 + demolition_mod = 1.25 custom_price = 850 /obj/item/melee/vamp/handsickle/waraxe/Initialize(mapload) From 2e12c2f571f025f927bac1976e3ce5caa77bd9c7 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Thu, 20 Aug 2026 22:32:39 -0400 Subject: [PATCH 10/13] oh shit --- modular_zapoc/modules/loadout/code/categories/shoes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_zapoc/modules/loadout/code/categories/shoes.dm b/modular_zapoc/modules/loadout/code/categories/shoes.dm index 0da85b8a46a1..3b680f2ff394 100644 --- a/modular_zapoc/modules/loadout/code/categories/shoes.dm +++ b/modular_zapoc/modules/loadout/code/categories/shoes.dm @@ -1,3 +1,3 @@ -/datum/loadout_item/shoes/punk_boots +/datum/loadout_item/shoes/bimbs name = "Boots (Outdoor)" item_path = /obj/item/clothing/shoes/vampire/jackboots/work/bimbs From 9295e362de744fa855e78257a54cbb4512929663 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Fri, 21 Aug 2026 01:56:24 -0400 Subject: [PATCH 11/13] oh --- tgstation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index 4b7992154569..fe8cc098f0ed 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8311,6 +8311,8 @@ #include "modular_zapoc\modules\jobs\code\voivode.dm" #include "modular_zapoc\modules\jobs\code\ocean76\handler.dm" #include "modular_zapoc\modules\jobs\code\ocean76\operator.dm" +#include "modular_zapoc\modules\loadout\code\categories\glasses.dm" +#include "modular_zapoc\modules\loadout\code\categories\shoes.dm" #include "modular_zapoc\modules\mapping\code\corpses.dm" #include "modular_zapoc\modules\mapping\code\mapping_helper.dm" #include "modular_zapoc\modules\mapping\code\modular_rooms.dm" From 6bd8eb29f82eaaaf4f00777b92b84f4ba09e7d64 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Sat, 22 Aug 2026 09:57:34 -0400 Subject: [PATCH 12/13] fix the icon whoops --- modular_zapoc/modules/weapons/code/bowie_knife.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_zapoc/modules/weapons/code/bowie_knife.dm b/modular_zapoc/modules/weapons/code/bowie_knife.dm index 3278f73a4000..abbffa7c69f6 100644 --- a/modular_zapoc/modules/weapons/code/bowie_knife.dm +++ b/modular_zapoc/modules/weapons/code/bowie_knife.dm @@ -4,7 +4,7 @@ icon = 'modular_zapoc/modules/weapons/icons/melee.dmi' lefthand_file = 'modular_zapoc/modules/weapons/icons/melee_inhand_left.dmi' righthand_file = 'modular_zapoc/modules/weapons/icons/melee_inhand_right.dmi' - worn_icon = 'modular_darkpack/modules/weapons/icons/worn_melee.dmi' + worn_icon = 'modular_zapoc/modules/weapons/icons/melee_worn.dmi' ONFLOOR_ICON_HELPER('modular_zapoc/modules/weapons/icons/melee_onfloor.dmi') icon_state = "bowie" inhand_icon_state = "bowie" From b76464cb60e1842f15e7e403da27effce4bea031 Mon Sep 17 00:00:00 2001 From: dwinters99 <65516417+dwinters99@users.noreply.github.com> Date: Fri, 28 Aug 2026 15:09:58 -0400 Subject: [PATCH 13/13] that's my jarona --- modular_zapoc/modules/weapons/code/bowie_knife.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_zapoc/modules/weapons/code/bowie_knife.dm b/modular_zapoc/modules/weapons/code/bowie_knife.dm index abbffa7c69f6..0500ac1b97b1 100644 --- a/modular_zapoc/modules/weapons/code/bowie_knife.dm +++ b/modular_zapoc/modules/weapons/code/bowie_knife.dm @@ -8,6 +8,7 @@ ONFLOOR_ICON_HELPER('modular_zapoc/modules/weapons/icons/melee_onfloor.dmi') icon_state = "bowie" inhand_icon_state = "bowie" + worn_icon_state = null slot_flags = ITEM_SLOT_MASK force = 3 TTRPG_DAMAGE // stronger than knife custom_price = 200