diff --git a/code/citadel/cit_uniforms.dm b/code/citadel/cit_uniforms.dm new file mode 100644 index 0000000000..304c093433 --- /dev/null +++ b/code/citadel/cit_uniforms.dm @@ -0,0 +1,38 @@ +/obj/item/clothing/under/bb_sweater + name = "cream sweater" + desc = "Why trade style for comfort? Now you can go commando down south and still be cozy up north." + icon_state = "bb_turtle" + item_state = "w_suit" + item_color = "bb_turtle" + body_parts_covered = CHEST|ARMS + can_adjust = 1 + +/obj/item/clothing/under/bb_sweater/black + name = "black sweater" + icon_state = "bb_turtleblk" + item_state = "bl_suit" + item_color = "bb_turtleblk" + +/obj/item/clothing/under/bb_sweater/purple + name = "purple sweater" + icon_state = "bb_turtlepur" + item_state = "p_suit" + item_color = "bb_turtlepur" + +/obj/item/clothing/under/bb_sweater/green + name = "green sweater" + icon_state = "bb_turtlegrn" + item_state = "g_suit" + item_color = "bb_turtlegrn" + +/obj/item/clothing/under/bb_sweater/red + name = "red sweater" + icon_state = "bb_turtlered" + item_state = "r_suit" + item_color = "bb_turtlered" + +/obj/item/clothing/under/bb_sweater/blue + name = "blue sweater" + icon_state = "bb_turtleblu" + item_state = "b_suit" + item_color = "bb_turtleblu" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index ab7154acd6..1c8272d967 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1082,7 +1082,12 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/head/beanie/purple=1, /obj/item/clothing/head/beanie/yellow=1, /obj/item/clothing/head/beanie/orange=1, /obj/item/clothing/head/beanie/cyan=1, /obj/item/clothing/head/beanie/christmas=1, /obj/item/clothing/head/beanie/striped=1, /obj/item/clothing/head/beanie/stripedred=1, /obj/item/clothing/head/beanie/stripedblue=1, /obj/item/clothing/head/beanie/stripedgreen=1, /obj/item/clothing/suit/jacket/letterman_red=1, /obj/item/clothing/under/wintercasualwear=1, /obj/item/clothing/under/casualwear=1, /obj/item/clothing/under/casualhoodie=1, - /obj/item/clothing/under/casualhoodie/skirt=1) + /obj/item/clothing/under/casualhoodie/skirt=1, + /obj/item/clothing/under/bb_sweater=2, + /obj/item/clothing/under/bb_sweater/blue=2, + /obj/item/clothing/under/bb_sweater/green=2, + /obj/item/clothing/under/bb_sweater/purple =2, + /obj/item/clothing/under/bb_sweater/red=2) contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2,/obj/item/clothing/suit/jacket/letterman_syndie=1,/obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1, /obj/item/clothing/under/wedding/bride_orange=1, /obj/item/clothing/under/wedding/bride_purple=1, diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 7677d9005d..2f995b9c12 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -30,7 +30,7 @@ user << "It's empty!" //NOTE I decided to go for about 1/3 of a machine's capacity - +//^ Your ideas suck. Why not just make it automatic? /obj/item/weapon/vending_refill/boozeomat machine_name = "Booze-O-Mat" icon_state = "refill_booze" @@ -69,8 +69,8 @@ /obj/item/weapon/vending_refill/clothing machine_name = "ClothesMate" icon_state = "refill_clothes" - charges = list(35, 13, 4)// of 101 standard, 12 contraband, 10 premium(?) - init_charges = list(35, 13, 4) + charges = list(42, 13, 4)// of 109 standard, 12 contraband, 10 premium(?) (someone fucked this number up, who wants to recount?) + init_charges = list(42, 13, 4) /obj/item/weapon/vending_refill/kink machine_name = "KinkMate" diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 0114e13b11..1e5b3dae9b 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 430aadb50c..5e57721ef9 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 8ce88e07c6..275c8d1dba 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -147,6 +147,7 @@ #include "code\citadel\cit_areas.dm" #include "code\citadel\cit_arousal.dm" #include "code\citadel\cit_reagents.dm" +#include "code\citadel\cit_uniforms.dm" #include "code\citadel\discordbot.dm" #include "code\citadel\kegs.dm" #include "code\controllers\admin.dm"