diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 34dab29e973..33a44b4c624 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -4913,7 +4913,7 @@ "bQy" = (/obj/structure/table,/obj/item/pod_parts/core,/obj/item/weapon/circuitboard/mecha/pod,/obj/item/clothing/glasses/welding{pixel_y = 12},/obj/machinery/door_control{id = "mechpodbay"; name = "Pod Door Control"; pixel_x = 24},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/engine/mechanic_workshop) "bQz" = (/obj/effect/landmark/start{name = "Mechanic"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/engine/mechanic_workshop) "bQA" = (/obj/structure/table/woodentable,/obj/machinery/computer/skills{req_access_txt = "57"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/carpet,/area/ntrep) -"bQB" = (/obj/structure/table/woodentable,/obj/item/weapon/folder,/obj/item/weapon/stamp/centcom,/obj/item/weapon/pen/fluff/fountainpen,/turf/simulated/floor/carpet,/area/ntrep) +"bQB" = (/obj/structure/table/woodentable,/obj/item/weapon/folder,/obj/item/weapon/stamp/centcom,/obj/item/weapon/pen/fountain,/turf/simulated/floor/carpet,/area/ntrep) "bQC" = (/obj/machinery/door/window{dir = 1; name = "Desk Door"; req_access_txt = "73"},/obj/machinery/keycard_auth{pixel_x = 24; pixel_y = 0},/turf/simulated/floor/wood,/area/ntrep) "bQD" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/stack/medical/ointment,/obj/item/stack/medical/bruise_pack,/obj/item/weapon/reagent_containers/syringe/charcoal,/obj/item/weapon/reagent_containers/syringe/epinephrine{pixel_x = -1; pixel_y = 2},/turf/simulated/floor{icon_state = "bot"; dir = 1},/area/gateway) "bQE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{tag = "icon-warningcorner (WEST)"; icon_state = "warningcorner"; dir = 8},/area/gateway) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index f7832840c4d..8ccc40fbc87 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -91,7 +91,7 @@ icon_state = "kidosvest" item_state = "kidosvest" -/obj/item/clothing/suit/kluysfluff // Kluys: Cripty Pandaen +/obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen name = "Nano Fibre Jacket" desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials." icon_state = "Kluysfluff1" @@ -99,7 +99,7 @@ blood_overlay_type = "coat" body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/kluysfluff/verb/toggle() +/obj/item/clothing/suit/fluff/kluys/verb/toggle() set name = "Toggle Nanofibre Mode" set category = "Object" set src in usr @@ -127,6 +127,12 @@ desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves." icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_red_open" + +/obj/item/clothing/suit/fluff/stobarico_greatcoat // Stobarico: F.U.R.R.Y + name = "\improper F.U.R.R.Y's Nanotrasen Greatcoat" + desc = "A greatcoat with Nanotrasen colors." + icon = 'icons/obj/custom_items.dmi' + icon_state = "stobarico_jacket" //////////// Uniforms //////////// /obj/item/clothing/under/fluff/WornTurtleneck // DaveTheHeadcrab: Makkota Atani diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 750cdae305c..ef5f3bf49f6 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index a4472e9cff8..c7f43e0e289 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ