diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a75331692c..9d82b1821b 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -67,6 +67,36 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO rolled_sleeves = -1 //Please never +/obj/item/clothing/under/clown //i'm only putting it here to make subtypes of it, since the original suit is under/rank/clown + name = "clown suit" + desc = "Honk!" + icon_state = "clown" + rolled_sleeves = -1 + +/obj/item/clothing/under/clown/green + name = "green clown suit" + icon_state = "greenclown" + +/obj/item/clothing/under/clown/purple + name = "purple clown suit" + icon_state = "purpleclown" + +/obj/item/clothing/under/clown/yellow + name = "yellow clown suit" + icon_state = "yellowclown" + +/obj/item/clothing/under/clown/orange + name = "orange clown suit" + icon_state = "orangeclown" + +/obj/item/clothing/under/clown/blue + name = "blue clown suit" + icon_state = "blueclown" + +/obj/item/clothing/under/clown/rainbow + name = "rainbow clown suit" + icon_state = "rainbowclown" + /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision." @@ -244,6 +274,11 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO rolled_sleeves = -1 //Please never +/obj/item/clothing/under/sexymime/dress //another style of dress closer to the jumpsuit than the sexy outfit + name = "mime's jumpskirt" + desc = "It's not very colourful." + icon_state = "mimedress" + /obj/item/clothing/under/gladiator name = "gladiator uniform" desc = "Are you not entertained? Is that not why you are here?" diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index a55a2753a6..f9ddbbf897 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1538,3 +1538,53 @@ ) req_log_access = access_hop has_logs = 1 +<<<<<<< HEAD +======= + +/obj/machinery/vending/wardrobe/mimedrobe + name = "mime wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "..." + icon_state = "mimedrobe" + req_access = list(access_mime) + products = list( + /obj/item/clothing/under/mime = 1, + /obj/item/clothing/under/sexymime = 1, + /obj/item/clothing/under/sexymime/dress = 1, + /obj/item/clothing/mask/gas/mime = 1, + /obj/item/clothing/mask/gas/sexymime = 1, + /obj/item/clothing/head/soft/mime = 1, + /obj/item/clothing/head/collectable/beret = 1, + /obj/item/clothing/suit/suspenders = 1, + /obj/item/clothing/shoes/mime = 1 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/clowndrobe + name = "clown wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Honk!" + icon_state = "clowndrobe" + req_access = list(access_clown) + products = list( + /obj/item/clothing/under/rank/clown = 1, + /obj/item/clothing/under/sexyclown = 1, + /obj/item/clothing/under/clown/green = 1, + /obj/item/clothing/under/clown/purple = 1, + /obj/item/clothing/under/clown/yellow = 1, + /obj/item/clothing/under/clown/orange = 1, + /obj/item/clothing/under/clown/blue = 1, + /obj/item/clothing/mask/gas/clown_hat = 1, + /obj/item/clothing/mask/gas/sexyclown = 1, + /obj/item/clothing/mask/emotions = 1, + /obj/item/clothing/shoes/clown_shoes = 1, + /obj/item/weapon/reagent_containers/food/snacks/pie = 5, + /obj/item/weapon/bananapeel = 5 + ) + contraband = list( + /obj/item/clothing/under/clown/rainbow = 1 + ) + req_log_access = access_hop + has_logs = 1 +>>>>>>> 5bbe05dde3... Merge pull request #11817 from PastelPrinceDan/mimenclown diff --git a/icons/obj/vending_job.dmi b/icons/obj/vending_job.dmi index 77d22e3dd1..b0398272ff 100644 Binary files a/icons/obj/vending_job.dmi and b/icons/obj/vending_job.dmi differ diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index 4b2c636014..fbdd9ade8c 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -276,6 +276,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) +"bB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardcent) "bC" = ( /obj/structure/closet/crate, /obj/random/maintenance, @@ -430,13 +438,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) "ch" = ( -/obj/structure/table/rack/shelf, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/drinkbottle, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/vending/wardrobe/mimedrobe, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "ci" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/blue{ @@ -1318,6 +1322,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportroomb) +"fj" = ( +/obj/structure/table/woodentable, +/obj/item/toy/figure/clown, +/obj/item/weapon/pen/crayon/marker/rainbow, +/obj/item/weapon/pen/crayon/rainbow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "fk" = ( /obj/machinery/telecomms/server/presets/common, /turf/simulated/floor/tiled/dark{ @@ -1982,11 +1999,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "ir" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -2300,6 +2314,16 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) +"jy" = ( +/obj/structure/window/bay/reinforced, +/obj/structure/low_wall/bay/reinforced/steel, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/angled/open{ + dir = 4; + id = "clownmimeoffice" + }, +/turf/simulated/floor, +/area/stellardelight/deck3/clownmimeoffice) "jC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2512,12 +2536,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/stellardelight/deck3/aft) "ku" = ( -/obj/structure/table/rack, -/obj/random/firstaid, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/structure/barricade/cutout/mime, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "kw" = ( /obj/machinery/light{ dir = 8 @@ -2936,6 +2957,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/readingroom) +"lV" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "lY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -3120,8 +3147,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "mF" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "mI" = ( /obj/structure/cable/blue{ icon_state = "1-8" @@ -3677,12 +3704,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "oD" = ( @@ -3960,6 +3983,12 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "px" = ( @@ -4200,6 +4229,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "qg" = ( @@ -5329,12 +5364,22 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) "uM" = ( -/obj/structure/table/rack, -/obj/item/device/paicard, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/alarm/angled, +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/clown{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/bikehorn{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/weapon/stamp/clown{ + pixel_x = 6; + pixel_y = 9 + }, +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "uQ" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -6017,11 +6062,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/landmark{ - name = "maint_pred" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) +"xp" = ( +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "xu" = ( /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; @@ -6639,6 +6684,16 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/stellardelight/deck3/commandhall) +"zC" = ( +/obj/item/toy/figure/mime, +/obj/item/weapon/pen/crayon/marker/mime, +/obj/item/weapon/pen/crayon/mime, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "zD" = ( /obj/structure/cable/blue{ icon_state = "1-2" @@ -6659,23 +6714,14 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "zF" = ( -/obj/machinery/power/apc/angled{ - dir = 8; - name = "night shift APC"; - nightshift_setting = 2 - }, /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/closet/crate, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/power/apc/angled{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "zH" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -7587,7 +7633,7 @@ /area/crew_quarters/bar) "CC" = ( /turf/simulated/wall/bay/r_wall/steel, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "CD" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -7766,13 +7812,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_cyborg_station) "Du" = ( -/obj/structure/table/rack/shelf, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/item/weapon/storage/fancy/candle_box, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/vending/wardrobe/clowndrobe, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Dw" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -7901,8 +7943,21 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "clownmimeoffice"; + name = "Window Lockdown"; + pixel_x = 23; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "DY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7922,7 +7977,7 @@ /area/maintenance/stellardelight/deck3/starboardcent) "Ec" = ( /turf/simulated/wall/bay/steel, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "Ed" = ( /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck3/aft) @@ -8858,6 +8913,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "HN" = ( @@ -9171,14 +9228,18 @@ /area/stellardelight/deck3/portdock) "IS" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - name = "glass airlock" - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled_bay/hatch{ + name = "Clown and Mime Office"; + req_one_access = list(138,136); + stripe_color = "#454545" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "IU" = ( /obj/machinery/hologram/holopad, /obj/structure/sign/warning/secure_area{ @@ -9288,6 +9349,13 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/transitgateway) +"Jm" = ( +/obj/structure/barricade/cutout/clown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "Jn" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/hatch{ @@ -10084,12 +10152,13 @@ /turf/simulated/floor, /area/ai_cyborg_station) "Mr" = ( -/obj/structure/table/rack, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/machinery/chemical_dispenser/bar_coffee/full, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/curtain/black{ + color = "#361447" + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Ms" = ( /obj/structure/table/reinforced, /obj/item/weapon/stamp/hop, @@ -10616,16 +10685,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/starboarddock) "NZ" = ( -/obj/structure/closet/crate, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/mre, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/item/weapon/bedsheet/mimedouble, +/obj/structure/bed/double/padded, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "Oa" = ( /obj/machinery/door/firedoor/glass, /obj/structure/sign/poster{ @@ -11050,6 +11114,10 @@ }, /turf/simulated/floor/tiled/dark, /area/lawoffice) +"Pp" = ( +/obj/effect/landmark/start/clown, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Pq" = ( /obj/structure/bed/chair{ dir = 8 @@ -11439,8 +11507,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "QZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12536,8 +12604,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/effect/landmark/start/mime, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "Vm" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13025,11 +13094,8 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/crew_quarters/heads/cmo) "Xb" = ( -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Xc" = ( /obj/structure/lattice, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -25499,7 +25565,7 @@ FE eE dx ch -mF +lV zF NZ Ec @@ -25643,7 +25709,7 @@ dx ku mF Vk -mF +zC Ec hr al @@ -25783,9 +25849,9 @@ FE UF dx uM -mF +xp xo -mF +Jm Ec kp bm @@ -25925,9 +25991,9 @@ Rg FE dx Mr -mF +Pp ip -mF +fj Ec RE bh @@ -26071,11 +26137,11 @@ Xb QW DW IS -hB +bB HL -hB -hB -hB +bB +bB +bB pt aB Mw @@ -26209,8 +26275,8 @@ FD FD EZ CC -CC -CC +jy +jy CC CC Vg @@ -26350,7 +26416,6 @@ DQ DQ DQ DQ -DQ UU DQ DQ @@ -26358,6 +26423,7 @@ DQ DQ DQ DQ +DQ ez xH DE diff --git a/maps/stellardelight/stellar_delight_areas.dm b/maps/stellardelight/stellar_delight_areas.dm index d1da4bf824..b1afbf617c 100644 --- a/maps/stellardelight/stellar_delight_areas.dm +++ b/maps/stellardelight/stellar_delight_areas.dm @@ -286,6 +286,9 @@ name = "Starboard Dock" ambience = AMBIENCE_ARRIVALS +/area/stellardelight/deck3/clownmimeoffice + name = "Clown and Mime Office" + /area/stellardelight/deck1/exterior name = "Deck One Exterior" /area/stellardelight/deck2/exterior