diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 642cc7e78c1..e4557e12f48 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1312,3 +1312,37 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/lipstick/random) cost = 30 //Lots of very expensive items. You gotta pay up to look good! containername = "formal-wear crate" + +/datum/supply_packs/misc/teamcolors //For team sports like space polo + name = "Team Jerseys Crate" + // 4 red jerseys, 4 blue jerseys, and 1 beach ball + contains = list(/obj/item/clothing/under/color/red/jersey, + /obj/item/clothing/under/color/red/jersey, + /obj/item/clothing/under/color/red/jersey, + /obj/item/clothing/under/color/red/jersey, + /obj/item/clothing/under/color/blue/jersey, + /obj/item/clothing/under/color/blue/jersey, + /obj/item/clothing/under/color/blue/jersey, + /obj/item/clothing/under/color/blue/jersey, + /obj/item/weapon/beach_ball) + cost = 15 + containername = "team jerseys crate" + +/datum/supply_packs/misc/polo //For space polo! Or horsehead Quiditch + name = "Polo Supply Crate" + // 6 brooms, 6 horse masks for the brooms, and 1 beach ball + contains = list(/obj/item/weapon/twohanded/staff/broom, + /obj/item/weapon/twohanded/staff/broom, + /obj/item/weapon/twohanded/staff/broom, + /obj/item/weapon/twohanded/staff/broom, + /obj/item/weapon/twohanded/staff/broom, + /obj/item/weapon/twohanded/staff/broom, + /obj/item/clothing/mask/horsehead, + /obj/item/clothing/mask/horsehead, + /obj/item/clothing/mask/horsehead, + /obj/item/clothing/mask/horsehead, + /obj/item/clothing/mask/horsehead, + /obj/item/clothing/mask/horsehead, + /obj/item/weapon/beach_ball) + cost = 20 + containername = "polo supply crate" \ No newline at end of file diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 21a97405262..ecd89c670ea 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1044,7 +1044,7 @@ /obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/suit/poncho = 1, /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, /obj/item/clothing/accessory/blue = 1, /obj/item/clothing/accessory/red = 1, /obj/item/clothing/accessory/black = 1, /obj/item/clothing/accessory/horrible = 1, /obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1, /obj/item/clothing/under/pants/camo = 1, /obj/item/clothing/mask/bandana = 1, /obj/item/clothing/mask/bandana/black = 1) - contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1, /obj/item/clothing/mask/balaclava=1) + contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1, /obj/item/clothing/mask/balaclava=1, /obj/item/clothing/mask/horsehead = 2) premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1) refill_canister = /obj/item/weapon/vending_refill/autodrobe diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 54fbe20c87b..f3da90cfe17 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -3,7 +3,7 @@ /obj/item/clothing/under/color/random/New() ..() - var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color, /obj/item/clothing/under/color/blackf, /obj/item/clothing/under/color/blue/dodgeball, /obj/item/clothing/under/color/orange/prison, /obj/item/clothing/under/color/red/dodgeball) + var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color, /obj/item/clothing/under/color/blackf, /obj/item/clothing/under/color/blue/dodgeball, /obj/item/clothing/under/color/orange/prison, /obj/item/clothing/under/color/red/dodgeball, /obj/item/clothing/under/color/red/jersey, /obj/item/clothing/under/color/blue/jersey) var/obj/item/clothing/under/color/C = pick(typesof(/obj/item/clothing/under/color) - excluded) name = initial(C.name) icon_state = initial(C.icon_state) @@ -173,3 +173,19 @@ icon_state = "darkred" _color = "darkred" flags = ONESIZEFITSALL + +/obj/item/clothing/under/color/red/jersey + name = "red team jersey" + desc = "The jersey of the Nanotrasen Phi-ghters!" + icon_state = "redjersey" + item_state = "r_suit" + _color = "redjersey" + flags = ONESIZEFITSALL + +/obj/item/clothing/under/color/blue/jersey + name = "blue team jersey" + desc = "The jersey of the Nanotrasen Pi-rates!" + icon_state = "bluejersey" + item_state = "b_suit" + _color = "bluejersey" + flags = ONESIZEFITSALL diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index d6d6d2d42b4..b28d20830c8 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 42a26238d5b..f2c0ee0094f 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ