Feat: Revolving Rifle 2.0 (ss220-space#86)

* Прошлый ПР сломался, вот новый * Прошлый ПР сломался, вот новый * Вернул max_w * Update ss220/code/RU_items.dm Co-authored-by: qwerty4429 <42085626+goose4429@users.noreply.github.com> * Update ss220/code/RU_items.dm ОК! Co-authored-by: qwerty4429 <42085626+goose4429@users.noreply.github.com> Co-authored-by: qwerty4429 <42085626+goose4429@users.noreply.github.com>
terribaum · Nov 1, 2022 · beee6e1 · beee6e1
1 parent f7376c0
commit beee6e1
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 4 deletions.
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -834,9 +834,6 @@
 	desc = "The T457 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips."
 	icon_state = "tp44_holster"
 	item_state = "tp44_holster"
-	bypass_w_limit = list(
-		/obj/item/weapon/gun/revolver,
-	)
 	can_hold = list(
 		/obj/item/weapon/gun/revolver,
 		/obj/item/ammo_magazine/revolver,
@@ -848,7 +845,7 @@
 	icon_state = "m44_holster"
 	item_state = "m44_holster"
 	max_storage_space = 16
-	max_w_class = 4
+	max_w_class = 3
 	can_hold = list(
 		/obj/item/weapon/gun/revolver,
 		/obj/item/ammo_magazine/revolver,

diff --git a/icons/Marine/gun64.dmi b/icons/Marine/gun64.dmi
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
diff --git a/icons/mob/items_lefthand_1.dmi b/icons/mob/items_lefthand_1.dmi
diff --git a/icons/mob/items_righthand_1.dmi b/icons/mob/items_righthand_1.dmi
diff --git a/icons/mob/suit_slot.dmi b/icons/mob/suit_slot.dmi
diff --git a/ss220/code/RU_items.dm b/ss220/code/RU_items.dm
@@ -8,13 +8,15 @@ SUBSYSTEM_DEF(ru_items)
 	var/list/items = list(
 		/obj/item/ammo_magazine/smg/vector = -1,
 		/obj/item/ammo_magazine/packet/acp_smg = -1,
+		/obj/item/weapon/gun/revolver/standard_revolver/coltrifle = -1,
 	)
 
 	var/list/items_val = list(
 		/obj/item/weapon/gun/smg/vector = -1,
 		/obj/item/ammo_magazine/smg/vector = -1,
 		/obj/item/ammo_magazine/packet/acp_smg = -1,
 		/obj/item/weapon/twohanded/glaive/harvester = -1,
+		/obj/item/weapon/gun/revolver/standard_revolver/coltrifle = -1,
 		/obj/item/clothing/head/helmet/marine/robot/advanced/acid = -1,
 		/obj/item/clothing/suit/storage/marine/robot/advanced/acid = -1,
 		/obj/item/clothing/head/helmet/marine/robot/advanced/physical = -1,
@@ -44,6 +46,43 @@ SUBSYSTEM_DEF(ru_items)
 
 //List all custom items here
 
+///////////////////////////////////////////////////////////////////////
+//////// Сoltrifle, based on Colt Model 1855 Revolving Rifle. /////////
+///////////////////////////////////////////////////////////////////////
+
+/obj/item/weapon/gun/revolver/standard_revolver/coltrifle
+	name = "\improper M1855 Revolving Rifle"
+	desc = "A revolver and carbine hybrid, designed and manufactured a long time ago by Crowford Armory Union. Popular back then, but completely obsolete today. Still used by some antiquity lovers."
+	icon = 'icons/marine/gun64.dmi'
+	icon_state = "coltrifle"
+	item_state = "coltrifle"
+	fire_animation = "coltrifle_fire"
+	gun_skill_category = GUN_SKILL_RIFLES
+	flags_equip_slot = ITEM_SLOT_BACK
+	w_class = WEIGHT_CLASS_BULKY
+	damage_mult = 1.1
+	force = 20
+
+	scatter = 0
+	scatter_unwielded = 5
+
+	fire_delay = 0.2 SECONDS
+	upper_akimbo_accuracy = 6
+	lower_akimbo_accuracy = 3
+	akimbo_additional_delay = 1
+
+	recoil = 0
+	recoil_unwielded = 0
+
+	attachable_allowed = list(
+		/obj/item/attachable/magnetic_harness,
+		/obj/item/attachable/reddot,
+		/obj/item/attachable/extended_barrel,
+		/obj/item/attachable/bayonet,
+		/obj/item/attachable/bayonetknife,
+	)
+	attachable_offset = list("muzzle_x" = 50, "muzzle_y" = 21,"rail_x" = 24, "rail_y" = 22)
+
 ///////////////////////////////////////////////////////////////////////
 ////////////////////////  T25, old version .///////////////////////////
 ///////////////////////////////////////////////////////////////////////