First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.

2026-07-20 20:45:28 +01:00 · 2015-03-12 19:25:14 +00:00
parent 0ad731d057
commit b758992e8c
11 changed files with 212 additions and 162 deletions
@@ -199,8 +199,26 @@
 /obj/item/ammo_casing/caseless/magspear
 	name = "magnetic spear"
 	desc = "A reusable spear that is typically loaded into kinetic spearguns."
-	projectile_type = /obj/item/projectile/bullet/magspear
+	projectile_type = /obj/item/projectile/bullet/reusable/magspear
 	caliber = "speargun"
 	icon_state = "magspear"
 	throwforce = 15 //still deadly when thrown
 	throw_speed = 3
+
+/obj/item/ammo_casing/caseless/foam_dart
+	name = "foam dart"
+	desc = "Its nerf or nothing! Ages 8 and up."
+	projectile_type = /obj/item/projectile/bullet/reusable/foam_dart
+	caliber = "foam_force"
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "foamdart"
+
+/obj/item/ammo_casing/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]"
+
+/obj/item/ammo_casing/caseless/foam_dart/riot
+	name = "riot foam dart"
+	desc = "Who's smart idea was it to use toys as crowd control? Ages 18 and up."
+	projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/riot
+	icon_state = "foamdart_riot"
@@ -104,6 +104,18 @@
 	max_ammo = 5
 	multiload = 1

+/obj/item/ammo_box/magazine/internal/shot/toy
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+	caliber = "foam_force"
+	max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/cylinder/toy
+	name = "crossbow cylinder"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+	caliber = "foam_force"
+	max_ammo = 5
+
 ///////////EXTERNAL MAGAZINES////////////////

 /obj/item/ammo_box/magazine/m10mm
@@ -216,3 +228,20 @@ obj/item/ammo_box/magazine/tommygunm45
 	name = "shotgun magazine (12g dragon's breath)"
 	icon_state = "m12gf"
 	ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+
+/obj/item/ammo_box/magazine/toy
+	name = "foam force SMG magazine"
+	icon_state = "c20r45"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+	caliber = "foam_force"
+	max_ammo = 18
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/toy/pistol
+	name = "foam force pistol magazine"
+	icon_state = "9x19p"
+	max_ammo = 8
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/toy/pistol/riot
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
@@ -0,0 +1,58 @@
+/obj/item/weapon/gun/projectile/automatic/toy
+	name = "foam force SMG"
+	desc = "A bullpup three-round burst toy SMG. Ages 8 and up."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "saber"
+	item_state = "c20r"
+	mag_type = /obj/item/ammo_box/magazine/toy
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	fire_delay = 2
+	force = 0
+	throwforce = 0
+	burst_size = 3
+	can_suppress = 0
+	clumsy_check = 0
+
+/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(var/eject_casing = 0, var/empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol
+	name = "foam force pistol"
+	desc = "A small, easily concealable toy handgun. Ages 8 and up."
+	icon_state = "pistol"
+	item_state = "gun"
+	w_class = 2
+	mag_type = /obj/item/ammo_box/magazine/toy/pistol
+	fire_sound = 'sound/weapons/Gunshot.ogg'
+	can_suppress = 0
+	burst_size = 1
+	fire_delay = 0
+	action_button_name = null
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/shotgun/toy
+	name = "foam force shotgun"
+	desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
+	icon = 'icons/obj/toy.dmi'
+	force = 0
+	throwforce = 0
+	origin_tech = null
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
+	clumsy_check = 0
+
+/obj/item/weapon/gun/projectile/shotgun/toy/process_chamber()
+	..()
+	if(chambered && !chambered.BB)
+		qdel(chambered)
+
+/obj/item/weapon/gun/projectile/shotgun/toy/crossbow
+	name = "foam force crossbow"
+	desc = "A weapon favored by many overactive children. Ages 8 and up."
+	icon_state = "foamcrossbow"
+	item_state = "crossbow"
+	fire_sound = 'sound/items/syringeproj.ogg'
+	slot_flags = SLOT_BELT
+	w_class = 2
@@ -0,0 +1,37 @@
+/obj/item/projectile/bullet/reusable
+	name = "reusable bullet"
+	desc = "How do you even reuse a bullet?"
+	var/obj/item/ammo_casing/caseless/ammo_type = /obj/item/ammo_casing/caseless/
+
+/obj/item/projectile/bullet/reusable/on_hit(var/atom/target, var/blocked = 0)
+	if(!proj_hit)
+		proj_hit = 1
+		new ammo_type(src.loc)
+	..()
+
+/obj/item/projectile/bullet/reusable/on_range()
+	if(!proj_hit)
+		new ammo_type(src.loc)
+		..()
+
+/obj/item/projectile/bullet/reusable/magspear
+	name = "magnetic spear"
+	desc = "WHITE WHALE, HOLY GRAIL"
+	damage = 30 //takes 3 spears to kill a mega carp, one to kill a normal carp
+	icon_state = "magspear"
+	ammo_type = /obj/item/ammo_casing/caseless/magspear
+
+/obj/item/projectile/bullet/reusable/foam_dart
+	name = "foam dart"
+	desc = "I hope you're wearing eye protection."
+	damage = 0 // It's a damn toy.
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "foamdart"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+	range = 10
+
+/obj/item/projectile/bullet/reusable/foam_dart/riot
+	name = "riot foam dart"
+	icon_state = "foamdart_riot"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+	stamina = 24
@@ -197,21 +197,4 @@ obj/item/projectile/kinetic/New()

 /obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0)
 	explosion(target, -1, 0, 1)
-	return 1
-
-/obj/item/projectile/bullet/magspear
-	name = "magnetic spear"
-	desc = "WHITE WHALE, HOLY GRAIL"
-	damage = 30 //takes 3 spears to kill a mega carp, one to kill a normal carp
-	icon_state = "magspear"
-
-/obj/item/projectile/bullet/magspear/on_hit(var/atom/target, var/blocked = 0)
-	if(!proj_hit)
-		proj_hit = 1
-		new /obj/item/ammo_casing/caseless/magspear(src.loc)
-	..()
-
-/obj/item/projectile/bullet/magspear/on_range()
-	if(!proj_hit)
-		new /obj/item/ammo_casing/caseless/magspear(src.loc)
-		..()
+	return 1