Merge pull request #8430 from Trilbyspaceclone/bad_idea

Adds improvised 7.62 rifle
2019-06-05 11:31:10 -07:00
parent 6e4a3c71f9 1b48db693f
commit 0d97361dea
4 changed files with 27 additions and 23 deletions
@@ -10,7 +10,6 @@
 	var/category = CAT_NONE //where it shows up in the crafting UI
 	var/subcategory = CAT_NONE

-
 /datum/crafting_recipe/pin_removal
 	name = "Pin Removal"
 	result = /obj/item/gun
@@ -324,6 +323,18 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON

+/datum/crafting_recipe/irifle
+	name = "Improvised Rifle(7.62mm)"
+	result = /obj/item/gun/ballistic/shotgun/boltaction/improvised
+	reqs = list(/obj/item/weaponcrafting/receiver = 1,
+				/obj/item/pipe = 2,
+				/obj/item/weaponcrafting/stock = 1,
+				/obj/item/stack/packageWrap = 5)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
 /datum/crafting_recipe/chainsaw
 	name = "Chainsaw"
 	result = /obj/item/twohanded/required/chainsaw
@@ -407,7 +418,6 @@
 	reqs = list(/obj/item/paper = 5)
 	category = CAT_MISC

-
 /datum/crafting_recipe/flashlight_eyes
 	name = "Flashlight Eyes"
 	result = /obj/item/organ/eyes/robotic/flashlight
@@ -623,7 +633,6 @@
 				  /obj/item/assembly/igniter = 1)
 	category = CAT_MISC

-
 /datum/crafting_recipe/rcl
 	name = "Makeshift Rapid Cable Layer"
 	result = /obj/item/twohanded/rcl/ghetto
@@ -747,7 +756,10 @@
 	name = "Improvised Jetpack"
 	result = /obj/item/tank/jetpack/improvised
 	time = 30
-	reqs = list(/obj/item/tank/internals/oxygen = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = 30)//red oxygen tank so it looks right
+	reqs = list(/obj/item/tank/internals/oxygen = 2,
+				/obj/item/extinguisher = 1,
+				/obj/item/pipe = 3,
+				/obj/item/stack/cable_coil = 30)
 	category = CAT_MISC
 	tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)

@@ -6,10 +6,12 @@
 	max_ammo = 5
 	multiload = 1

+/obj/item/ammo_box/magazine/internal/boltaction/improvised
+	max_ammo = 1
+
 /obj/item/ammo_box/magazine/internal/boltaction/enchanted
 	max_ammo = 1
 	ammo_type = /obj/item/ammo_casing/a762/enchanted

 /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage
 	ammo_type = /obj/item/ammo_casing/magic/arcane_barrage
-
@@ -268,8 +268,6 @@
 	empty_alarm()
 	return

-
-
 // L6 SAW //

 /obj/item/gun/ballistic/automatic/l6_saw
@@ -292,13 +290,11 @@
 /obj/item/gun/ballistic/automatic/l6_saw/unrestricted
 	pin = /obj/item/firing_pin

-
 /obj/item/gun/ballistic/automatic/l6_saw/examine(mob/user)
 	..()
 	if(cover_open && magazine)
 		to_chat(user, "<span class='notice'>It seems like you could use an <b>empty hand</b> to remove the magazine.</span>")

-
 /obj/item/gun/ballistic/automatic/l6_saw/attack_self(mob/user)
 	cover_open = !cover_open
 	to_chat(user, "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>")
@@ -308,12 +304,10 @@
 		playsound(user, 'sound/weapons/sawclose.ogg', 60, 1)
 	update_icon()

-
 /obj/item/gun/ballistic/automatic/l6_saw/update_icon()
 	icon_state = "l6[cover_open ? "open" : "closed"][magazine ? CEILING(get_ammo(0)/12.5, 1)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
 	item_state = "l6[cover_open ? "openmag" : "closedmag"]"

-
 /obj/item/gun/ballistic/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
 	if(cover_open)
 		to_chat(user, "<span class='warning'>[src]'s cover is open! Close it before firing!</span>")
@@ -344,8 +338,6 @@
 		return
 	..()

-
-
 // SNIPER //

 /obj/item/gun/ballistic/automatic/sniper_rifle
@@ -367,14 +359,12 @@
 	slot_flags = ITEM_SLOT_BACK
 	actions_types = list()

-
 /obj/item/gun/ballistic/automatic/sniper_rifle/update_icon()
 	if(magazine)
 		icon_state = "sniper-mag"
 	else
 		icon_state = "sniper"

-
 /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
 	name = "syndicate sniper rifle"
 	desc = "An illegally modified .50 cal sniper rifle with suppression compatibility. Quickscoping still doesn't work."
@@ -403,7 +393,6 @@
 	else
 		icon_state = "surplus-e"

-
 // Laser rifle (rechargeable magazine) //

 /obj/item/gun/ballistic/automatic/laser
@@ -71,7 +71,6 @@
 	var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing.
 	chambered = AC

-
 /obj/item/gun/ballistic/shotgun/examine(mob/user)
 	..()
 	if (chambered)
@@ -117,6 +116,14 @@
 	knife_x_offset = 27
 	knife_y_offset = 13

+/obj/item/gun/ballistic/shotgun/boltaction/improvised
+	name = "Makeshift 7.62mm Rifle"
+	icon_state = "ishotgun"
+	item_state = "shotgun"
+	desc = "A large zip gun more or less that takes a single 7.62mm bullet"
+	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/improvised
+	can_bayonet = FALSE
+
 /obj/item/gun/ballistic/shotgun/boltaction/pump(mob/M)
 	playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
 	if(bolt_open)
@@ -137,7 +144,6 @@
 	..()
 	to_chat(user, "The bolt is [bolt_open ? "open" : "closed"].")

-
 /obj/item/gun/ballistic/shotgun/boltaction/enchanted
 	name = "enchanted bolt action rifle"
 	desc = "Careful not to lose your head."
@@ -153,10 +159,8 @@
 	icon_state = "arcane_barrage"
 	item_state = "arcane_barrage"
 	can_bayonet = FALSE
-
 	item_flags = NEEDS_PERMIT | DROPDEL
 	flags_1 = NONE
-
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage

 /obj/item/gun/ballistic/shotgun/boltaction/enchanted/Initialize()
@@ -207,7 +211,6 @@
 						"Slick" = "cshotgun_slick"
 						)

-
 /obj/item/gun/ballistic/shotgun/automatic/combat/compact
 	name = "compact combat shotgun"
 	desc = "A compact version of the semi automatic combat shotgun. For close encounters."
@@ -218,7 +221,6 @@
 						"Slick" = "cshotgunc_slick"
 						)

-
 //Dual Feed Shotgun

 /obj/item/gun/ballistic/shotgun/automatic/dual_tube
@@ -261,5 +263,4 @@
 		return
 	pump()

-
 // DOUBLE BARRELED SHOTGUN and IMPROVISED SHOTGUN are in revolver.dm