mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-13 08:03:43 +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:
DGamerL
@@ -176,6 +176,8 @@
|
||||
/obj/item/toy/sword
|
||||
name = "toy sword"
|
||||
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "sword0"
|
||||
item_state = "sword0"
|
||||
var/active = FALSE
|
||||
@@ -251,6 +253,8 @@
|
||||
/obj/item/toy/katana
|
||||
name = "replica katana"
|
||||
desc = "Woefully underpowered in D20."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "katana"
|
||||
item_state = "katana"
|
||||
flags = CONDUCT
|
||||
@@ -857,6 +861,8 @@
|
||||
desc = "it says \"Sternside Changs #1 fan\" on it. "
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "foamblade"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
item_state = "arm_blade"
|
||||
attack_verb = list("pricked", "absorbed", "gored")
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
@@ -1242,7 +1248,9 @@
|
||||
*/
|
||||
/obj/item/toy/chainsaw
|
||||
name = "Toy Chainsaw"
|
||||
desc = "A toy chainsaw with a rubber edge. Ages 8 and up"
|
||||
desc = "A toy chainsaw with a rubber edge. Ages 8 and up."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "chainsaw0"
|
||||
base_icon_state = "chainsaw"
|
||||
force = 0
|
||||
|
||||
@@ -144,6 +144,8 @@
|
||||
|
||||
/obj/item/nullrod/claymore
|
||||
name = "holy claymore"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "claymore"
|
||||
item_state = "claymore"
|
||||
desc = "A weapon fit for a crusade!"
|
||||
@@ -245,6 +247,8 @@
|
||||
|
||||
/obj/item/nullrod/scythe/vibro
|
||||
name = "high frequency blade"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "hfrequency1"
|
||||
item_state = "hfrequency1"
|
||||
desc = "Bad references are the DNA of the soul."
|
||||
@@ -366,6 +370,8 @@
|
||||
|
||||
/obj/item/nullrod/hammmer
|
||||
name = "relic war hammer"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "hammeron"
|
||||
item_state = "hammeron"
|
||||
desc = "This war hammer cost the chaplain fourty thousand space dollars."
|
||||
@@ -376,6 +382,8 @@
|
||||
/obj/item/nullrod/chainsaw
|
||||
name = "chainsaw hand"
|
||||
desc = "Good? Bad? You're the guy with the chainsaw hand."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "chainsaw1"
|
||||
item_state = "mounted_chainsaw"
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
@@ -491,6 +499,8 @@
|
||||
|
||||
/obj/item/nullrod/pitchfork
|
||||
name = "unholy pitchfork"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "pitchfork0"
|
||||
item_state = "pitchfork0"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
@@ -117,6 +117,8 @@
|
||||
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
sharp = TRUE
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
var/bayonet = FALSE //Can this be attached to a gun?
|
||||
|
||||
/obj/item/kitchen/knife/suicide_act(mob/user)
|
||||
|
||||
@@ -177,6 +177,8 @@
|
||||
/obj/item/restraints/legcuffs/bola
|
||||
name = "bola"
|
||||
desc = "A restraining device designed to be thrown at the target. Upon connecting with said target, it will wrap around their legs, making it difficult for them to move quickly."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "bola"
|
||||
item_state = "bola"
|
||||
breakouttime = 3.5 SECONDS
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
/obj/item/melee
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
needs_permit = TRUE
|
||||
|
||||
/obj/item/melee/chainofcommand
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
/obj/item/shield
|
||||
name = "shield"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 0, BOMB = 30, RAD = 0, FIRE = 80, ACID = 70)
|
||||
|
||||
/obj/item/shield/proc/add_parry_component()
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
/obj/item/melee/baton/cattleprod/teleprod
|
||||
name = "teleprod"
|
||||
desc = "A prod with a bluespace crystal on the end. The crystal doesn't look too fun to touch."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "teleprod_nocell"
|
||||
base_icon = "teleprod"
|
||||
origin_tech = "combat=2;bluespace=4;materials=3"
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
*/
|
||||
/obj/item/fireaxe // DEM AXES MAN, marker -Agouri
|
||||
base_icon_state = "fireaxe"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "fireaxe0"
|
||||
name = "fire axe"
|
||||
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
|
||||
@@ -94,6 +96,8 @@
|
||||
/obj/item/dualsaber
|
||||
name = "double-bladed energy sword"
|
||||
desc = "Handle with care."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "dualsaber0"
|
||||
force = 3
|
||||
throwforce = 5
|
||||
@@ -245,6 +249,8 @@
|
||||
max_integrity = 200
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
|
||||
needs_permit = TRUE
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
base_icon_state = "spearglass"
|
||||
|
||||
/obj/item/spear/Initialize(mapload)
|
||||
@@ -392,6 +398,8 @@
|
||||
/obj/item/chainsaw
|
||||
name = "chainsaw"
|
||||
desc = "A versatile power tool. Useful for limbing trees and delimbing humans."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "gchainsaw_off"
|
||||
flags = CONDUCT
|
||||
force = 13
|
||||
@@ -462,6 +470,8 @@
|
||||
/obj/item/butcher_chainsaw
|
||||
name = "chainsaw"
|
||||
desc = "Perfect for felling trees or fellow spacemen."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
base_icon_state = "chainsaw"
|
||||
icon_state = "chainsaw0"
|
||||
force = 15
|
||||
@@ -527,6 +537,8 @@
|
||||
/obj/item/singularityhammer
|
||||
name = "singularity hammer"
|
||||
desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "singulohammer0"
|
||||
base_icon_state = "singulohammer"
|
||||
flags = CONDUCT
|
||||
@@ -596,6 +608,8 @@
|
||||
/obj/item/mjollnir
|
||||
name = "Mjolnir"
|
||||
desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "mjollnir0"
|
||||
base_icon_state = "mjollnir"
|
||||
flags = CONDUCT
|
||||
@@ -641,6 +655,8 @@
|
||||
/obj/item/knighthammer
|
||||
name = "singuloth knight's hammer"
|
||||
desc = "A hammer made of sturdy metal with a golden skull adorned with wings on either side of the head. <br>This weapon causes devastating damage to those it hits due to a power field sustained by a mini-singularity inside of the hammer."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "knighthammer0"
|
||||
base_icon_state = "knighthammer"
|
||||
flags = CONDUCT
|
||||
@@ -707,6 +723,8 @@
|
||||
/obj/item/pyro_claws
|
||||
name = "hardplasma energy claws"
|
||||
desc = "The power of the sun, in the claws of your hand."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "pyro_claws"
|
||||
flags = ABSTRACT | NODROP | DROPDEL
|
||||
force = 22
|
||||
@@ -992,6 +1010,8 @@
|
||||
/obj/item/supermatter_halberd //Supermatter Halberd, used by Oblivion Enforcers
|
||||
name = "supermatter halberd"
|
||||
desc = "The revered weapon of Oblivion Enforcers, used to enforce the Order's will."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "smhalberd0"
|
||||
base_icon_state = "smhalberd"
|
||||
force = 5
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
/obj/item/sord
|
||||
name = "\improper SORD"
|
||||
desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "sord"
|
||||
item_state = "sord"
|
||||
slot_flags = SLOT_BELT
|
||||
@@ -74,7 +76,9 @@
|
||||
|
||||
/obj/item/katana
|
||||
name = "katana"
|
||||
desc = "Woefully underpowered in D20"
|
||||
desc = "Woefully underpowered in D20."
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "katana"
|
||||
item_state = "katana"
|
||||
flags = CONDUCT
|
||||
@@ -103,6 +107,8 @@
|
||||
name = "harpoon"
|
||||
sharp = TRUE
|
||||
desc = "Tharr she blows!"
|
||||
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
|
||||
icon_state = "harpoon"
|
||||
item_state = "harpoon"
|
||||
force = 20
|
||||
@@ -167,7 +173,6 @@
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
/obj/item/spear/kidan
|
||||
icon_state = "kidanspear"
|
||||
name = "\improper Kidan spear"
|
||||
desc = "A one-handed spear brought over from the Kidan homeworld."
|
||||
icon_state = "kidanspear"
|
||||
|
||||
Reference in New Issue
Block a user