Adds inhand improvised shotgun sprites (#45995)
* the poke * e * wrong bracnch * improvised spripes * better spropes * hoook time * hooky * h * fuckkkk * "fix" * fuggggggggggggggg * shit wrong pr * fixes * no e * un-hooked * more unhookinga * added unused twohanded sprites * Revert "Merge branch 'master' into shotgun" This reverts commit 95caaf6270cebdc21b80659a6a0725bf37c005d1, reversing changes made to 3cec8e8f3b188a15a495adb61f724cedd7d35246. * Revert "Revert "Merge branch 'master' into shotgun"" This reverts commit 6677b4718f22f99befe4e9718b9b7c1f02ea6311. * Revert "Revert "Revert "Merge branch 'master' into shotgun""" This reverts commit 3df1e045861bb3abcebaa5b900648b016c53d620. * Revert "Revert "Revert "Revert "Merge branch 'master' into shotgun"""" This reverts commit 8fc15d61daf40dd2ae557fdefdbd73274540cf01. * big brain move ahead * big brain move actuated
@@ -178,7 +178,7 @@
|
||||
name = "improvised shotgun"
|
||||
desc = "Essentially a tube that aims shotgun shells."
|
||||
icon_state = "ishotgun"
|
||||
item_state = "shotgun"
|
||||
item_state = "ishotgun"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
force = 10
|
||||
slot_flags = null
|
||||
@@ -202,7 +202,8 @@
|
||||
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/update_icon()
|
||||
..()
|
||||
if(slung)
|
||||
add_overlay("improvised_sling")
|
||||
add_overlay("ishotgunsling")
|
||||
item_state = "ishotgunsling"
|
||||
|
||||
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawoff(mob/user)
|
||||
. = ..()
|
||||
@@ -214,8 +215,8 @@
|
||||
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn
|
||||
name = "sawn-off improvised shotgun"
|
||||
desc = "A single-shot shotgun. Better not miss."
|
||||
icon_state = "ishotgun"
|
||||
item_state = "gun"
|
||||
icon_state = "ishotgun" //_sawn
|
||||
item_state = "ishotgun_sawn"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
sawn_off = TRUE
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
@@ -230,7 +231,7 @@
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
weapon_weight = WEAPON_MEDIUM
|
||||
can_be_sawn_off = FALSE
|
||||
force = 10 //it has a hook on it
|
||||
force = 16 //it has a hook on it
|
||||
attack_verb = list("slashed", "hooked", "stabbed")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
//our hook gun!
|
||||
|
||||
@@ -68,7 +68,6 @@
|
||||
qdel(gun)
|
||||
|
||||
|
||||
|
||||
/obj/item/firing_pin/magic
|
||||
name = "magic crystal shard"
|
||||
desc = "A small enchanted shard which allows magical weapons to fire."
|
||||
|
||||
|
Before Width: | Height: | Size: 99 KiB After Width: | Height: | Size: 98 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 63 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |