cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 04:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix holster runtime and more gun names (#1480)

Browse Source 
fix #1465
more gun naming things
fix constructs being able to smash airlocks at speed of light
This commit is contained in:
Alberyk
2017-01-09 13:18:00 -02:00
committed by skull132
parent b049a56cc1
commit 9d2bf7fd6a
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/clothing/under/accessories/holster.dm
View File

@@ -78,7 +78,8 @@
has_suit.verbs += /obj/item/clothing/accessory/holster/verb/holster_verb
/obj/item/clothing/accessory/holster/on_removed(mob/user as mob)
has_suit.verbs -= /obj/item/clothing/accessory/holster/verb/holster_verb
if(has_suit)
has_suit.verbs -= /obj/item/clothing/accessory/holster/verb/holster_verb
..()
//For the holster hotkey

1
code/modules/mob/living/simple_animal/constructs/constructs.dm
View File

@@ -57,6 +57,7 @@
qdel(src)
/mob/living/simple_animal/construct/attack_generic(var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(istype(user, /mob/living/simple_animal/construct/builder))
if(getBruteLoss() > 0)
adjustBruteLoss(-5)

10
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -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

6
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -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