cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports Rod of Asclepius in hand sprites and moves staves in hands into a new file (#22250)

Browse Source 
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file

* removing for now

* its conflict time

* lets fix this conflict

* ah shit

* here we go again
This commit is contained in:
Henri215
2023-09-19 18:58:11 +01:00
committed by GitHub
parent 24440cc3a4
commit 9fdf2992be
11 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/holy_weapons.dm
+10 -4
View File
@@ -124,9 +124,11 @@
/obj/item/nullrod/staff
name = "red holy staff"
icon_state = "godstaff-red"
item_state = "godstaff-red"
desc = "It has a mysterious, protective aura."
icon_state = "godstaff-red"
lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
slot_flags = SLOT_BACK
@@ -449,14 +451,16 @@
/obj/item/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking
name = "monk's staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown."
icon_state = "bostaff0"
lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
item_state = "bostaff0"
w_class = WEIGHT_CLASS_BULKY
force = 13
slot_flags = SLOT_BACK
sharp = FALSE
hitsound = "swing_hit"
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
icon_state = "bostaff0"
item_state = "bostaff0"
/obj/item/nullrod/claymore/bostaff/Initialize(mapload)
. = ..()
@@ -600,6 +604,8 @@
reskinned = TRUE
reskin_selectable = FALSE
icon_state = "godstaff-red"
lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
item_state = "godstaff-red"
w_class = WEIGHT_CLASS_HUGE
force = 5
code/game/objects/items/weapons/staff.dm
+4
View File
@@ -3,6 +3,8 @@
desc = "Apparently a staff used by the wizard."
icon = 'icons/obj/wizard.dmi'
icon_state = "staff"
lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
force = 3.0
throwforce = 5.0
throw_speed = 1
@@ -75,6 +77,8 @@
name = "stick"
desc = "A great tool to drag someone else's drinks across the bar."
icon_state = "stick"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
item_state = "stick"
force = 3.0
throwforce = 5.0