Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weapons #4

Merged
merged 3 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions modular/stonekeep/code/crafting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,20 @@
name = "stone table (single)"
result = /obj/structure/table/stone_small


/*--------------\
| Anvil Recipes |
\--------------*/
/datum/anvil_recipe/weapons/iron/lucerne
name = "Poleaxe (+Bar, +Small Log)"
recipe_name = "a Poleaxe"

/datum/anvil_recipe/weapons/iron/spear_iron
name = "Spear (+Small Log)"
recipe_name = "a Spear"
createmultiple = FALSE

/datum/anvil_recipe/weapons/steel/peasant_flail
name = "Crusher (+Chain, +Small Log)"
recipe_name = "a two-handed flail"

9 changes: 9 additions & 0 deletions modular/stonekeep/code/structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@
| Tables |
\-------*/

/obj/structure/table/wood/plain
icon = 'modular/stonekeep/icons/tables.dmi'

/obj/structure/table/wood/plain_alt
icon = 'modular/stonekeep/icons/tables.dmi'

/obj/structure/table/wood/reinforced_alt
icon = 'modular/stonekeep/icons/tables.dmi'

/obj/structure/table/vtable // modify with varedit for map1 big one
icon = 'modular/stonekeep/icons/tables.dmi'

Expand Down
71 changes: 71 additions & 0 deletions modular/stonekeep/code/weapons.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/* * * * * **
* *
* Weapons *
* *
* * * * * **/

// =================================================================================
// -------------- POLEARMS -----------------
/obj/item/rogueweapon/polearm
icon = 'modular/stonekeep/icons/weapons_64.dmi'
slot_flags = null

/obj/item/rogueweapon/polearm/eaglebeak
slot_flags = null

/obj/item/rogueweapon/polearm/eaglebeak/lucerne
name = "poleaxe"
desc = "A poleaxe of simple iron, fracture bone and dissent with simple brute force."
icon_state = "poleaxe"

/obj/item/rogueweapon/polearm/halberd/bardiche/warcutter
name = "war axe"
desc = "Favored by common folk looking to cut a noble whoreson down to size."

/obj/item/rogueweapon/mace/goden
icon = 'modular/stonekeep/icons/weapons_64.dmi'

/obj/item/rogueweapon/polearm/woodstaff/aries/noc // for noc priest
name = "staff of lunar epiphany"
icon_state = "naledistaff"

/obj/item/rogueweapon/polearm/spear/bonespear
icon_state = "bonespear"

/obj/item/rogueweapon/flail/peasant
name = "crusher"
desc = "To break, smash and chastise thy foes."
icon = 'modular/stonekeep/icons/weapons_64.dmi'
icon_state = "crusher"


//................ Onehanders ............... //
/obj/item/rogueweapon/mace/goden/shillelagh
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/mace/steel
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/knife/hunting
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/mace/cudgel
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/knife/cleaver
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/knife/villager
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/pick/paxe
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/hammer/sledgehammer
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/mace/copperbludgeon
icon = 'modular/stonekeep/icons/weapons_32.dmi'

/obj/item/rogueweapon/flail/sflail
icon = 'modular/stonekeep/icons/weapons_32.dmi'
Binary file modified modular/stonekeep/icons/tables.dmi
Binary file not shown.
Binary file added modular/stonekeep/icons/weapons.dmi
Binary file not shown.
Binary file added modular/stonekeep/icons/weapons_64.dmi
Binary file not shown.
Loading