From 5705d273769ed7471b97a870eef87b0f53407bbe Mon Sep 17 00:00:00 2001 From: Kirill <83533775+Tatarla@users.noreply.github.com> Date: Fri, 6 Dec 2024 16:29:42 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B0=D0=B8?= =?UTF-8?q?=D0=BC=20=D0=B8=20=D0=BF=D1=80=D0=B8=D1=86=D0=B5=D0=BB=D1=8B=20?= =?UTF-8?q?=D1=83=20=D0=B4=D0=B2=D1=83=D1=88=D0=BA=D0=B8,=20=D1=80=D0=B5?= =?UTF-8?q?=D0=BB=D1=8C=D1=81=D1=8B=20=D0=B8=20=D0=B2=D1=81=D0=B5=D1=85=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B7=D0=B3=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=BA=D1=80?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=20=D0=BB=D0=B0=D0=B7=D1=81=D0=BD=D0=B0=D0=B9?= =?UTF-8?q?=D0=BF=D1=8B=20(#612)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove scope and AIM mode from lasergun * Update energy.dm Signed-off-by: Kirill <83533775+Tatarla@users.noreply.github.com> * Убрал прицел у двушки и рельсы * Вернул прицелы каливеру --------- Signed-off-by: Kirill <83533775+Tatarla@users.noreply.github.com> --- code/modules/projectiles/guns/energy.dm | 11 ----------- code/modules/projectiles/guns/shotguns.dm | 3 --- code/modules/projectiles/guns/specialist.dm | 1 - 3 files changed, 15 deletions(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index f1a5bda995a..eb6760cd326 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -160,8 +160,6 @@ /obj/item/attachable/flashlight, /obj/item/attachable/foldable/bipod, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope, - /obj/item/attachable/scope/mini, /obj/item/attachable/focuslens, /obj/item/attachable/widelens, /obj/item/attachable/heatlens, @@ -264,9 +262,6 @@ /obj/item/attachable/flashlight, /obj/item/attachable/foldable/bipod, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope, - /obj/item/attachable/scope/marine, - /obj/item/attachable/scope/mini, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_ENERGY|GUN_AMMO_COUNT_BY_SHOTS_REMAINING|GUN_NO_PITCH_SHIFT_NEAR_EMPTY attachable_offset = list("muzzle_x" = 34, "muzzle_y" = 14,"rail_x" = 18, "rail_y" = 18, "under_x" = 23, "under_y" = 10, "stock_x" = 22, "stock_y" = 12) @@ -447,8 +442,6 @@ /obj/item/attachable/lasersight, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/marine, - /obj/item/attachable/scope/mini, /obj/item/weapon/gun/flamer/mini_flamer, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, @@ -556,7 +549,6 @@ /obj/item/attachable/reddot, /obj/item/attachable/lasersight, /obj/item/attachable/flashlight, - /obj/item/attachable/scope/mini, /obj/item/attachable/lace, /obj/item/attachable/gyro, /obj/item/attachable/flashlight/under, @@ -911,8 +903,6 @@ /obj/item/attachable/bayonetknife/som, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/marine, - /obj/item/attachable/scope/mini, /obj/item/weapon/gun/grenade_launcher/underslung, /obj/item/weapon/gun/flamer/mini_flamer, /obj/item/attachable/motiondetector, @@ -1021,7 +1011,6 @@ /obj/item/attachable/lasersight, /obj/item/attachable/flashlight, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/mini, /obj/item/weapon/gun/flamer/mini_flamer, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 218460a66a7..1750e204f03 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -217,9 +217,6 @@ /obj/item/attachable/flashlight, /obj/item/attachable/flashlight/under, /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope, - /obj/item/attachable/scope/marine, - /obj/item/attachable/scope/mini, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm index 309ddcf5252..49bbbc24c07 100644 --- a/code/modules/projectiles/guns/specialist.dm +++ b/code/modules/projectiles/guns/specialist.dm @@ -959,7 +959,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 31, "rail_y" = 23, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) attachable_allowed = list( /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/marine, ) flags_gun_features = GUN_WIELDED_FIRING_ONLY|GUN_WIELDED_STABLE_FIRING_ONLY|GUN_AMMO_COUNTER