diff --git a/_maps/map_files/Vampire/generic/forest.dmm b/_maps/map_files/Vampire/generic/forest.dmm index fd9168ac5e36..4cb1fb154c3d 100644 --- a/_maps/map_files/Vampire/generic/forest.dmm +++ b/_maps/map_files/Vampire/generic/forest.dmm @@ -7391,7 +7391,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/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index 4a0da94b461e..134637bd843f 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -11310,7 +11310,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/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 6fd4d470745b..57359c608d21 100644 --- a/modular_darkpack/modules/retail/code/stores/gun_store.dm +++ b/modular_darkpack/modules/retail/code/stores/gun_store.dm @@ -20,8 +20,10 @@ 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 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), 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/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/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" 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 diff --git a/modular_zapoc/modules/clothing/icons/eyepatches.dmi b/modular_zapoc/modules/clothing/icons/eyepatches.dmi index b3d680097579..09f552ba8d75 100644 Binary files a/modular_zapoc/modules/clothing/icons/eyepatches.dmi and b/modular_zapoc/modules/clothing/icons/eyepatches.dmi differ diff --git a/modular_zapoc/modules/clothing/icons/eyepatches_onfloor.dmi b/modular_zapoc/modules/clothing/icons/eyepatches_onfloor.dmi index e30dcf6c5766..835de28a21cd 100644 Binary files a/modular_zapoc/modules/clothing/icons/eyepatches_onfloor.dmi and b/modular_zapoc/modules/clothing/icons/eyepatches_onfloor.dmi differ diff --git a/modular_zapoc/modules/clothing/icons/eyepatches_worn.dmi b/modular_zapoc/modules/clothing/icons/eyepatches_worn.dmi index 284844e97973..324d6745f7dc 100644 Binary files a/modular_zapoc/modules/clothing/icons/eyepatches_worn.dmi and b/modular_zapoc/modules/clothing/icons/eyepatches_worn.dmi differ diff --git a/modular_zapoc/modules/clothing/icons/outdoorboots.dmi b/modular_zapoc/modules/clothing/icons/outdoorboots.dmi index cfa5c99b1479..39496ceffc72 100644 Binary files a/modular_zapoc/modules/clothing/icons/outdoorboots.dmi and b/modular_zapoc/modules/clothing/icons/outdoorboots.dmi differ diff --git a/modular_zapoc/modules/clothing/icons/outdoorboots_onfloor.dmi b/modular_zapoc/modules/clothing/icons/outdoorboots_onfloor.dmi index d63b0bf4cd52..929738f5627b 100644 Binary files a/modular_zapoc/modules/clothing/icons/outdoorboots_onfloor.dmi and b/modular_zapoc/modules/clothing/icons/outdoorboots_onfloor.dmi differ diff --git a/modular_zapoc/modules/clothing/icons/outdoorboots_worn.dmi b/modular_zapoc/modules/clothing/icons/outdoorboots_worn.dmi index f49a813881c1..175a5c6bb114 100644 Binary files a/modular_zapoc/modules/clothing/icons/outdoorboots_worn.dmi and b/modular_zapoc/modules/clothing/icons/outdoorboots_worn.dmi differ 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..3b680f2ff394 --- /dev/null +++ b/modular_zapoc/modules/loadout/code/categories/shoes.dm @@ -0,0 +1,3 @@ +/datum/loadout_item/shoes/bimbs + name = "Boots (Outdoor)" + item_path = /obj/item/clothing/shoes/vampire/jackboots/work/bimbs 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..0500ac1b97b1 --- /dev/null +++ b/modular_zapoc/modules/weapons/code/bowie_knife.dm @@ -0,0 +1,25 @@ +/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_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" + worn_icon_state = null + slot_flags = ITEM_SLOT_MASK + 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" + 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..0c9da70c9a71 --- /dev/null +++ b/modular_zapoc/modules/weapons/code/waraxe.dm @@ -0,0 +1,29 @@ +/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 + demolition_mod = 1.25 + 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 000000000000..42915e4c2a89 Binary files /dev/null and b/modular_zapoc/modules/weapons/icons/melee.dmi differ 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 000000000000..758dacb78430 Binary files /dev/null and b/modular_zapoc/modules/weapons/icons/melee_inhand_left.dmi differ 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 000000000000..4adfb78fb6f9 Binary files /dev/null and b/modular_zapoc/modules/weapons/icons/melee_inhand_right.dmi differ diff --git a/modular_zapoc/modules/weapons/icons/melee_onfloor.dmi b/modular_zapoc/modules/weapons/icons/melee_onfloor.dmi new file mode 100644 index 000000000000..05f2d573a1eb Binary files /dev/null and b/modular_zapoc/modules/weapons/icons/melee_onfloor.dmi differ diff --git a/modular_zapoc/modules/weapons/icons/melee_worn.dmi b/modular_zapoc/modules/weapons/icons/melee_worn.dmi new file mode 100644 index 000000000000..7d71957338be Binary files /dev/null and b/modular_zapoc/modules/weapons/icons/melee_worn.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 4b1072f5948f..9c90b7bb22da 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8353,10 +8353,14 @@ #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" #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