diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 96e9ffda5f..f1d1b94aac 100644 --- a/code/datums/supplypacks.dm +++ b/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) diff --git a/code/game/objects/items/weapons/material/foam.dm b/code/game/objects/items/weapons/material/foam.dm new file mode 100644 index 0000000000..0421161cd6 --- /dev/null +++ b/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") diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index aac0b98679..2bc8830ad8 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/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 \ No newline at end of file diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index d4a6b85f5d..8a919c98a5 100644 --- a/code/modules/materials/materials.dm +++ b/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 \ No newline at end of file diff --git a/html/changelogs/example - Copy.yml b/html/changelogs/example - Copy.yml new file mode 100644 index 0000000000..873518839e --- /dev/null +++ b/html/changelogs/example - Copy.yml @@ -0,0 +1,4 @@ +author: Zuhayr +delete-after: True +changes: + - rscadd: "Added foam weapons to cargo for LARP shenanigans." \ No newline at end of file diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index f7a49811ce..a8497c0c01 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 9ce58e8abd..a7cac5981b 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index bedfc31e58..046289248d 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 8f2bf86905..f3d2b6916c 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/polaris.dme b/polaris.dme index 3f278d9ace..0f649c1267 100644 --- a/polaris.dme +++ b/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"