Skip to content

Commit

Permalink
Adds the XM6N Null Knife (#564)
Browse files Browse the repository at this point in the history
* Inital working commit

* Move fluff to examine_more
  • Loading branch information
nickup9 authored Aug 31, 2024
1 parent 9b7df60 commit 6ea8ac1
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 0 deletions.
1 change: 1 addition & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6187,6 +6187,7 @@
#include "maplestation_modules\code\game\objects\structures\crate_lockers\closets\secure\medical.dm"
#include "maplestation_modules\code\game\objects\structures\crate_lockers\closets\secure\noble_ambassador.dm"
#include "maplestation_modules\code\game\objects\structures\crate_lockers\closets\secure\quartermaster.dm"
#include "maplestation_modules\code\game\objects\structures\crate_lockers\closets\secure\security.dm"
#include "maplestation_modules\code\modules\admin\admin_vv.dm"
#include "maplestation_modules\code\modules\admin\smites\pain_smite.dm"
#include "maplestation_modules\code\modules\admin\smites\tabletide.dm"
Expand Down
23 changes: 23 additions & 0 deletions maplestation_modules/code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,26 @@
if(mapload && !paperweight_spawned && istype(get_area(src), /area/station/medical/psychology))
new /obj/item/melee/psych_rock(loc)
paperweight_spawned = TRUE

/obj/item/knife/combat/nullknife
name = "\improper XM6N Null Knife"
icon = 'maplestation_modules/icons/obj/weapons.dmi'
icon_state = "null_knife"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
inhand_icon_state = "knife"
worn_icon_state = "knife"
desc = "An experimental anti-magic knife."
force = 17
throwforce = 10
embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
custom_materials = null

/obj/item/knife/combat/nullknife/Initialize(mapload)
AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
AddElement(/datum/element/bane, target_type = /mob/living/basic/revenant, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE)
return ..()

/obj/item/knife/combat/nullknife/examine_more(mob/user)
. = ..()
. += span_notice("<i>While the weapon passed the field-testing phase with the TGMC, TerraGov declined to continue mass-production due to a lack of practical applications at the time. However, paramilitaries foreign to the Mu sector (especially those that don't use magic) will sometimes procure and issue their own knives to deal with the increased usage of magic in the area.</i>")
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// --Additional HoS Stuff --
/obj/structure/closet/secure_closet/hos/PopulateContents()
. = ..()
new /obj/item/knife/combat/nullknife(src)
Binary file modified maplestation_modules/icons/obj/weapons.dmi
Binary file not shown.

0 comments on commit 6ea8ac1

Please sign in to comment.