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

Tweaks some guns names and description and also fixes zoom and recoil interactions (#10030)

Browse Source
This commit is contained in:
Alberyk
2020-09-22 16:34:04 -03:00
committed by GitHub
parent 25b5982d2d
commit 00405c72f3
6 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/uplink/highly visible and dangerous weapons.dm
View File

@@ -40,7 +40,7 @@
path = /obj/item/gun/projectile/revolver
/datum/uplink_item/item/visible_weapons/submachinegun
name = "Vintage Submachine Gun"
name = "Submachine Gun"
item_cost = 14
path = /obj/item/gun/projectile/automatic/tommygun

4
code/game/objects/structures/weapon_rack.dm
View File

@@ -61,6 +61,6 @@
held_weapon = /obj/item/gun/projectile/shotgun/improvised
/obj/structure/weapon_rack/dragunov
name = "antique sniper rifle rack"
desc = "A wooden rack holding an old sniper rifle. Still packs a punch."
name = "marksman rifle rack"
desc = "A wooden rack holding a marksman rifle."
held_weapon = /obj/item/gun/projectile/dragunov

3
code/modules/mob/mob_helpers.dm
View File

@@ -399,6 +399,9 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(!M || !M.client || M.shakecamera || M.stat || isEye(M) || isAI(M))
return
if(M.client && ((M.client.view != world.view) || (M.client.pixel_x != 0) || (M.client.pixel_y != 0))) //to prevent it while zooming, because zoom does not play well with this code
return
M.shakecamera = TRUE
strength = abs(strength)*PIXELS_PER_STRENGTH_VAL
var/steps = min(1, Floor(duration/TICKS_PER_RECOIL_ANIM))-1

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

@@ -364,8 +364,8 @@
update_held_icon()
/obj/item/gun/projectile/automatic/tommygun
name = "vintage submachine gun"
desc = "A classic submachine gun. Uses .45 rounds."
name = "submachine gun"
desc = "An adhomian made submachine gun. Uses .45 rounds."
icon = 'icons/obj/guns/tommygun.dmi'
icon_state = "tommygun"
item_state = "tommygun"

8
code/modules/projectiles/guns/projectile/sniper.dm
View File

@@ -179,11 +179,15 @@
update_held_icon()
/obj/item/gun/projectile/dragunov
name = "antique sniper rifle"
desc = "An old semi-automatic marksman rifle. Uses 7.62mm rounds."
name = "marksman rifle"
desc = "A semi-automatic marksman rifle. Uses 7.62mm rounds."
icon = 'icons/obj/guns/dragunov.dmi'
icon_state = "dragunov"
item_state = "dragunov"
desc_fluff = "The Ho'taki Marksman Rifle was created by the Shastar Technical University, created through the reverse engineering of captured Tsarrayut'yan rifle. \
The rifle is commonly issued to the feared Das'nrra Marksmen."
w_class = ITEMSIZE_LARGE
force = 10
slot_flags = SLOT_BACK