Skip to content

Commit

Permalink
new weapons!
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Apr 15, 2024
1 parent f8a9ff4 commit 9ecd1ea
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 13 deletions.
17 changes: 13 additions & 4 deletions code/game/objects/items/melee/fireaxe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,22 @@
W.obj_destruction("axe")

/obj/item/melee/axe/fire // DEM AXES MAN, marker -Agouri
icon_state = "fireaxe0"
base_icon_state = "fireaxe"
name = "fire axe"
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
icon_state = "fireaxe0"
base_icon_state = "fireaxe"

/obj/item/melee/axe/bone // Blatant imitation of the fireaxe, but made out of bone.
icon_state = "bone_axe0"
base_icon_state = "bone_axe"
name = "bone axe"
desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
icon_state = "bone_axe0"
base_icon_state = "bone_axe"

/obj/item/melee/axe/scrap
name = "scrap axe"
desc = "Oversided and with a pretty dull blade, its decent against armour"
armour_penetration = 10

/obj/item/melee/axe/scrap/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=22, icon_wielded="[base_icon_state]1")
5 changes: 5 additions & 0 deletions code/game/objects/items/melee/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
icon = 'icons/obj/weapon/misc.dmi'
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
var/projectile_block_chance = 0
/obj/item/melee/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == PROJECTILE_ATTACK)
final_block_chance = projectile_block_chance //Don't bring a sword to a gunfight
return ..()

/obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user)
if(target.check_block())
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/melee/spear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
//this should be a plasma spear or worse.
force = 11
throwforce = 19
throwforce = 21

/obj/item/spear/bonespear/ComponentInitialize()
. = ..()
Expand Down
35 changes: 27 additions & 8 deletions code/game/objects/items/melee/sword.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,35 @@
AddComponent(/datum/component/butchering, 40, 105)

/obj/item/melee/sword/bone
name = "Bone Sword"
name = "bone sword"
desc = "Jagged pieces of bone are tied to what looks like a goliaths femur."
icon_state = "bone_sword"
item_state = "bone_sword"
force = 15
throwforce = 10
armour_penetration = 15

/obj/item/melee/sword/scrap
name = "scrap sword"
desc = "A jagged and painful weapon only effective on targets without an armour
icon_state = "scrap_sword"
force = 24
throwforce = 10
armour_penetration = -35
max_integrity = 100

/obj/item/melee/sword/mass
name = "mass produced machete"
desc = "A middle ground between a machete and a short sword. A simple construction of stamped steel but its so cheap its hard to complain. Its right between being a one hand and two handed weapon"
force = 20
throwforce = 15
max_integrity = 50

/obj/item/melee/sword/mass/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22, icon_wielded="[base_icon_state]1")


/obj/item/melee/sword/katana
name = "katana"
desc = "Woefully underpowered in D20."
Expand All @@ -51,10 +72,13 @@
max_integrity = 200

/obj/item/melee/sword/chainsaw
icon_state = "chainswordon"
item_state = "chainswordon"
name = "sacred chainsaw sword"
desc = "Suffer not a heretic to live."
icon_state = "chainswordon"
item_state = "chainswordon"
force = 15
throwforce = 10
armour_penetration = 25
slot_flags = ITEM_SLOT_BELT
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = 'sound/weapons/chainsawhit.ogg'
Expand All @@ -79,11 +103,6 @@
. = ..()
AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.

/obj/item/melee/sword/sabre/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == PROJECTILE_ATTACK)
final_block_chance = 0 //Don't bring a sword to a gunfight
return ..()

/obj/item/melee/sword/sabre/on_enter_storage(datum/component/storage/concrete/S)
var/obj/item/storage/belt/sabre/B = S.real_location()
if(istype(B))
Expand Down
12 changes: 12 additions & 0 deletions code/modules/cargo/packs/sec_supply.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@
/obj/item/kitchen/knife/combat/survival)
crate_name = "combat knife crate"

/datum/supply_pack/sec_supply/machete
name = "Stampted Steel Machete Crate"
desc = "Contains five mass produced machetes. A perfect choice for crews on a budget."
cost = 500
contains = list(/obj/item/melee/sword/mass,
/obj/item/melee/sword/mass,
/obj/item/melee/sword/mass,
/obj/item/melee/sword/mass,
/obj/item/melee/sword/mass)
crate_name = "combat knife crate"


/datum/supply_pack/sec_supply/fire
name = "Incendiary Weapons Crate"
desc = "Burn, baby burn. Contains three incendiary grenades and three prebuilt flamethrowers."
Expand Down

0 comments on commit 9ecd1ea

Please sign in to comment.