diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index c39949a5a1c..fd85e1fe139 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -2685,7 +2685,7 @@ "aZG" = (/obj/machinery/door/airlock/public/glass{name = "Central Access"},/turf/simulated/floor/plasteel{icon_state = "bluecorner"},/area/hallway/primary/fore) "aZH" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 3; name = "Atmospherics Requests Console"; pixel_y = -30},/obj/item/stack/sheet/glass{amount = 50},/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/turf/simulated/floor/plasteel,/area/atmos) "aZI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) -"aZJ" = (/obj/effect/decal/cleanable/cobweb,/obj/item/clothing/mask/muzzle/gag,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) +"aZJ" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aZK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aZL" = (/obj/item/restraints/handcuffs/pinkcuffs,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) "aZM" = (/obj/structure/chair,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/brig) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index c10ccf32f89..25b18ec408a 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -80,12 +80,6 @@ to_chat(usr, "You lack the ability to manipulate the lock.") -/obj/item/clothing/mask/muzzle/gag - name = "gag" - desc = "Stick this in their mouth to stop the noise." - icon_state = "gag" - w_class = WEIGHT_CLASS_TINY - /obj/item/clothing/mask/muzzle/tapegag name = "tape gag" desc = "MHPMHHH!" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index e39691d857f..8fd4e55f57e 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -79,11 +79,4 @@ name = "camo pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." icon_state = "camopants" - item_color = "camopants" - -/obj/item/clothing/under/pants/chaps - name = "black leather assless chaps" - desc = "For those brave enough to weather the breeze." - icon_state = "chaps" - item_color = "chaps" - flags_size = ONESIZEFITSALL \ No newline at end of file + item_color = "camopants" \ No newline at end of file diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 974efa8a088..0b4635317d8 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index ed4b3fa8627..131ff4740ef 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ