Merge pull request #652 from Zuhayr/nerf

Added Nerf weapons to Cargo.

code/datums/supplypacks.dm

@@ -248,6 +248,23 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	containername = "Wizard costume crate"
 	group = "Miscellaneous"
 
+/datum/supply_packs/foam_weapons
+	name = "Foam Weapon Crate"
+	contains = list(
+					/obj/item/weapon/material/sword/foam,
+					/obj/item/weapon/material/sword/foam,
+					/obj/item/weapon/material/twohanded/baseballbat/foam,
+					/obj/item/weapon/material/twohanded/baseballbat/foam,
+					/obj/item/weapon/material/twohanded/spear/foam,
+					/obj/item/weapon/material/twohanded/spear/foam,
+					/obj/item/weapon/material/twohanded/fireaxe/foam,
+					/obj/item/weapon/material/twohanded/fireaxe/foam
+					)
+	cost = 80
+	containertype = /obj/structure/closet/crate
+	containername = "foam weapon crate"
+	group = "Miscellaneous"
+
 /datum/supply_packs/mule
 	name = "MULEbot Crate"
 	contains = list(/obj/machinery/bot/mulebot)

code/game/objects/items/weapons/material/foam.dm

@@ -0,0 +1,40 @@
+/obj/item/weapon/material/twohanded/baseballbat/foam/New(var/newloc)
+	..(newloc,"foam")
+
+/obj/item/weapon/material/sword/foam
+	attack_verb = list("bonked","whacked")
+	force_divisor = 0
+	unbreakable = 1
+
+/obj/item/weapon/material/twohanded/baseballbat/foam
+	attack_verb = list("bonked","whacked")
+	force_wielded = 0
+	force_divisor = 0
+	unbreakable = 1
+
+/obj/item/weapon/material/sword/foam/New(var/newloc)
+	..(newloc,"foam")
+
+/obj/item/weapon/material/twohanded/spear/foam
+	attack_verb = list("bonked","whacked")
+	force_wielded = 0
+	force_divisor = 0
+	applies_material_colour = 1
+	base_icon = "spear_mask"
+	icon_state = "spear_mask0"
+	unbreakable = 1
+
+/obj/item/weapon/material/twohanded/spear/foam/New(var/newloc)
+	..(newloc,"foam")
+
+/obj/item/weapon/material/twohanded/fireaxe/foam
+	attack_verb = list("bonked","whacked")
+	force_wielded = 0
+	force_divisor = 0
+	applies_material_colour = 1
+	base_icon = "fireaxe_mask"
+	icon_state = "fireaxe_mask0"
+	unbreakable = 1
+
+/obj/item/weapon/material/twohanded/fireaxe/foam/New(var/newloc)
+	..(newloc,"foam")

code/game/objects/items/weapons/material/twohanded.dm

@@ -194,3 +194,4 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	default_material = "glass"
+	applies_material_colour = 0

code/modules/materials/materials.dm

@@ -745,3 +745,14 @@ var/list/name_to_material
 	flags = MATERIAL_PADDING
 	ignition_point = T0C+232
 	melting_point = T0C+300
+
+/material/toy_foam
+	name = "foam"
+	display_name = "foam"
+	use_name = "foam"
+	flags = MATERIAL_PADDING
+	ignition_point = T0C+232
+	melting_point = T0C+300
+	icon_colour = "#ff9900"
+	hardness = 1
+	weight = 1

html/changelogs/example - Copy.yml

@@ -0,0 +1,4 @@
+author: Zuhayr
+delete-after: True
+changes: 
+  - rscadd: "Added foam weapons to cargo for LARP shenanigans."

polaris.dme

@@ -758,6 +758,7 @@
 #include "code\game\objects\items\weapons\implants\implantuplink.dm"
 #include "code\game\objects\items\weapons\material\ashtray.dm"
 #include "code\game\objects\items\weapons\material\bats.dm"
+#include "code\game\objects\items\weapons\material\foam.dm"
 #include "code\game\objects\items\weapons\material\kitchen.dm"
 #include "code\game\objects\items\weapons\material\knives.dm"
 #include "code\game\objects\items\weapons\material\material_weapons.dm"