mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
Splits up item_inhands.dmi (#22584)
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * Fixes jackhammer and glass shard * Fixes toy Chainsaw * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/weaponry.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Fixes edagger hopefully * Henri review * Oops * First this gone, and now the pain * Should all be fixed now --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
@@ -186,6 +186,8 @@
|
||||
name = "tentacle"
|
||||
desc = "A fleshy tentacle that can stretch out and grab things or people."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "tentacle"
|
||||
item_state = "tentacle"
|
||||
flags = ABSTRACT | NODROP | NOBLUDGEON | DROPDEL
|
||||
|
||||
@@ -38,8 +38,10 @@
|
||||
|
||||
/obj/item/vamp_claws
|
||||
name = "vampiric claws"
|
||||
desc = "A pair of eldritch claws made of living blood, they seem to flow yet they are solid"
|
||||
desc = "A pair of eldritch claws made of living blood, they seem to flow yet they are solid."
|
||||
icon = 'icons/effects/vampire_effects.dmi'
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "vamp_claws"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
flags = ABSTRACT | NODROP | DROPDEL
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
name = "nettle"
|
||||
desc = "It's probably <B>not</B> wise to touch it with bare hands..."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "nettle"
|
||||
damtype = "fire"
|
||||
force = 15
|
||||
|
||||
@@ -82,6 +82,8 @@
|
||||
/obj/item/hatchet
|
||||
name = "hatchet"
|
||||
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "hatchet"
|
||||
item_state = "hatchet"
|
||||
belt_icon = "hatchet"
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
While it is an effective mining tool, it did little to aid any but the most skilled and/or suicidal miners against local fauna."
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
base_icon_state = "crusher"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "crusher"
|
||||
item_state = "crusher0"
|
||||
force = 0 //You can't hit stuff unless wielded
|
||||
|
||||
@@ -487,8 +487,8 @@
|
||||
Even with the weapon destroyed, all the pieces containing the creature have coagulated back together to find a new host."
|
||||
icon = 'icons/obj/lavaland/artefacts.dmi'
|
||||
icon_state = "cursed_katana"
|
||||
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
force = 15
|
||||
armour_penetration_percentage = 40
|
||||
armour_penetration_flat = 10
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
/obj/item/gun/magic/wand/
|
||||
/obj/item/gun/magic/wand
|
||||
name = "wand of nothing"
|
||||
desc = "It's not just a stick, it's a MAGIC stick!"
|
||||
ammo_type = /obj/item/ammo_casing/magic
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "nothingwand"
|
||||
item_state = "wand"
|
||||
belt_icon = "wand_nothing"
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
/obj/item/gun/throw/crossbow
|
||||
name = "powered crossbow"
|
||||
desc = "A modern twist on an old classic. Pick up that can."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "crossbow"
|
||||
item_state = "crossbow-solid"
|
||||
fire_sound_text = "a solid thunk"
|
||||
|
||||
Reference in New Issue
Block a user