mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-25 01:22:13 +00:00
Fix holster runtime and more gun names (#1480)
fix #1465 more gun naming things fix constructs being able to smash airlocks at speed of light
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/gun/projectile/automatic //Hopefully someone will find a way to make these fire in bursts or something. --Superxpdude
|
||||
/obj/item/weapon/gun/projectile/automatic
|
||||
name = "prototype SMG"
|
||||
desc = "A protoype lightweight, fast firing gun. Uses 9mm rounds."
|
||||
icon_state = "saber" //ugly
|
||||
@@ -22,7 +22,7 @@
|
||||
//Submachine guns and personal defence weapons, go.
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/mini_uzi
|
||||
name = "\improper Uzi"
|
||||
name = ".45 machine pistol"
|
||||
desc = "The UZI is a lightweight, fast firing gun. For when you want someone dead. Uses .45 rounds."
|
||||
icon_state = "mini-uzi"
|
||||
w_class = 3
|
||||
@@ -130,7 +130,7 @@
|
||||
toggle_wield(usr)
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/rifle/sts35
|
||||
name = "\improper STS-35 automatic rifle"
|
||||
name = "assault rifle"
|
||||
desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked."
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/rifle/sts35/update_icon()
|
||||
@@ -142,8 +142,8 @@
|
||||
var/use_launcher = 0
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/rifle/z8
|
||||
name = "\improper Z8 Bulldog"
|
||||
desc = "An older model bullpup carbine, made by the now defunct Zendai Foundries. Uses armor piercing 5.56mm rounds. Makes you feel like a space marine when you hold it."
|
||||
name = "bullpup assault carbine"
|
||||
desc = "The Z8 Bulldog bullpup carbine, made by the now defunct Zendai Foundries. Uses armor piercing 5.56mm rounds. Makes you feel like a space marine when you hold it."
|
||||
icon_state = "carbine"
|
||||
item_state = "z8carbine"
|
||||
w_class = 4
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/sec
|
||||
name = ".45 pistol"
|
||||
desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses .45 rounds.."
|
||||
desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses .45 rounds."
|
||||
icon_state = "secguncomp"
|
||||
magazine_type = /obj/item/ammo_magazine/c45m/rubber
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/c45m)
|
||||
@@ -111,8 +111,8 @@
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/c45m)
|
||||
|
||||
/obj/item/weapon/gun/projectile/deagle
|
||||
name = "desert eagle"
|
||||
desc = "A robust handgun that uses .50 AE ammo"
|
||||
name = ".50 magnum pistol"
|
||||
desc = "A robust handgun that uses .50 AE ammo."
|
||||
icon_state = "deagle"
|
||||
item_state = "deagle"
|
||||
force = 14.0
|
||||
|
||||
Reference in New Issue
Block a user