Dual-wield Penalties and Urist Gun Sprites

- Reenables Dual Wielding penalties on most heavy guns.
- Adds wielded sprites for all weapons with dual-wield penalties.
- Ports a ton of gun sprites from Urist McStation
- Removes mention of requires_two_hands in code since that is not used anymore.
This commit is contained in:
Unknown
2020-04-11 23:35:24 -04:00
parent 8fe72d24f9
commit e551141313
7 changed files with 20 additions and 14 deletions

View File

@@ -12,7 +12,7 @@
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 2000)
projectile_type = /obj/item/projectile/beam/midlaser
// one_handed_penalty = 30
one_handed_penalty = 30
firemodes = list(
list(mode_name="normal", fire_delay=8, projectile_type=/obj/item/projectile/beam/midlaser, charge_cost = 240),
@@ -125,13 +125,14 @@
flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!"
icon_state = "lasercannon"
item_state = null
wielded_item_state = "mhdhowitzer-wielded" //Placeholder
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
slot_flags = SLOT_BELT|SLOT_BACK
projectile_type = /obj/item/projectile/beam/heavylaser/cannon
battery_lock = 1
fire_delay = 20
w_class = ITEMSIZE_LARGE
// one_handed_penalty = 90 // The thing's heavy and huge.
one_handed_penalty = 90 // The thing's heavy and huge.
accuracy = 45
charge_cost = 600
@@ -162,7 +163,8 @@
ionized beams, this is a weapon to kill from a distance."
icon_state = "sniper"
item_state = "sniper"
item_state_slots = list(slot_r_hand_str = "z8carbine", slot_l_hand_str = "z8carbine") //placeholder
item_state_slots = list(slot_r_hand_str = "psniper", slot_l_hand_str = "psniper")
wielded_item_state = "psniper-wielded"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
projectile_type = /obj/item/projectile/beam/sniper
slot_flags = SLOT_BACK
@@ -174,8 +176,8 @@
w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
accuracy = -45 //shooting at the hip
scoped_accuracy = 0
// requires_two_hands = 1
// one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
requires_two_hands = 1
one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
/obj/item/weapon/gun/energy/sniperrifle/ui_action_click()
scope()

View File

@@ -83,7 +83,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/m545)
projectile_type = /obj/item/projectile/bullet/rifle/a545
// one_handed_penalty = 30
one_handed_penalty = 30
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
@@ -140,7 +140,7 @@
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
// one_handed_penalty = 60
one_handed_penalty = 60
burst_delay = 4
firemodes = list(
@@ -197,6 +197,7 @@
desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. 'Aussec Armoury-2531' is engraved on the reciever. Uses 5.45mm rounds. It's also compatible with magazines from STS-35 assault rifles."
icon_state = "l6closed100"
item_state = "l6closed"
wielded_item_state = "genericLMG-wielded"
w_class = ITEMSIZE_LARGE
force = 10
slot_flags = 0
@@ -209,7 +210,8 @@
allowed_magazines = list(/obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545)
projectile_type = /obj/item/projectile/bullet/rifle/a545
// one_handed_penalty = 90
requires_two_hands = 1
one_handed_penalty = 90
var/cover_open = 0
@@ -278,6 +280,7 @@
desc = "The AS-24 is a rugged looking automatic shotgun produced for the military by Gurov Projectile Weapons LLC. For very obvious reasons, it's illegal to own in many juristictions. Uses 12g rounds."
icon_state = "ashot"
item_state = null
wielded_item_state = "woodarifle-wielded" //Placeholder
w_class = ITEMSIZE_LARGE
force = 10
caliber = "12g"
@@ -288,7 +291,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/m12gdrum)
projectile_type = /obj/item/projectile/bullet/shotgun
// one_handed_penalty = 60
one_handed_penalty = 60
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0),
@@ -375,6 +378,7 @@
desc = "The bullpup configured GP3000 is a battle rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. Uses 7.62mm rounds."
icon_state = "bullpup-small"
item_state = "bullpup"
wielded_item_state = "sexyrifle-wielded" //Placeholder, this is a bullpup at least
w_class = ITEMSIZE_LARGE
force = 10
caliber = "7.62mm"
@@ -385,7 +389,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762m)
projectile_type = /obj/item/projectile/bullet/rifle/a762
// one_handed_penalty = 45
one_handed_penalty = 45
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),

View File

@@ -4,7 +4,7 @@
name = "anti-materiel rifle"
desc = "A portable anti-armour rifle fitted with a scope, the HI PTR-7 Rifle was originally designed to used against armoured exosuits. It is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
icon_state = "heavysniper"
item_state_slots = list(slot_r_hand_str = "l6closed-empty", slot_l_hand_str = "l6closed-empty") // placeholder
wielded_item_state = "heavysniper-wielded"
w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10
slot_flags = SLOT_BACK
@@ -20,7 +20,7 @@
accuracy = -75
scoped_accuracy = 75
ignore_visor_zoom_restriction = TRUE // Ignore the restriction on vision modifiers when using this gun's scope.
// one_handed_penalty = 90
one_handed_penalty = 90
var/bolt_open = 0
/obj/item/weapon/gun/projectile/heavysniper/update_icon()
@@ -79,6 +79,7 @@
desc = "The SVD, also known as the Dragunov, is mass produced with an Optical Sniper Sight so simple that even Ivan can use it. Too bad for you that the inscriptions are written in Russian. Uses 7.62mm rounds."
icon_state = "SVD"
item_state = "SVD"
wielded_item_state = "heavysniper-wielded" //Placeholder
w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10
slot_flags = SLOT_BACK // Needs a sprite.
@@ -88,8 +89,7 @@
load_method = MAGAZINE
accuracy = -45 //shooting at the hip
scoped_accuracy = 0
// requires_two_hands = 1
// one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
fire_sound = 'sound/weapons/Gunshot_SVD.ogg' // Has a very unique sound.
magazine_type = /obj/item/ammo_magazine/m762svd
allowed_magazines = list(/obj/item/ammo_magazine/m762svd)