diff --git a/code/citadel/cit_uniforms.dm b/code/citadel/cit_uniforms.dm index 304c093433..1e2fc3a914 100644 --- a/code/citadel/cit_uniforms.dm +++ b/code/citadel/cit_uniforms.dm @@ -6,6 +6,7 @@ item_color = "bb_turtle" body_parts_covered = CHEST|ARMS can_adjust = 1 + icon = 'icons/obj/clothing/turtlenecks.dmi' /obj/item/clothing/under/bb_sweater/black name = "black sweater" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index b9482ddd11..c4c55383f6 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -994,7 +994,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/mask/joy = 1, /obj/item/clothing/head/cueball = 1, /obj/item/clothing/under/scratch = 1, - /obj/item/clothing/under/sailor = 1) + /obj/item/clothing/under/sailor = 1, + /obj/item/clothing/head/clownpiece = 1,/obj/item/clothing/under/clownpiece = 1, /obj/item/clothing/suit/clownpiece = 1) contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 2,/obj/item/clothing/glasses/sunglasses/garb = 2, /obj/item/clothing/glasses/sunglasses/blindfold = 1, /obj/item/clothing/mask/muzzle = 2) premium = list(/obj/item/clothing/suit/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, /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, /obj/item/weapon/shield/riot/roman = 1, /obj/item/weapon/skub = 1) refill_canister = /obj/item/weapon/vending_refill/autodrobe @@ -1118,8 +1119,23 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/head/beanie=1, /obj/item/clothing/head/beanie/black=1, /obj/item/clothing/head/beanie/red=1, /obj/item/clothing/head/beanie/green=1, /obj/item/clothing/head/beanie/darkblue=1, /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) - 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/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/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, + /obj/item/clothing/under/wedding/bride_blue=1, + /obj/item/clothing/under/wedding/bride_red=1, + /obj/item/clothing/under/wedding/bride_white=1, + /obj/item/clothing/under/keyholesweater=1) premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/neck/necklace/dope=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1) refill_canister = /obj/item/weapon/vending_refill/clothing diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 74ab7be4b6..0c0a3d804a 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -63,11 +63,11 @@ /obj/item/weapon/vending_refill/autodrobe machine_name = "AutoDrobe" icon_state = "refill_costume" - charges = list(31, 2, 3)// of 94 standard, 6 contraband, 9 premium - init_charges = list(27, 2, 3) + charges = list(33, 2, 3)// of 97 standard, 6 contraband, 9 premium + init_charges = list(33, 2, 3) /obj/item/weapon/vending_refill/clothing machine_name = "ClothesMate" icon_state = "refill_clothes" - charges = list(31, 4, 4)// of 101 standard, 12 contraband, 10 premium(?) - init_charges = list(31, 4, 4) + charges = list(39, 7, 4)// of 115 standard, 18 contraband, 10 premium(?) + init_charges = list(39, 7, 4) diff --git a/code/modules/cargo/vg_clothing_packs.dm b/code/modules/cargo/vg_clothing_packs.dm new file mode 100644 index 0000000000..315d8b9ba4 --- /dev/null +++ b/code/modules/cargo/vg_clothing_packs.dm @@ -0,0 +1,33 @@ +/datum/supply_pack/misc/vidyacon + name = "Vidya-Con Surplus Crate" + cost = 3250 + contains = list(/obj/item/clothing/shoes/megaboots,/obj/item/clothing/gloves/megagloves,/obj/item/clothing/head/helmet/megahelmet, /obj/item/clothing/under/mega, + /obj/item/clothing/shoes/protoboots,/obj/item/clothing/gloves/protogloves,/obj/item/clothing/head/helmet/protohelmet,/obj/item/clothing/under/proto, + /obj/item/clothing/shoes/megaxboots,/obj/item/clothing/gloves/megaxgloves,/obj/item/clothing/head/helmet/megaxhelmet,/obj/item/clothing/under/megax, + /obj/item/clothing/shoes/joeboots,/obj/item/clothing/gloves/joegloves,/obj/item/clothing/head/helmet/joehelmet,/obj/item/clothing/under/joe, + /obj/item/clothing/under/roll, + /obj/item/clothing/head/helmet/biker,/obj/item/clothing/under/bikersuit,/obj/item/clothing/gloves/bikergloves, + /obj/item/clothing/under/jacketsuit,/obj/item/clothing/head/helmet/richard, + /obj/item/clothing/under/vault13) + crate_name = "vidya-con surplus crate" + + +datum/supply_pack/misc/memes + name = "Nanotrasen Approved Internet Humor Crate" + cost = 5000 + contains = list(/obj/item/clothing/suit/doshjacket, + /obj/item/clothing/under/squatter_outfit,/obj/item/clothing/head/squatter_hat, + /obj/item/clothing/under/cia, + /obj/item/clothing/under/russobluecamooutfit,/obj/item/clothing/head/russobluecamohat, + /obj/item/clothing/under/rottensuit,/obj/item/clothing/shoes/rottenshoes, + /obj/item/clothing/suit/raincoat) + crate_name = "nanotrasen internet humor crate" + +datum/supply_pack/misc/reenactor + name = "Historical Reanactor Crate" + cost = 17500 + contains = list(/obj/item/clothing/under/soldieruniform,/obj/item/clothing/head/stalhelm,/obj/item/clothing/suit/soldiercoat, + /obj/item/clothing/under/officeruniform,/obj/item/clothing/head/naziofficer,/obj/item/clothing/suit/officercoat, + /obj/item/clothing/head/panzer, + /obj/item/clothing/suit/russofurcoat,/obj/item/clothing/head/russofurhat,/obj/item/clothing/under/soviet) + crate_name = "historical reanactor crate" \ No newline at end of file diff --git a/code/modules/clothing/suits/vg_suits.dm b/code/modules/clothing/suits/vg_suits.dm index a9c2f441d3..30d501e5d0 100644 --- a/code/modules/clothing/suits/vg_suits.dm +++ b/code/modules/clothing/suits/vg_suits.dm @@ -7,12 +7,14 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS armor = list(melee = 10, bullet = 50, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.5 + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/armor/xcomsquaddie/dredd name = "Judge Armor" desc = "A large suit of heavy armor, fit for a Judge." icon_state = "dredd-suit" item_state = "dredd-suit" + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/armor/xcomarmor @@ -24,12 +26,14 @@ armor = list(melee = 50, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) slowdown = 1 siemens_coefficient = 0.5 + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/armor/vest/neorussian name = "neo-Russian vest" desc = "The narkotiki camo pattern will come useful for botany raids." icon_state = "nr_vest" item_state = "nr_vest" + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/armor/doomguy name = "Doomguy's armor" @@ -39,6 +43,7 @@ body_parts_covered = CHEST|GROIN slowdown = 0 armor = list(melee = 50, bullet = 30, laser = 20, energy = 20, bomb = 30, bio = 0, rad = 0) + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/kaminacape @@ -46,18 +51,21 @@ desc = "Don't believe in yourself, dumbass. Believe in me. Believe in the Kamina who believes in you." icon_state = "kaminacape" body_parts_covered = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/officercoat name = "Officer's Coat" desc = "Ein Mantel gemacht, um die Juden zu bestrafen." icon_state = "officersuit" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/soldiercoat name = "Soldier's Coat" desc = "Und das heißt: Erika." icon_state = "soldiersuit" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/russofurcoat name = "russian fur coat" @@ -65,351 +73,40 @@ icon_state = "russofurcoat" allowed = list(/obj/item/weapon/gun) body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/doshjacket name = "Plasterer's Jacket" desc = "Perfect for doing up the house." icon_state = "doshjacket" body_parts_covered = CHEST|GROIN|ARMS + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/maidapron name = "Apron" desc = "Simple white apron." icon_state = "maidapron" body_parts_covered = CHEST|GROIN + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/clownpiece name = "small fairy wings" desc = "Some small and translucid insect-like wings." icon_state = "clownpiece" body_parts_covered = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/clownpiece/flying name = "small fairy wings" desc = "Some small and translucid insect-like wings. Looks like these are the real deal!" icon_state = "clownpiece-fly" + icon = 'icons/obj/clothing/vg_clothes.dmi' /obj/item/clothing/suit/raincoat name = "Raincoat" desc = "Do you like Huey Lewis and the News?" icon_state = "raincoat" body_parts_covered =CHEST|GROIN|LEGS|ARMS|HANDS + icon = 'icons/obj/clothing/vg_clothes.dmi' -/obj/item/clothing/under/stripper_pink - name = "pink stripper outfit" - icon_state = "stripper_p" - item_state = "stripper_p" - item_color = "stripper_p" - can_adjust = 0 - -/obj/item/clothing/under/stripper_green - name = "green stripper outfit" - icon_state = "stripper_g" - item_state = "stripper_g" - item_color = "stripper_g" - can_adjust = 0 - - -/obj/item/clothing/under/wedding/bride_orange - name = "orange wedding dress" - desc = "A big and puffy orange dress." - icon_state = "bride_orange" - item_state = "bride_orange" - item_color = "bride_orange" - can_adjust = 0 - -/obj/item/clothing/under/wedding/bride_purple - name = "purple wedding dress" - desc = "A big and puffy purple dress." - icon_state = "bride_purple" - item_state = "bride_purple" - item_color = "bride_purple" - can_adjust = 0 - -/obj/item/clothing/under/wedding/bride_blue - name = "blue wedding dress" - desc = "A big and puffy blue dress." - icon_state = "bride_blue" - item_state = "bride_blue" - item_color = "bride_blue" - can_adjust = 0 - -/obj/item/clothing/under/wedding/bride_red - name = "red wedding dress" - desc = "A big and puffy red dress." - icon_state = "bride_red" - item_state = "bride_red" - item_color = "bride_red" - can_adjust = 0 - -/obj/item/clothing/under/wedding/bride_white - name = "white wedding dress" - desc = "A white wedding gown made from the finest silk." - icon_state = "bride_white" - item_state = "bride_white" - item_color = "bride_white" - can_adjust = 0 - -/obj/item/clothing/under/mankini - name = "pink mankini" - icon_state = "mankini" - item_state = "mankini" - item_color = "mankini" - can_adjust = 0 - -/obj/item/clothing/under/psysuit - name = "dark undersuit" - desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." - icon_state = "psysuit" - item_state = "psysuit" - item_color = "psysuit" - can_adjust = 0 - -/obj/item/clothing/under/officeruniform - name = "officer's uniform" - desc = "Bestraft die Juden fur ihre Verbrechen." - icon_state = "officeruniform" - item_state = "officeruniform" - item_color = "officeruniform" - can_adjust = 0 - -/obj/item/clothing/under/soldieruniform - name = "soldier's uniform" - desc = "Bestraft die Verbundeten fur ihren Widerstand." - icon_state = "soldieruniform" - item_state = "soldieruniform" - item_color = "soldieruniform" - can_adjust = 0 - -/obj/item/clothing/under/squatter_outfit - name = "slav squatter tracksuit" - desc = "Cyka blyat." - icon_state = "squatteroutfit" - item_state = "squatteroutfit" - item_color = "squatteroutfit" - can_adjust = 0 - -/obj/item/clothing/under/russobluecamooutfit - name = "russian blue camo" - desc = "Drop and give me dvadtsat!" - icon_state = "russobluecamo" - item_state = "russobluecamo" - item_color = "russobluecamo" - can_adjust = 0 - -/obj/item/clothing/under/stilsuit - name = "stillsuit" - desc = "Designed to preserve bodymoisture." - icon_state = "stilsuit" - item_state = "stilsuit" - item_color = "stilsuit" - can_adjust = 0 - -/obj/item/clothing/under/aviatoruniform - name = "aviator uniform" - desc = "Now you can look absolutely dashing!" - icon_state = "aviator_uniform" - item_state = "aviator_uniform" - item_color = "aviator_uniform" - can_adjust = 0 - -/obj/item/clothing/under/bikersuit - name = "biker's outfit" - icon_state = "biker" - item_state = "biker" - item_color = "biker" - can_adjust = 0 - -/obj/item/clothing/under/jacketsuit - name = "richard's outfit" - desc = "Do you know what time it is?" - icon_state = "jacket" - item_state = "jacket" - item_color = "jacket" - can_adjust = 0 - -obj/item/clothing/under/mega - name = "\improper DRN-001 suit" - desc = "The original. Simple, yet very adaptable." - icon_state = "mega" - item_state = "mega" - item_color = "mega" - can_adjust = 0 - -/obj/item/clothing/under/proto - name = "The Prototype Suit" - desc = "Even robots know scarves are the perfect accessory for a brooding rival." - icon_state = "proto" - item_state = "proto" - item_color = "proto" - can_adjust = 0 - -/obj/item/clothing/under/megax - name = "\improper Maverick Hunter regalia" - desc = "The best outfit for taking out rogue borgs." - icon_state = "megax" - item_state = "megax" - item_color = "megax" - can_adjust = 0 - -/obj/item/clothing/under/joe - name = "The Sniper Suit" - desc = "Mass produced combat robots with a rather unfitting name." - icon_state = "joe" - item_state = "joe" - item_color = "joe" - can_adjust = 0 - -/obj/item/clothing/under/roll - name = "\improper DRN-002 Dress" - desc = "A simple red dress, the good doctor's second robot wasn't quite as exciting as the first." - icon_state = "roll" - item_state = "roll" - item_color = "roll" - can_adjust = 0 - -/obj/item/clothing/under/gokugidown - name = "turtle hermit undershirt" - desc = "Something seems oddly familiar about this outfit..." - icon_state = "gokugidown" - item_state = "gokugidown" - item_color = "gokugidown" - can_adjust = 0 - -/obj/item/clothing/under/gokugi - name = "turtle hermit outfit" - desc = "An outfit from one trained by the great Turtle Hermit." - icon_state = "gokugi" - item_state = "gokugi" - item_color = "gokugi" - can_adjust = 0 - -/obj/item/clothing/under/doomguy - name = "\improper Doomguy's pants" - desc = "" - icon_state = "doom" - item_state = "doom" - item_color = "doom" - can_adjust = 0 - -/obj/item/clothing/under/vault13 - name = "vault 13 Jumpsuit" - desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it. Has a large thirteen emblazened on the back." - icon_state = "v13-jumpsuit" - item_state = "v13-jumpsuit" - item_color = "v13-jumpsuit" - can_adjust = 0 - -/obj/item/clothing/under/vault - name = "vault jumpsuit" - desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it." - icon_state = "v-jumpsuit" - item_state = "v-jumpsuit" - item_color = "v-jumpsuit" - can_adjust = 0 - -/obj/item/clothing/under/clownpiece - name = "Clownpiece's Pierrot suit" - desc = "A female-sized set of leggings and shirt with a pattern similar to the American flag, featuring a frilled collar." - icon_state = "clownpiece" - item_state = "clownpiece" - item_color = "clownpiece" - can_adjust = 0 - -/obj/item/clothing/under/cia - name = "casual IAA outfit" - desc = "Just looking at this makes you feel in charge." - icon_state = "cia" - item_state = "cia" - item_color = "cia" - can_adjust = 0 - -/obj/item/clothing/under/greaser - name = "greaser outfit" - desc = "The one that you want!" - icon_state = "greaser_default" - item_state = "greaser_default" - can_adjust = 0 - -/obj/item/clothing/under/greaser/New() - var/greaser_colour = "default" - switch(rand(1,4)) - if(1) - greaser_colour = "default" - if(2) - greaser_colour = "cult" - if(3) - greaser_colour = "spider" - if(4) - greaser_colour = "snakes" - desc = "Tunnel Snakes Rule!" - icon_state = "greaser_[greaser_colour]" - item_state = "greaser_[greaser_colour]" - item_color = "greaser_[greaser_colour]" - can_adjust = 0 - -/obj/item/clothing/under/wintercasualwear - name = "winter casualwear" - desc = "Perfect for winter!" - icon_state = "shizunewinter" - item_state = "shizunewinter" - item_color = "shizunewinter" - can_adjust = 0 - - -/obj/item/clothing/under/casualwear - name = "spring casualwear" - desc = "Perfect for spring!" - icon_state = "shizunenormal" - item_state = "shizunenormal" - item_color = "shizunenormal" - can_adjust = 0 - -/obj/item/clothing/under/keyholesweater - name = "keyhole sweater" - desc = "What is the point of this, anyway?" - icon_state = "keyholesweater" - item_state = "keyholesweater" - item_color = "keyholesweater" - can_adjust = 0 - -/obj/item/clothing/under/casualhoodie - name = "casual hoodie" - desc = "Pefect for lounging about in." - icon_state = "hoodiejeans" - item_state = "hoodiejeans" - item_color = "hoodiejeans" - can_adjust = 0 - - -/obj/item/clothing/under/casualhoodie/skirt - icon_state = "hoodieskirt" - item_state = "hoodieskirt" - item_color = "hoodieskirt" - can_adjust = 0 - -/obj/item/clothing/under/mummy_rags - name = "mummy rags" - desc = "Ancient rags taken off from some mummy." - icon_state = "mummy" - item_state = "mummy" - item_color = "mummy" - can_adjust = 0 - has_sensor = 0 - -/obj/item/clothing/under/neorussian - name = "neo-Russian uniform" - desc = "Employs a special toshnit pattern, will render you invisible when you eat a potato on an empty stomach." - icon_state = "nr_uniform" - item_state = "nr_uniform" - item_color = "nr_uniform" - can_adjust = 0 - -/obj/item/clothing/under/rottensuit - name = "rotten suit" - desc = "This suit seems perfect for wearing underneath a disguise." - icon_state = "rottensuit" - item_state = "rottensuit" - item_color = "rottensuit" - can_adjust = 0 \ No newline at end of file diff --git a/code/modules/clothing/under/vg_under.dm b/code/modules/clothing/under/vg_under.dm new file mode 100644 index 0000000000..e2d8e4c71f --- /dev/null +++ b/code/modules/clothing/under/vg_under.dm @@ -0,0 +1,356 @@ +/obj/item/clothing/under/stripper_pink + name = "pink stripper outfit" + icon_state = "stripper_p" + item_state = "stripper_p" + item_color = "stripper_p" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/stripper_green + name = "green stripper outfit" + icon_state = "stripper_g" + item_state = "stripper_g" + item_color = "stripper_g" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + + +/obj/item/clothing/under/wedding/bride_orange + name = "orange wedding dress" + desc = "A big and puffy orange dress." + icon_state = "bride_orange" + item_state = "bride_orange" + item_color = "bride_orange" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/wedding/bride_purple + name = "purple wedding dress" + desc = "A big and puffy purple dress." + icon_state = "bride_purple" + item_state = "bride_purple" + item_color = "bride_purple" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/wedding/bride_blue + name = "blue wedding dress" + desc = "A big and puffy blue dress." + icon_state = "bride_blue" + item_state = "bride_blue" + item_color = "bride_blue" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/wedding/bride_red + name = "red wedding dress" + desc = "A big and puffy red dress." + icon_state = "bride_red" + item_state = "bride_red" + item_color = "bride_red" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/wedding/bride_white + name = "white wedding dress" + desc = "A white wedding gown made from the finest silk." + icon_state = "bride_white" + item_state = "bride_white" + item_color = "bride_white" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/mankini + name = "pink mankini" + icon_state = "mankini" + item_state = "mankini" + item_color = "mankini" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/psysuit + name = "dark undersuit" + desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." + icon_state = "psysuit" + item_state = "psysuit" + item_color = "psysuit" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/officeruniform + name = "officer's uniform" + desc = "Bestraft die Juden fur ihre Verbrechen." + icon_state = "officeruniform" + item_state = "officeruniform" + item_color = "officeruniform" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/soldieruniform + name = "soldier's uniform" + desc = "Bestraft die Verbundeten fur ihren Widerstand." + icon_state = "soldieruniform" + item_state = "soldieruniform" + item_color = "soldieruniform" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/squatter_outfit + name = "slav squatter tracksuit" + desc = "Cyka blyat." + icon_state = "squatteroutfit" + item_state = "squatteroutfit" + item_color = "squatteroutfit" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/russobluecamooutfit + name = "russian blue camo" + desc = "Drop and give me dvadtsat!" + icon_state = "russobluecamo" + item_state = "russobluecamo" + item_color = "russobluecamo" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/stilsuit + name = "stillsuit" + desc = "Designed to preserve bodymoisture." + icon_state = "stilsuit" + item_state = "stilsuit" + item_color = "stilsuit" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/aviatoruniform + name = "aviator uniform" + desc = "Now you can look absolutely dashing!" + icon_state = "aviator_uniform" + item_state = "aviator_uniform" + item_color = "aviator_uniform" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/bikersuit + name = "biker's outfit" + icon_state = "biker" + item_state = "biker" + item_color = "biker" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/jacketsuit + name = "richard's outfit" + desc = "Do you know what time it is?" + icon_state = "jacket" + item_state = "jacket" + item_color = "jacket" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +obj/item/clothing/under/mega + name = "\improper DRN-001 suit" + desc = "The original. Simple, yet very adaptable." + icon_state = "mega" + item_state = "mega" + item_color = "mega" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/proto + name = "The Prototype Suit" + desc = "Even robots know scarves are the perfect accessory for a brooding rival." + icon_state = "proto" + item_state = "proto" + item_color = "proto" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/megax + name = "\improper Maverick Hunter regalia" + desc = "The best outfit for taking out rogue borgs." + icon_state = "megax" + item_state = "megax" + item_color = "megax" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/joe + name = "The Sniper Suit" + desc = "Mass produced combat robots with a rather unfitting name." + icon_state = "joe" + item_state = "joe" + item_color = "joe" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/roll + name = "\improper DRN-002 Dress" + desc = "A simple red dress, the good doctor's second robot wasn't quite as exciting as the first." + icon_state = "roll" + item_state = "roll" + item_color = "roll" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/gokugidown + name = "turtle hermit undershirt" + desc = "Something seems oddly familiar about this outfit..." + icon_state = "gokugidown" + item_state = "gokugidown" + item_color = "gokugidown" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/gokugi + name = "turtle hermit outfit" + desc = "An outfit from one trained by the great Turtle Hermit." + icon_state = "gokugi" + item_state = "gokugi" + item_color = "gokugi" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/doomguy + name = "\improper Doomguy's pants" + desc = "" + icon_state = "doom" + item_state = "doom" + item_color = "doom" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/vault13 + name = "vault 13 Jumpsuit" + desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it. Has a large thirteen emblazened on the back." + icon_state = "v13-jumpsuit" + item_state = "v13-jumpsuit" + item_color = "v13-jumpsuit" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/vault + name = "vault jumpsuit" + desc = "Oddly similar to the station's usual jumpsuits, but with a rustic charm to it." + icon_state = "v-jumpsuit" + item_state = "v-jumpsuit" + item_color = "v-jumpsuit" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/clownpiece + name = "Clownpiece's Pierrot suit" + desc = "A female-sized set of leggings and shirt with a pattern similar to the American flag, featuring a frilled collar." + icon_state = "clownpiece" + item_state = "clownpiece" + item_color = "clownpiece" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/cia + name = "casual IAA outfit" + desc = "Just looking at this makes you feel in charge." + icon_state = "cia" + item_state = "cia" + item_color = "cia" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/greaser + name = "greaser outfit" + desc = "The one that you want!" + icon_state = "greaser_default" + item_state = "greaser_default" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/greaser/New() + var/greaser_colour = "default" + switch(rand(1,4)) + if(1) + greaser_colour = "default" + if(2) + greaser_colour = "cult" + if(3) + greaser_colour = "spider" + if(4) + greaser_colour = "snakes" + desc = "Tunnel Snakes Rule!" + icon_state = "greaser_[greaser_colour]" + item_state = "greaser_[greaser_colour]" + item_color = "greaser_[greaser_colour]" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/wintercasualwear + name = "winter casualwear" + desc = "Perfect for winter!" + icon_state = "shizunewinter" + item_state = "shizunewinter" + item_color = "shizunewinter" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + + +/obj/item/clothing/under/casualwear + name = "spring casualwear" + desc = "Perfect for spring!" + icon_state = "shizunenormal" + item_state = "shizunenormal" + item_color = "shizunenormal" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/keyholesweater + name = "keyhole sweater" + desc = "What is the point of this, anyway?" + icon_state = "keyholesweater" + item_state = "keyholesweater" + item_color = "keyholesweater" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/casualhoodie + name = "casual hoodie" + desc = "Pefect for lounging about in." + icon_state = "hoodiejeans" + item_state = "hoodiejeans" + item_color = "hoodiejeans" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + + +/obj/item/clothing/under/casualhoodie/skirt + icon_state = "hoodieskirt" + item_state = "hoodieskirt" + item_color = "hoodieskirt" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/mummy_rags + name = "mummy rags" + desc = "Ancient rags taken off from some mummy." + icon_state = "mummy" + item_state = "mummy" + item_color = "mummy" + can_adjust = 0 + has_sensor = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/neorussian + name = "neo-Russian uniform" + desc = "Employs a special toshnit pattern, will render you invisible when you eat a potato on an empty stomach." + icon_state = "nr_uniform" + item_state = "nr_uniform" + item_color = "nr_uniform" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' + +/obj/item/clothing/under/rottensuit + name = "rotten suit" + desc = "This suit seems perfect for wearing underneath a disguise." + icon_state = "rottensuit" + item_state = "rottensuit" + item_color = "rottensuit" + can_adjust = 0 + icon = 'icons/obj/clothing/vg_clothes.dmi' \ No newline at end of file diff --git a/html/changelogs/Tax_Master.yml b/html/changelogs/Tax_Master.yml new file mode 100644 index 0000000000..905f9bdd08 --- /dev/null +++ b/html/changelogs/Tax_Master.yml @@ -0,0 +1,35 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Tax_Master + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Due to an on-going dispute between NanoTrasen and clothing suppliers, the vending machines are not as stocked as previous shifts. To compensate, third-party suppliers are offering to sell crates of missing clothing with a 'standard' markup." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 56612cf4c4..d28ed18c8a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/turtlenecks.dmi b/icons/obj/clothing/turtlenecks.dmi new file mode 100644 index 0000000000..59b2876c0c Binary files /dev/null and b/icons/obj/clothing/turtlenecks.dmi differ diff --git a/icons/obj/clothing/vg_clothes.dmi b/icons/obj/clothing/vg_clothes.dmi index c93049fe90..a1d25aebf5 100644 Binary files a/icons/obj/clothing/vg_clothes.dmi and b/icons/obj/clothing/vg_clothes.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 2494eb4489..698b12be1b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1115,6 +1115,7 @@ #include "code\modules\cargo\exports.dm" #include "code\modules\cargo\order.dm" #include "code\modules\cargo\packs.dm" +#include "code\modules\cargo\vg_clothing_packs.dm" #include "code\modules\cargo\exports\gear.dm" #include "code\modules\cargo\exports\intel.dm" #include "code\modules\cargo\exports\large_objects.dm" @@ -1200,6 +1201,7 @@ #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\ties.dm" #include "code\modules\clothing\under\trek.dm" +#include "code\modules\clothing\under\vg_under.dm" #include "code\modules\clothing\under\jobs\civilian.dm" #include "code\modules\clothing\under\jobs\engineering.dm" #include "code\modules\clothing\under\jobs\medsci.dm"