Skip to content

Commit

Permalink
Adds most of the content
Browse files Browse the repository at this point in the history
  • Loading branch information
Wollywoger committed Mar 31, 2024
1 parent bd25238 commit 73a6f7f
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 9 deletions.
16 changes: 12 additions & 4 deletions maplestation_modules/code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
righthand_file = 'maplestation_modules/icons/mob/inhands/clothes/belts_righthand.dmi'
worn_icon = 'maplestation_modules/icons/mob/clothing/belt.dmi'
name = "Sheathe Basetype Item"
desc = "Whoa there buddy! You've got the Sheathe Basetype, if you're looking for the captain's sheathe, try /obj/item/storage/belt/sabre !" // this will be changed when i bother to post this refactor to tg
desc = "Whoa there buddy! You've got the Sheathe Basetype, if you're looking for the captain's sheathe, try /obj/item/storage/belt/sabre !" // this will be changed if i bother to post this refactor to tg
var/altclick_tip = "Altclick to draw the ITEM"
icon_state = "baseball_pack"
inhand_icon_state = "baseball_pack"
Expand All @@ -21,7 +21,7 @@
atom_storage.max_slots = 1
atom_storage.max_specific_storage = max_weight_class
atom_storage.set_holdable(storable_items)

/obj/item/storage/belt/sheathe/examine(mob/user)
. = ..()
if(length(contents))
Expand All @@ -44,7 +44,7 @@
worn_icon_state = initial(worn_icon_state)
return ..()

/obj/item/storage/belt/sheathe/maugrimsheathe
/obj/item/storage/belt/sheathe/maugrim
icon = 'maplestation_modules/icons/obj/clothing/belts.dmi'
lefthand_file = 'maplestation_modules/icons/mob/inhands/clothes/belts_lefthand.dmi'
righthand_file = 'maplestation_modules/icons/mob/inhands/clothes/belts_righthand.dmi'
Expand All @@ -60,13 +60,21 @@
storable_items = list(/obj/item/melee/sabre/maugrim)
max_weight_class = WEIGHT_CLASS_HUGE

/obj/item/storage/belt/sheathe/maugrimsheathe/update_icon_state()
/obj/item/storage/belt/sheathe/maugrim/update_icon_state()
. = ..()
if(length(contents))
icon_state += "-sword"
inhand_icon_state += "-sword"
worn_icon_state += "-sword"

/obj/item/storage/belt/sheathe/maugrim/razorwing
name = "Razorwing's Sheathe"
desc = "The a simple weaved sheathe used for containing a sword."
icon_state = "razorwing_sheathe"
inhand_icon_state = "razorwing_sheathe"
worn_icon_state = "razorwing_sheathe"
storable_items = list(/obj/item/melee/sabre/maugrim/razorwing)

// baseball bat sheathe
/obj/item/storage/belt/sheathe/baseball
icon = 'maplestation_modules/icons/obj/clothing/belts.dmi'
Expand Down
20 changes: 17 additions & 3 deletions maplestation_modules/code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,29 @@
/obj/item/melee/sabre/maugrim
name = "Maugrim"
desc = "Hilda Brandt's longsword. It was christened after slaying a space-werewolf of the same name." // todo
force = 20
block_chance = 33
armour_penetration = 10
force = 18 // identical the the chappie claymore rod, but without anti-magic
block_chance = 30
icon_state = "maugrim"
icon = 'maplestation_modules/icons/obj/weapons.dmi'
inhand_icon_state = "maugrim"
lefthand_file = 'maplestation_modules/icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'maplestation_modules/icons/mob/inhands/weapons/swords_righthand.dmi'

/obj/item/melee/sabre/maugrim/razorwing
name = "Razorwing"
desc = "Cyril Pembrooke's Jikdo. Unlike the on-station katanas, this single-edged blade is meant to be straight." // lampshade on how all katanas have been straight-edge, when they're meant to be curved.
icon_state = "razorwing"
inhand_icon_state = "razorwing"
attack_verb_continuous = list("cuts", "slashes", "slices")
attack_verb_simple = list("cut", "slash", "slice")

/obj/item/melee/sabre/maugrim/razorwing/Initialize(mapload) // you don't need to ask me to add world building only a few people will ever see.

Check failure on line 153 in maplestation_modules/code/game/objects/items/weaponry.dm

View workflow job for this annotation

GitHub Actions / Run Linters

proc never calls parent, required by /atom/proc/Initialize
AddElement(/datum/element/unique_examine, \
"The tassel is made out of a shed ornithid primary feather. \
Judging by the color, it would be a feather from its owner. \
Given the importance of these feathers to the flight, its quite common to hold on to these such feathers. ", \
EXAMINE_CHECK_SPECIES, /datum/species/ornithid)

/obj/item/melee/sabre/gehenna // matthew's sword when he's asset protection
name = "Gehenna"
desc = "The christened blade of Matthew Scoria."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
blood_overlay_type = "armor"
clothing_traits = list(TRAIT_CAFFEINE_LOVER)

/obj/item/clothing/suit/cyrilcloak
/obj/item/clothing/suit/toggle/cyrilcloak
name = "Claw-Sewn Cloak"
desc = "A warm cloak hand sewn by a tailor's hand. Its meant for cold winter climates, not brooding in a dark corner, mind you."
icon = 'maplestation_modules/icons/obj/clothing/suit.dmi'
Expand All @@ -64,6 +64,22 @@
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
alternate_worn_layer = (BACK_LAYER - 0.1) // renders above back items, but below hair.

/obj/item/clothing/suit/toggle/cyrilcloak/Initialize(mapload)
. = ..()
allowed += list(
/obj/item/flashlight,
/obj/item/lighter,
/obj/item/modular_computer/pda,
/obj/item/radio,
/obj/item/storage/bag/books,
/obj/item/storage/fancy/cigarettes,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/tank/internals/plasmaman,
/obj/item/toy,
/obj/item/storage/belt/sheathe/maugrim/razorwing,
)

/obj/item/clothing/suit/matthewjacket
name = "Embroidered Clan Jacket"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@

/datum/loadout_item/suit/cyrilcloak
name = "Claw-Sewn Cloak"
item_path = /obj/item/clothing/suit/cyrilcloak
item_path = /obj/item/clothing/suit/toggle/cyrilcloak

/datum/loadout_item/suit/scoriajacket
name = "Embroidered Clan Jacket"
Expand Down
Binary file modified maplestation_modules/icons/mob/clothing/belt.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/inhands/clothes/belts_lefthand.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/inhands/clothes/belts_righthand.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/inhands/weapons/swords_lefthand.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/inhands/weapons/swords_righthand.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/obj/clothing/belts.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/obj/clothing/suit.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/obj/weapons.dmi
Binary file not shown.

0 comments on commit 73a6f7f

Please sign in to comment.