diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index d06ad972e6..dd40648191 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -41,7 +41,7 @@ var/firing = FALSE /// Used in gun-in-mouth execution/suicide and similar, while TRUE nothing should work on this like firing or modification and so on and so forth. var/busy_action = FALSE - var/weapon_weight = WEAPON_LIGHT //currently only used for inaccuracy + var/weapon_weight = WEAPON_LIGHT //used for inaccuracy and wielding requirements/penalties var/spread = 0 //Spread induced by the gun itself. var/burst_spread = 0 //Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0. var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once. diff --git a/code/modules/projectiles/guns/ballistic/magweapon.dm b/code/modules/projectiles/guns/ballistic/magweapon.dm index f1d02e5cc2..e71f414bd8 100644 --- a/code/modules/projectiles/guns/ballistic/magweapon.dm +++ b/code/modules/projectiles/guns/ballistic/magweapon.dm @@ -1,10 +1,10 @@ /obj/item/gun/ballistic/automatic/magrifle - name = "\improper Magnetic Rifle" + name = "magnetic rifle" desc = "A simple upscalling of the technologies used in the magpistol, the magrifle is capable of firing slightly larger slugs in bursts. Compatible with the magpistol's slugs." icon_state = "magrifle" item_state = "arg" force = 10 - slot_flags = NONE + slot_flags = ITEM_SLOT_BACK mag_type = /obj/item/ammo_box/magazine/mmag fire_sound = 'sound/weapons/magrifle.ogg' can_suppress = FALSE @@ -17,6 +17,7 @@ inaccuracy_modifier = 0 dualwield_spread_mult = 1.4 weapon_weight = WEAPON_MEDIUM + w_class = WEIGHT_CLASS_BULKY var/obj/item/stock_parts/cell/cell var/cell_type = /obj/item/stock_parts/cell/magnetic @@ -63,12 +64,13 @@ spawnwithmagazine = FALSE /obj/item/gun/ballistic/automatic/magrifle/hyperburst - name = "\improper Hyper-Burst Rifle" + name = "\improper Hyper-Burst rifle" desc = "An extremely beefed up version of a stolen Nanotrasen weapon prototype, this 'rifle' is more like a cannon, with an extremely large bore barrel capable of generating several smaller magnetic 'barrels' to simultaneously launch multiple projectiles at once." icon_state = "hyperburst" - item_state = "arg" + slot_flags = NONE //too lazy for the sprites rn and it's pretty stronk anyway. mag_type = /obj/item/ammo_box/magazine/mhyper fire_sound = 'sound/weapons/magburst.ogg' + w_class = WEIGHT_CLASS_HUGE fire_delay = 40 recoil = 2 weapon_weight = WEAPON_HEAVY @@ -83,6 +85,8 @@ name = "magpistol" desc = "A handgun utilizing maglev technologies to propel a ferromagnetic slug to extreme velocities." icon_state = "magpistol" + w_class = WEIGHT_CLASS_NORMAL + slot_flags = ITEM_SLOT_BELT fire_sound = 'sound/weapons/magpistol.ogg' mag_type = /obj/item/ammo_box/magazine/mmag/small fire_delay = 2 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 2fe9b326eb..bcd3a97ccd 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -24,6 +24,7 @@ icon_state = "toyburst" obj_flags = NONE fire_delay = 40 + w_class = WEIGHT_CLASS_HUGE weapon_weight = WEAPON_HEAVY selfcharge = EGUN_SELFCHARGE charge_delay = 2 @@ -56,12 +57,14 @@ /obj/item/gun/energy/laser/carbine name = "laser carbine" desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal laser gun." - icon = 'icons/obj/guns/energy.dmi' icon_state = "lasernew" - item_state = "laser" + item_state = "lasernew" + slot_flags = ITEM_SLOT_BACK + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM + inaccuracy_modifier = 0.5 force = 10 throwforce = 10 - ammo_type = list(/obj/item/ammo_casing/energy/lasergun) cell_type = /obj/item/stock_parts/cell/lascarbine resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 947ccb7924..66a47d21f2 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 2fdb9b88d2..528fd42d23 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index dc8d8a4c3f..5bf347fabf 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ