diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ee46bbad..d36dd61a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1067,7 +1067,7 @@ "auA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "auB" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "auC" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/dorms) -"auD" = (/obj/structure/closet/athletic_mixed,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/camera{c_tag = "Fitness Room"},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/plasteel,/area/crew_quarters/fitness) +"auD" = (/obj/structure/closet/athletic_mixed,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/camera{c_tag = "Fitness Room"},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light{dir = 1; pixel_y = 16},/obj/item/clothing/under/shorts/redwshort,/obj/item/clothing/under/shorts/redwshort,/obj/item/clothing/under/shorts/yellowwshort,/obj/item/clothing/under/shorts/yellowwshort,/obj/item/clothing/under/shorts/pinkwshort,/obj/item/clothing/under/shorts/pinkwshort,/turf/open/floor/plasteel,/area/crew_quarters/fitness) "auE" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/cable{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/table,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/machinery/light,/turf/open/floor/plasteel,/area/crew_quarters/fitness) "auF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness) "auG" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/structure/chair/sofa/right,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness) diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index c45b9b44..f03ec872 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -86,6 +86,7 @@ icon_state = "orange" item_color = "orange" + /obj/item/clothing/shoes/sneakers/orange/attack_self(mob/user) if (src.chained) src.chained = null @@ -120,5 +121,4 @@ to_chat(c, "You need help taking these off!") return return ..() - - \ No newline at end of file + diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 2e6e2ad0..af89be86 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -35,4 +35,19 @@ /obj/item/clothing/under/shorts/purple name = "purple athletic shorts" icon_state = "purpleshorts" - item_color = "purpleshorts" \ No newline at end of file + item_color = "purpleshorts" + +/obj/item/clothing/under/shorts/redwshort + name = "Red workout short" + icon_state = "redwshort" + item_color = "redwshort" + +/obj/item/clothing/under/shorts/yellowwshort + name = "Yellow workout short" + icon_state = "yellowwshort" + item_color = "yellowwshort" + +/obj/item/clothing/under/shorts/pinkwshort + name = "Pink workout short" + icon_state = "pinkwshort" + item_color = "pinkwshort" \ No newline at end of file diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 25d3ea8e..bdfed344 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 05b7a555..b2a18fb0 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 0a881a72..8749c256 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -153,6 +153,21 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/track +/datum/gear/redwshort + name = "Red workout short" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/shorts/redwshort + +/datum/gear/yellowwshort + name = "Yellow workout short" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/shorts/yellowwshort + +/datum/gear/pinkwshort + name = "Pink workout short" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/shorts/pinkwshort + /datum/gear/comfortable name = "Padded Uniform" category = SLOT_W_UNIFORM diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi index fd3c3cd9..7c2d08a1 100644 Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ