Merge pull request BeeStation#241 from Debonaircorsiar/patch-1

Sleepy time shells
sunofang · Jul 20, 2019 · 44dd936 · 44dd936
2 parents bdcbb54 + a58d198
commit 44dd936
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -15,6 +15,13 @@
 	projectile_type = /obj/item/projectile/bullet/shotgun_beanbag
 	materials = list(MAT_IRON=250)
 
+
+/obj/item/ammo_casing/shotgun/sleepytime
+	name = "soporific shell"
+	desc = "A shotgun shell loaded with a hypodermic needle containing a low strength sleeping agent."
+	icon_state = "sleepy"
+	projectile_type = /obj/item/projectile/bullet/sleepy
+
 /obj/item/ammo_casing/shotgun/incendiary
 	name = "incendiary slug"
 	desc = "An incendiary-coated shotgun slug."

diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -11,6 +11,16 @@
 	name = "incendiary slug"
 	damage = 20
 
+/obj/item/projectile/bullet/sleepy
+	name = "soporific slug"
+	damage = 0
+
+/obj/item/projectile/bullet/sleepy/on_hit(atom/target, blocked = FALSE)
+	if((blocked != 100) && isliving(target))
+		var/mob/living/L = target
+		L.Sleeping(50)
+	return ..()
+
 /obj/item/projectile/bullet/incendiary/shotgun/dragonsbreath
 	name = "dragonsbreath pellet"
 	damage = 5

diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
@@ -38,6 +38,15 @@
 	category = list("Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
+/datum/design/sleepy/sec
+	name = "Soporific Shell"
+	id = "sleepy"
+	build_type = PROTOLATHE
+	category = list("Ammo")
+	materials = list(MAT_IRON = 4000, MAT_SILVER = 400, MAT_COPPER = 400)
+	build_path = /obj/item/ammo_casing/shotgun/sleepytime
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
 /datum/design/rubbershot/sec
 	id = "sec_rshot"
 	build_type = PROTOLATHE

diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
@@ -581,7 +581,7 @@
 	display_name = "Weapon Development Technology"
 	description = "Our researchers have found new ways to weaponize just about everything now."
 	prereq_ids = list("engineering")
-	design_ids = list("pin_testing", "tele_shield")
+	design_ids = list("pin_testing", "tele_shield", "sleepy")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
 	export_price = 5000
 

diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi