diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1b5b2645fad..5126ecf8d27 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -28,7 +28,7 @@ While normally provided, Heads of Staff and Maintainers are not obligated to pub All Pull Requests are expected to be tested prior to submission. If a submitted Pull Request fails to pass CI checks, the likelihood of it being merged will be significantly lower. If you can't take the time to compile/test your Pull Request, do not expect a warm reception. -It is expected that contributors discuss larger design changes on the forums prior to coding a Pull Request. The amount of time spent on any given Pull Request is not relevant. Maintainers are not responsible for contributors wasting their time creating features nobody asked for. +It is expected that contributors discuss larger changes on the forums prior to coding a Pull Request. The amount of time spent on any given Pull Request is not relevant. Maintainers are not responsible for contributors wasting their time creating features nobody asked for. Barring highly specific circumstances (such as single line changes, submissions from advanced users, or changes to repo documentation), we will not accept Pull Requests utilising the web editor. diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index 0684be758cd..9477c91fd04 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -44,7 +44,8 @@ GLOBAL_LIST_INIT(drinks, list("beer2","hot_coco","orangejuice","tomatojuice","li "vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead", "mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte", "cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk", - "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe")) + "silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini", "flamingmoe", + "arnold_palmer","gimlet","sidecar","whiskeysour","mintjulep","pinacolada")) //Liver Toxins list GLOBAL_LIST_INIT(liver_toxins, list("toxin", "plasma", "sacid", "facid", "cyanide","amanitin", "carpotoxin")) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index b023aaa4dd0..74453f47c62 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -67,6 +67,9 @@ if(modifiers["shift"] && modifiers["alt"]) AltShiftClickOn(A) return + if(modifiers["shift"] && modifiers["middle"]) + ShiftMiddleClickOn(A) + return if(modifiers["middle"]) MiddleClickOn(A) if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden. @@ -128,6 +131,8 @@ A.AICtrlShiftClick(src) /mob/living/silicon/ai/AltShiftClickOn(atom/A) A.AIAltShiftClick(src) +/mob/living/silicon/ai/ShiftMiddleClickOn(atom/A) + A.AIShiftMiddleClick(src) /mob/living/silicon/ai/ShiftClickOn(atom/A) A.AIShiftClick(src) /mob/living/silicon/ai/CtrlClickOn(atom/A) @@ -148,6 +153,9 @@ /atom/proc/AIAltShiftClick() return +/atom/proc/AIShiftMiddleClick() + return + /atom/proc/AIShiftClick(mob/living/user) // borgs use this too if(user.client) user.examinate(src) @@ -215,3 +223,8 @@ if(!ai_control_check(user)) return toggle_light(user) + +/obj/machinery/door/airlock/AIShiftMiddleClick(mob/user) // Toggles door timings. + if(!ai_control_check(user)) + return + toggle_speed(user) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 77a4ae192f1..cb483601e26 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -363,9 +363,11 @@ A.AltShiftClick(src) return -/atom/proc/AltShiftClick(mob/user) +/mob/proc/ShiftMiddleClickOn(atom/A) return +/atom/proc/AltShiftClick(mob/user) + return /* Misc helpers diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 40fcfc82671..706c9304e20 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -30,6 +30,9 @@ if(modifiers["middle"] && modifiers["ctrl"]) CtrlMiddleClickOn(A) return + if(modifiers["shift"] && modifiers["middle"]) + ShiftMiddleClickOn(A) + return if(modifiers["middle"]) MiddleClickOn(A) return @@ -126,7 +129,8 @@ A.BorgCtrlShiftClick(src) /mob/living/silicon/robot/AltShiftClickOn(atom/A) A.BorgAltShiftClick(src) - +/mob/living/silicon/robot/ShiftMiddleClickOn(atom/A) + A.BorgShiftMiddleClick(src) /atom/proc/BorgShiftClick(mob/user) if(user.client && user.client.eye == user) @@ -148,6 +152,8 @@ /atom/proc/BorgAltShiftClick() return +/atom/proc/BorgShiftMiddleClick() + return // AIRLOCKS @@ -163,6 +169,8 @@ /obj/machinery/door/airlock/BorgAltShiftClick(mob/living/silicon/robot/user) // Enables emergency override on doors! Forwards to AI code. AIAltShiftClick(user) +/obj/machinery/door/airlock/BorgShiftMiddleClick(mob/living/silicon/robot/user) //Toggles door timing. Forwards to AI code. + AIShiftMiddleClick(user) // APC diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index a79eb2105ae..87aabb95445 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -356,159 +356,159 @@ GLOBAL_VAR_INIT(record_id_num, 1001) job_clothes = H.mind.assigned_role switch(job_clothes) if("Head of Personnel") - clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hop_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Nanotrasen Representative") - clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) if("Blueshield") - clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "blueshield"), ICON_OVERLAY) if("Magistrate") - clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "really_black_suit_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_OVERLAY) if("Bartender") - clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "ba_suit_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Botanist") - clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hydroponics_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Chef") - clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chef_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Janitor") - clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "janitor_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Librarian") - clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "red_suit_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Barber") - clothes_s = new /icon('icons/mob/uniform.dmi', "barber_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "barber_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Clown") - clothes_s = new /icon('icons/mob/uniform.dmi', "clown_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "clown_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY) if("Mime") - clothes_s = new /icon('icons/mob/uniform.dmi', "mime_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mime_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Quartermaster") - clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "qm_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Cargo Technician") - clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "cargotech_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Shaft Miner") - clothes_s = new /icon('icons/mob/uniform.dmi', "explorer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "explorer"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "explorer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY) if("Lawyer") - clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "internalaffairs_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Chaplain") - clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chapblack_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Research Director") - clothes_s = new /icon('icons/mob/uniform.dmi', "director_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "director_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if("Scientist") - clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "toxinswhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) if("Chemist") - clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chemistrywhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) if("Chief Medical Officer") - clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "cmo_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) if("Medical Doctor") - clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if("Coroner") - clothes_s = new /icon('icons/mob/uniform.dmi', "scrubsblack_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_mort_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "scrubsblack_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_mort_open"), ICON_OVERLAY) if("Geneticist") - clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "geneticswhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) if("Virologist") - clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "virologywhite_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) if("Psychiatrist") - clothes_s = new /icon('icons/mob/uniform.dmi', "psych_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "psych_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_UNDERLAY) if("Paramedic") - clothes_s = new /icon('icons/mob/uniform.dmi', "paramedic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "paramedic_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Captain") - clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "captain_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if("Head of Security") - clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "hosred_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Warden") - clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "warden_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Detective") - clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "detective_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY) if("Security Pod Pilot") - clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY) if("Brig Physician") - clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "medical_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) if("Security Officer") - clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "secred_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if("Chief Engineer") - clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "chief_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Station Engineer") - clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "engine_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Life Support Specialist") - clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "atmos_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Mechanic") - clothes_s = new /icon('icons/mob/uniform.dmi', "mechanic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "mechanic_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if("Roboticist") - clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "robotics_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if("Syndicate Agent") - clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if("Syndicate Officer") - clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) if("Syndicate Nuclear Operative") - clothes_s = new /icon('icons/mob/uniform.dmi', "syndicate_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "syndicate_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) else if(H.mind && (H.mind.assigned_role in get_all_centcom_jobs())) - clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "officer_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) else - clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "grey_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) preview_icon.Blend(face_s, ICON_OVERLAY) // Why do we do this twice if(clothes_s) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 503389eb769..75f03f3c3d8 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -78,7 +78,7 @@ /client/proc/debug_variables(datum/D in world) set category = "Debug" - set name = "View Variables" + set name = "\[Admin\] View Variables" var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index a566c5148bb..aa1e74a911e 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -787,6 +787,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) reference = "50M" item = /obj/item/ammo_box/magazine/sniper_rounds +/datum/uplink_item/ammo/sniper/antimatter + name = "Sniper - .50 Antimatter Magazine" + desc = "A 6-round magazine of antimatter ammo for use with .50 sniper rifles. \ + Able to heavily damage objects, and delimb people." + reference = "50A" + item = /obj/item/ammo_box/magazine/sniper_rounds/antimatter + cost = 5 + /datum/uplink_item/ammo/sniper/soporific name = "Sniper - .50 Soporific Magazine" desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!" diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 792665a52f3..28437dd9022 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -191,6 +191,7 @@ /obj/item/gun/magic/tentacle name = "tentacle" desc = "A fleshy tentacle that can stretch out and grab things or people." + icon = 'icons/obj/items.dmi' icon_state = "tentacle" item_state = "tentacle" flags = ABSTRACT | NODROP | NOBLUDGEON | DROPDEL diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 4b43c992347..9b890787d7f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -23,7 +23,7 @@ sharp = TRUE hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sprite_sheets_inhand = list("Skrell" = 'icons/mob/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head + sprite_sheets_inhand = list("Skrell" = 'icons/mob/clothing/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head /obj/item/melee/cultblade/New() if(SSticker.mode) @@ -187,9 +187,9 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS armor = list("melee" = -50, "bullet" = -50, "laser" = -50,"energy" = -50, "bomb" = -50, "bio" = -50, "rad" = -50, "fire" = 0, "acid" = 0) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) hoodtype = /obj/item/clothing/head/hooded/flagellant_hood @@ -220,9 +220,9 @@ flags_cover = HEADCOVERSEYES armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/whetstone/cult diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 58ff6388c2d..26e88657fa7 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -9,7 +9,7 @@ var/mapping = 0 // For the overview file (overview.dm), not used on this page - var/list/network = list() + var/list/network = list("SS13","Mining Outpost") var/obj/machinery/camera/active_camera var/list/watchers = list() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index c7cb8b18031..7b2890d97da 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -814,12 +814,7 @@ About the new airlock wires panel: safe = 1 to_chat(usr, "The door safeties have been enabled.") if("speed-toggle") - if(wires.is_cut(WIRE_SPEED)) - to_chat(usr, "The timing wire is cut - Cannot alter timing.") - else if(normalspeed) - normalspeed = 0 - else - normalspeed = 1 + toggle_speed(usr) if("open-close") open_close(usr) else @@ -870,6 +865,17 @@ About the new airlock wires panel: to_chat(user, "Emergency access has been disabled.") update_icon() +/obj/machinery/door/airlock/proc/toggle_speed(mob/user) + if(wires.is_cut(WIRE_SPEED)) + to_chat(user, "The timing wire has been cut - Cannot alter timing.") + return + normalspeed = !normalspeed + + if(normalspeed) + to_chat(user, "The door is now in normal mode.") + else + to_chat(user, "The door is now in fast mode.") + /obj/machinery/door/airlock/attackby(obj/item/C, mob/user, params) add_fingerprint(user) if(!headbutt_shock_check(user)) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index babae081e9d..5d979ff2044 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -16,9 +16,10 @@ desc = "A generic vending machine." icon = 'icons/obj/vending.dmi' icon_state = "generic" - layer = 2.9 - anchored = 1 - density = 1 + layer = BELOW_OBJ_LAYER + anchored = TRUE + density = TRUE + face_while_pulling = TRUE max_integrity = 300 integrity_failure = 100 armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) @@ -1002,6 +1003,7 @@ products = list(/obj/item/reagent_containers/food/snacks/candy/candybar = 6,/obj/item/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/reagent_containers/food/snacks/chips =6, /obj/item/reagent_containers/food/snacks/sosjerky = 6,/obj/item/reagent_containers/food/snacks/no_raisin = 6,/obj/item/reagent_containers/food/snacks/pistachios =6, /obj/item/reagent_containers/food/snacks/spacetwinkie = 6,/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,/obj/item/reagent_containers/food/snacks/tastybread = 6) + premium = list(/obj/item/reagent_containers/food/snacks/stroopwafel = 2) contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6) prices = list(/obj/item/reagent_containers/food/snacks/candy/candybar = 20,/obj/item/reagent_containers/food/drinks/dry_ramen = 30, /obj/item/reagent_containers/food/snacks/chips =25,/obj/item/reagent_containers/food/snacks/sosjerky = 30,/obj/item/reagent_containers/food/snacks/no_raisin = 20, diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 79f49b39c94..03d89af52af 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -5,8 +5,8 @@ icon_state = "headset" item_state = "headset" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/ears.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/ears.dmi' + "Vox" = 'icons/mob/clothing/species/vox/ears.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi' ) //We read you loud and skree-er. materials = list(MAT_METAL=75) canhear_range = 0 // can't hear headsets from very far away diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index c2ff3879968..051e936ea9c 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -67,9 +67,9 @@ slot_flags = SLOT_HEAD dog_fashion = /datum/dog_fashion/head/fried_vox_empty sprite_sheets = list( - "Skrell" = 'icons/mob/species/skrell/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Kidan" = 'icons/mob/species/kidan/head.dmi' + "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head.dmi' ) /obj/item/trash/pistachios diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 5d3ca5fc919..cf19a910647 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -33,11 +33,11 @@ LIGHTERS ARE IN LIGHTERS.DM var/list/list_reagents = list("nicotine" = 40) var/first_puff = TRUE // the first puff is a bit more reagents ingested sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi') + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi') /obj/item/clothing/mask/cigarette/New() diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 6f2f6e1ff0f..e76207ae85c 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -13,7 +13,7 @@ actions_types = list(/datum/action/item_action/toggle_paddles) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi' + "Vox" = 'icons/mob/clothing/species/vox/back.dmi' ) var/paddles_on_defib = TRUE //if the paddles are on the defib (TRUE) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index f5a47c31b0a..cd0997481b6 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -18,9 +18,9 @@ resistance_flags = NONE max_integrity = 300 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/back.dmi', - "Grey" = 'icons/mob/species/grey/back.dmi' + "Vox" = 'icons/mob/clothing/species/vox/back.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi', + "Grey" = 'icons/mob/clothing/species/grey/back.dmi' ) //For Armalis anything but this and the nitrogen tank will use the default backpack icon. /obj/item/storage/backpack/attackby(obj/item/W as obj, mob/user as mob, params) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 2964c960501..825bc70699e 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -170,7 +170,7 @@ name = "nitrogen tank" desc = "A tank of nitrogen." icon_state = "oxygen_fr" - sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/back.dmi') //Do it for Big Bird. + sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/back.dmi') //Do it for Big Bird. distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE /obj/item/tank/internals/nitrogen/populate_gas() @@ -188,7 +188,7 @@ name = "vox specialized nitrogen tank" desc = "A high-tech nitrogen tank designed specifically for Vox." icon_state = "emergency_vox" - sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird. + sprite_sheets = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/belt.dmi') //Do it for Big Bird. volume = 35 /obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas() diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 467efe3d935..43dad2c7ccd 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -329,6 +329,7 @@ name = "pew" desc = "Rigid and uncomfortable, perfect for keeping you awake and alert." icon_state = "pewmiddle" + buildstacktype = /obj/item/stack/sheet/wood /obj/structure/chair/sofa/pew/left icon_state = "pewend_left" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index b1d877e6438..61575a09231 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -72,7 +72,7 @@ GLOBAL_VAR_INIT(nologevent, 0) /datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list) set category = null - set name = "Show Player Panel" + set name = "\[Admin\] Show Player Panel" set desc="Edit player (respawn, ban, heal, etc)" if(!M) @@ -766,7 +766,7 @@ GLOBAL_VAR_INIT(nologevent, 0) message_admins("[key_name_admin(usr)] checked the AI laws") /client/proc/update_mob_sprite(mob/living/carbon/human/H as mob) - set name = "Update Mob Sprite" + set name = "\[Admin\] Update Mob Sprite" set desc = "Should fix any mob sprite update errors." set category = null diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 485b0f22cc3..de44ccd4788 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -613,7 +613,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( /client/proc/make_sound(obj/O in view()) // -- TLE set category = "Event" - set name = "Make Sound" + set name = "\[Admin\] Make Sound" set desc = "Display a message to everyone who can hear the target" if(!check_rights(R_EVENT)) @@ -799,7 +799,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Silicon Laws") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/change_human_appearance_admin(mob/living/carbon/human/H in GLOB.mob_list) - set name = "C.M.A. - Admin" + set name = "\[Admin\] C.M.A. - Admin" set desc = "Allows you to change the mob appearance" set category = null @@ -825,7 +825,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( SSblackbox.record_feedback("tally", "admin_verb", 1, "CMA - Admin") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/change_human_appearance_self(mob/living/carbon/human/H in GLOB.mob_list) - set name = "C.M.A. - Self" + set name = "\[Admin\] C.M.A. - Self" set desc = "Allows the mob to change its appearance" set category = null @@ -965,7 +965,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list( /client/proc/man_up(mob/T as mob in GLOB.player_list) set category = null - set name = "Man Up" + set name = "\[Admin\] Man Up" set desc = "Tells mob to man up and deal with it." if(!check_rights(R_ADMIN)) diff --git a/code/modules/admin/machine_upgrade.dm b/code/modules/admin/machine_upgrade.dm index c3b27406858..f85c4426481 100644 --- a/code/modules/admin/machine_upgrade.dm +++ b/code/modules/admin/machine_upgrade.dm @@ -1,5 +1,5 @@ /proc/machine_upgrade(obj/machinery/M in world) - set name = "Tweak Component Ratings" + set name = "\[Admin\] Tweak Component Ratings" set category = null if(!check_rights(R_DEBUG)) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index ed2aff985f1..70463a2a5ec 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -66,7 +66,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/jumptoturf(turf/T in world) - set name = "Jump to Turf" + set name = "\[Admin\] Jump to Turf" set category = null if(!check_rights(R_ADMIN)) @@ -135,7 +135,7 @@ /client/proc/Getmob(mob/M in GLOB.mob_list) set category = null - set name = "Get Mob" + set name = "\[Admin\] Get Mob" set desc = "Mob to teleport" if(!check_rights(R_ADMIN)) @@ -152,7 +152,7 @@ /client/proc/Getkey() set category = null - set name = "Get Key" + set name = "\[Admin\] Get Key" set desc = "Key to teleport" if(!check_rights(R_ADMIN)) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index d03344da2a1..7186406e7fa 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -1,7 +1,7 @@ //allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm /client/proc/cmd_admin_pm_context(mob/M as mob in GLOB.mob_list) set category = null - set name = "Admin PM Mob" + set name = "\[Admin\] Admin PM Mob" if(!check_rights(R_ADMIN|R_MENTOR)) return if(!ismob(M) || !M.client) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 8ff8739d3b9..fd8a7eaa00e 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -173,7 +173,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) /client/proc/callproc_datum(A as null|area|mob|obj|turf) set category = null - set name = "Atom ProcCall" + set name = "\[Admin\] Atom ProcCall" if(!check_rights(R_PROCCALL)) return @@ -630,7 +630,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) /client/proc/cmd_admin_dress(mob/living/carbon/human/M in GLOB.human_list) set category = "Event" - set name = "Select equipment" + set name = "\[Admin\] Select equipment" if(!check_rights(R_EVENT)) return diff --git a/code/modules/admin/verbs/freeze.dm b/code/modules/admin/verbs/freeze.dm index 0f52680acea..9d7bc424f38 100644 --- a/code/modules/admin/verbs/freeze.dm +++ b/code/modules/admin/verbs/freeze.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(frozen_atom_list) // A list of admin-frozen atoms. /client/proc/freeze(atom/movable/M) - set name = "Freeze" + set name = "\[Admin\] Freeze" set category = null if(!check_rights(R_ADMIN)) diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index 45e93ce8c47..b0c246bb027 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -1,5 +1,5 @@ /proc/possess(obj/O as obj in world) - set name = "Possess Obj" + set name = "\[Admin\] Possess Obj" set category = null if(!check_rights(R_POSSESS)) @@ -34,7 +34,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Possess Object") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /proc/release(obj/O as obj in world) - set name = "Release Obj" + set name = "\[Admin\] Release Obj" set category = null //usr.loc = get_turf(usr) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 2a9c4e9e5a4..654e8cd0d18 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1,6 +1,6 @@ /client/proc/cmd_admin_drop_everything(mob/M as mob in GLOB.mob_list) set category = null - set name = "Drop Everything" + set name = "\[Admin\] Drop Everything" if(!check_rights(R_DEBUG|R_ADMIN)) return @@ -46,7 +46,7 @@ /client/proc/cmd_admin_subtle_message(mob/M as mob in GLOB.mob_list) set category = "Event" - set name = "Subtle Message" + set name = "\[Admin\] Subtle Message" if(!ismob(M)) return @@ -124,7 +124,7 @@ /client/proc/cmd_admin_direct_narrate(mob/M) // Targetted narrate -- TLE set category = null - set name = "Direct Narrate" + set name = "\[Admin\] Direct Narrate" if(!check_rights(R_SERVER|R_EVENT)) return @@ -151,7 +151,7 @@ /client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list) set category = "Event" - set name = "Headset Message" + set name = "\[Admin\] Headset Message" admin_headset_message(M) @@ -577,7 +577,7 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/cmd_admin_rejuvenate(mob/living/M as mob in GLOB.mob_list) set category = null - set name = "Rejuvenate" + set name = "\[Admin\] Rejuvenate" if(!check_rights(R_REJUVINATE)) return @@ -643,7 +643,7 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/cmd_admin_delete(atom/A as obj|mob|turf in view()) set category = null - set name = "Delete" + set name = "\[Admin\] Delete" if(!check_rights(R_ADMIN)) return @@ -782,7 +782,7 @@ Traitors and the like can also be revived with the previous role mostly intact. SSblackbox.record_feedback("tally", "admin_verb", 1, "Gibself") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_check_contents(mob/living/M as mob in GLOB.mob_list) - set name = "Check Contents" + set name = "\[Admin\] Check Contents" set category = null if(!check_rights(R_ADMIN)) diff --git a/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm b/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm index f0c705f6523..cc7b733c743 100644 --- a/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm +++ b/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm @@ -65,7 +65,6 @@ switch(page) if(HUB_PAGE_CONTRACTS) - var/contract_target var/list/contracts_out = list() data["contracts"] = contracts_out for(var/c in contracts) @@ -100,7 +99,6 @@ contract_data["fail_reason"] = C.fail_reason if(C.contract.extraction_zone) - contract_target = C.contract.target?.current var/area/A = get_area(user) contract_data["objective"] = list( extraction_name = C.contract.extraction_zone.map_name, @@ -114,9 +112,7 @@ ) contracts_out += list(contract_data) - data["can_extract"] = FALSE - if(contract_target) - data["can_extract"] = current_contract?.contract.can_start_extraction_process(user, contract_target) + data["can_extract"] = current_contract?.contract.can_start_extraction_process(user) || FALSE if(HUB_PAGE_SHOP) var/list/buyables = list() diff --git a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm index d2bd6de7567..171c1662cf9 100644 --- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm @@ -237,8 +237,7 @@ * Returns whether the extraction process can be started. * * Arguments: - * * M - The contractor. - * * target - The target. + * * caller - The person trying to call the extraction. */ -/datum/objective/contract/proc/can_start_extraction_process(mob/living/carbon/human/M, mob/living/carbon/human/target) - return get_area(M) == extraction_zone && get_area(target) == extraction_zone +/datum/objective/contract/proc/can_start_extraction_process(mob/living/carbon/human/caller) + return get_area(caller) == extraction_zone && get_area(target.current) == extraction_zone diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index a55b0cb0ac7..a1da7585f4f 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -727,11 +727,11 @@ /datum/character_save/proc/blend_backpack(icon/clothes_s, backbag, satchel, backpack="backpack") switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', backpack), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', backpack), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', satchel), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', satchel), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) return clothes_s /datum/character_save/proc/update_preview_icon(for_observer=0) //seriously. This is horrendous. @@ -927,538 +927,538 @@ socks_s = new/icon(u3_icon, "sk_[U3.icon_state]_s", ICON_OVERLAY) var/icon/clothes_s = null - var/uniform_dmi='icons/mob/uniform.dmi' + var/uniform_dmi='icons/mob/clothing/uniform.dmi' if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high' clothes_s = new /icon(uniform_dmi, "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_support_high)//I hate how this looks, but there's no reason to go through this switch if it's empty switch(job_support_high) if(JOB_HOP) clothes_s = new /icon(uniform_dmi, "hop_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "ianshirt"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BARTENDER) clothes_s = new /icon(uniform_dmi, "ba_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "tophat"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BOTANIST) clothes_s = new /icon(uniform_dmi, "hydroponics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "ggloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "apron"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "nymph"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-hyd"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHEF) clothes_s = new /icon(uniform_dmi, "chef_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "chef"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "chef"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "apronchef"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_JANITOR) clothes_s = new /icon(uniform_dmi, "janitor_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bio_janitor"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_LIBRARIAN) clothes_s = new /icon(uniform_dmi, "red_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hairflower"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_QUARTERMASTER) clothes_s = new /icon(uniform_dmi, "qm_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "poncho"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CARGOTECH) clothes_s = new /icon(uniform_dmi, "cargotech_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "flat_cap"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_MINER) clothes_s = new /icon(uniform_dmi, "explorer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "explorer"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "explorer"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bearpelt"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "explorerpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "explorerpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-explorer"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-explorer"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_LAWYER) clothes_s = new /icon(uniform_dmi, "internalaffairs_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suitjacket_blue"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHAPLAIN) clothes_s = new /icon(uniform_dmi, "chapblack_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "imperium_monk"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CLOWN) clothes_s = new /icon(uniform_dmi, "clown_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "clown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "clown"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "clownpack"), ICON_OVERLAY) if(JOB_MIME) clothes_s = new /icon(uniform_dmi, "mime_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "lgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "mime"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "suspenders"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_medsci_high) switch(job_medsci_high) if(JOB_RD) clothes_s = new /icon(uniform_dmi, "director_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "petehat"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-tox"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_SCIENTIST) clothes_s = new /icon(uniform_dmi, "toxinswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "metroid"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-tox"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHEMIST) clothes_s = new /icon(uniform_dmi, "chemistrywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labgreen"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-chem"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CMO) clothes_s = new /icon(uniform_dmi, "cmo_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bio_cmo"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_DOCTOR) clothes_s = new /icon(uniform_dmi, "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "surgeon"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CORONER) clothes_s = new /icon(uniform_dmi, "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "mortician"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "mortician"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_GENETICIST) clothes_s = new /icon(uniform_dmi, "geneticswhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "monkeysuit"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-gen"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_VIROLOGIST) clothes_s = new /icon(uniform_dmi, "virologywhite_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "sterile"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "plaguedoctor"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-vir"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_PSYCHIATRIST) clothes_s = new /icon(uniform_dmi, "psych_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_PARAMEDIC) clothes_s = new /icon(uniform_dmi, "paramedic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigoff"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "bluesoft"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigoff"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "bluesoft"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(JOB_ROBOTICIST) clothes_s = new /icon(uniform_dmi, "robotics_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) if(prob(1)) clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_engsec_high) switch(job_engsec_high) if(JOB_CAPTAIN) clothes_s = new /icon(uniform_dmi, "captain_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "centcomcaptain"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "captain"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-cap"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_HOS) clothes_s = new /icon(uniform_dmi, "hosred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_hos"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_hos"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_WARDEN) - clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s") + clothes_s = new /icon('icons/mob/clothing/uniform.dmi', "warden_s") if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "slippers_worn"), ICON_OVERLAY) else - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_DETECTIVE) clothes_s = new /icon(uniform_dmi, "detective_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cigaron"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "detective"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "detective"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_OFFICER) clothes_s = new /icon(uniform_dmi, "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_officer"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "beret_officer"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CHIEF) clothes_s = new /icon(uniform_dmi, "chief_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "brown"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_white"), ICON_OVERLAY) if(prob(1)) clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "blueprints"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_ENGINEER) clothes_s = new /icon(uniform_dmi, "engine_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "hazard"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_ATMOSTECH) clothes_s = new /icon(uniform_dmi, "atmos_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "firesuit"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_AI)//Gives AI and borgs assistant-wear, so they can still customize their character clothes_s = new /icon(uniform_dmi, "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "straight_jacket"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "cardborg_h"), ICON_OVERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_CYBORG) clothes_s = new /icon(uniform_dmi, "grey_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "cardborg"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "cardborg_h"), ICON_OVERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_karma_high) switch(job_karma_high) if(JOB_MECHANIC) clothes_s = new /icon(uniform_dmi, "mechanic_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "hardhat0_yellow"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "engiepack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-eng"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_PILOT) clothes_s = new /icon(uniform_dmi, "secred_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "bomber"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BRIGDOC) clothes_s = new /icon(uniform_dmi, "medical_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "white"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "fr_jacket_open"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-med"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_NANO) clothes_s = new /icon(uniform_dmi, "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_BLUESHIELD) clothes_s = new /icon(uniform_dmi, "officer_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "jackboots"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "swat_gl"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "blueshield"), ICON_OVERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(JOB_JUDGE) clothes_s = new /icon(uniform_dmi, "really_black_suit_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "mercy_hood"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head.dmi', "mercy_hood"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "judge"), ICON_UNDERLAY) switch(backbag) if(2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) if(3) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(disabilities & DISABILITY_FLAG_NEARSIGHTED) - preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY) + preview_icon.Blend(new /icon('icons/mob/clothing/eyes.dmi', "glasses"), ICON_OVERLAY) // Observers get tourist outfit. if(for_observer) clothes_s = new /icon(uniform_dmi, "tourist_s") - clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) if(backbag == 2) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3 || backbag == 4) - clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) if(underwear_s) preview_icon.Blend(underwear_s, ICON_OVERLAY) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 5e872075da7..c873c76e1a5 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -232,7 +232,7 @@ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action @@ -267,9 +267,9 @@ armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action @@ -367,7 +367,7 @@ armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action @@ -406,12 +406,12 @@ flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) var/obj/item/voice_changer/voice_changer @@ -484,7 +484,7 @@ name = "backpack" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/back.dmi' + "Vox" = 'icons/mob/clothing/species/vox/back.dmi' ) var/datum/action/item_action/chameleon/change/chameleon_action diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index e42c616f12e..cc5710d14d6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -134,8 +134,8 @@ slot_flags = SLOT_EARS resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/ears.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/ears.dmi' + "Vox" = 'icons/mob/clothing/species/vox/ears.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/ears.dmi' ) //We read you loud and skree-er. /obj/item/clothing/ears/attack_hand(mob/user) @@ -262,8 +262,8 @@ BLIND // can't see anything put_on_delay = 40 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi', - "Drask" = 'icons/mob/species/drask/gloves.dmi' + "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', + "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi' ) // Called just before an attack_hand(), in mob/UnarmedAttack() @@ -447,8 +447,8 @@ BLIND // can't see anything slowdown = SHOES_SLOWDOWN sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/shoes.dmi', - "Drask" = 'icons/mob/species/drask/shoes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/shoes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/shoes.dmi' ) /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params) @@ -617,7 +617,7 @@ BLIND // can't see anything hide_tail_by_species = null species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Under clothing @@ -633,9 +633,9 @@ BLIND // can't see anything pickup_sound = 'sound/items/handling/cloth_pickup.ogg' sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi', - "Drask" = 'icons/mob/species/drask/uniform.dmi', - "Grey" = 'icons/mob/species/grey/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi', + "Drask" = 'icons/mob/clothing/species/drask/uniform.dmi', + "Grey" = 'icons/mob/clothing/species/grey/uniform.dmi' ) var/has_sensor = TRUE//For the crew computer 2 = unable to change mode @@ -728,7 +728,7 @@ BLIND // can't see anything if(!usr.incapacitated()) if(copytext(item_color,-2) != "_d") basecolor = item_color - if((basecolor + "_d_s") in icon_states('icons/mob/uniform.dmi')) + if((basecolor + "_d_s") in icon_states('icons/mob/clothing/uniform.dmi')) item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]" usr.update_inv_w_uniform() else diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index af979eb1045..00dcd32547e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -71,10 +71,10 @@ prescription_upgradable = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/meson/night @@ -121,9 +121,9 @@ resistance_flags = ACID_PROOF armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) actions_types = list(/datum/action/item_action/toggle_research_scanner) @@ -147,7 +147,7 @@ item_state = "glasses" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/night @@ -160,9 +160,9 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/eyepatch @@ -172,9 +172,9 @@ item_state = "eyepatch" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/monocle @@ -185,9 +185,9 @@ prescription_upgradable = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/material @@ -199,9 +199,9 @@ vision_flags = SEE_OBJS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/material/cyber @@ -229,9 +229,9 @@ prescription = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/regular/hipster @@ -247,9 +247,9 @@ item_state = "3d" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/gglasses @@ -259,9 +259,9 @@ item_state = "gglasses" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) prescription_upgradable = 1 @@ -276,9 +276,9 @@ prescription_upgradable = 1 dog_fashion = /datum/dog_fashion/head sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/sunglasses_fake @@ -290,9 +290,9 @@ flash_protect = 0 tint = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/sunglasses/noir @@ -344,9 +344,9 @@ tint = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/sunglasses/lasers @@ -370,9 +370,9 @@ tint = 2 visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/welding/attack_self(mob/user) @@ -420,9 +420,9 @@ flash_protect = -1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/thermal/emp_act(severity) @@ -469,9 +469,9 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE resistance_flags = LAVA_PROOF | FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params) @@ -499,9 +499,9 @@ tint = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/tajblind/eng diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 9f4b4f4c834..2a03c6f0a60 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -36,9 +36,9 @@ examine_extensions = list(EXAMINE_HUD_MEDICAL) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/health/night @@ -67,9 +67,9 @@ HUDType = DATA_HUD_DIAGNOSTIC sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/diagnostic/night @@ -100,9 +100,9 @@ examine_extensions = list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) @@ -137,9 +137,9 @@ prescription_upgradable = 1 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/security/sunglasses/prescription @@ -152,9 +152,9 @@ HUDType = DATA_HUD_HYDROPONIC sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) /obj/item/clothing/glasses/hud/hydroponic/night @@ -177,7 +177,7 @@ up = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/hud/security/tajblind/attack_self() @@ -193,9 +193,9 @@ up = 0 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Drask" = 'icons/mob/species/drask/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi' ) /obj/item/clothing/glasses/hud/health/tajblind/attack_self() @@ -209,9 +209,9 @@ HUDType = DATA_HUD_SECURITY_BASIC examine_extensions = list(EXAMINE_HUD_SKILLS) sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/hud/skills/sunglasses @@ -223,7 +223,7 @@ tint = 1 prescription_upgradable = TRUE sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/eyes.dmi', - "Grey" = 'icons/mob/species/grey/eyes.dmi', - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm index 5e6ce69f252..61767d23fe0 100644 --- a/code/modules/clothing/head/beanie.dm +++ b/code/modules/clothing/head/beanie.dm @@ -9,7 +9,7 @@ icon_state = "beanie" //Default white item_color = "beanie" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', ) /obj/item/clothing/head/beanie/black diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 2639594f6b9..46bcdcc246d 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -66,10 +66,10 @@ item_state = "welding" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi' ) /obj/item/clothing/head/collectable/slime @@ -142,5 +142,5 @@ item_state = "swat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi' ) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 549d6ee572f..791802f0251 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -13,7 +13,7 @@ resistance_flags = FIRE_PROOF dog_fashion = /datum/dog_fashion/head/hardhat sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/hardhat/attack_self(mob/living/user) @@ -98,5 +98,5 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = null sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index e8ce88dba1e..552f0677827 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -15,9 +15,9 @@ strip_delay = 60 dog_fashion = /datum/dog_fashion/head/helmet sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Drask" = 'icons/mob/species/drask/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) /obj/item/clothing/head/helmet/attack_self(mob/user) @@ -224,7 +224,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi' ) /obj/item/clothing/head/helmet/riot/knight/blue diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 728884e263f..e7e6d98b5b9 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -82,7 +82,7 @@ dog_fashion = /datum/dog_fashion/head/detective sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) //Mime @@ -176,7 +176,7 @@ icon_state = "surgcap_blue" flags = BLOCKHEADHAIR sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/head.dmi' + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' ) /obj/item/clothing/head/surgery/purple diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 388fa0374ed..85d6080f642 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -81,7 +81,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) @@ -95,7 +95,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/snowman @@ -108,7 +108,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/that @@ -273,7 +273,7 @@ flags = BLOCKHAIR sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/corgi @@ -313,7 +313,7 @@ icon_state = "fedora" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/fedora/whitefedora @@ -321,7 +321,7 @@ icon_state = "wfedora" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/fedora/brownfedora @@ -329,7 +329,7 @@ icon_state = "bfedora" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/stalhelm //Why do these exist @@ -436,7 +436,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) actions_types = list(/datum/action/item_action/caw) @@ -469,7 +469,7 @@ flags_inv = HIDEFACE|HIDEEARS sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/papersack/smiley @@ -480,7 +480,7 @@ flags_inv = HIDEFACE|HIDEEARS sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/crown diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index b96c3ddce38..b78360a34dc 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -28,11 +28,11 @@ resistance_flags = FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) /obj/item/clothing/head/welding/attack_self(mob/user) @@ -141,7 +141,7 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = /datum/dog_fashion/head/ushanka sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) @@ -169,7 +169,7 @@ dog_fashion = null sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) @@ -202,10 +202,10 @@ if(!istype(user)) return var/obj/item/organ/external/head/head_organ = user.get_organ("head") - mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kitty") + mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kitty") mob.Blend(head_organ.hair_colour, ICON_ADD) - var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner") + var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "kittyinner") mob.Blend(earbit, ICON_OVERLAY) icon_override = mob @@ -224,10 +224,10 @@ /obj/item/clothing/head/kitty/mouse/update_icon(mob/living/carbon/human/user) if(!istype(user)) return var/obj/item/organ/external/head/head_organ = user.get_organ("head") - mob = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mousey") + mob = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mousey") mob.Blend(head_organ.hair_colour, ICON_ADD) - var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "mouseyinner") + var/icon/earbit = new/icon("icon" = 'icons/mob/clothing/head.dmi', "icon_state" = "mouseyinner") mob.Blend(earbit, ICON_OVERLAY) icon_override = mob @@ -242,7 +242,7 @@ species_disguise = "High-tech robot" dog_fashion = /datum/dog_fashion/head/cardborg sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/head.dmi' + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) @@ -268,8 +268,8 @@ item_state = "head_mirror" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index f55be1d578e..774b560a858 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -8,7 +8,7 @@ actions_types = list(/datum/action/item_action/flip_cap) dog_fashion = /datum/dog_fashion/head/cargo_tech sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/soft/dropped() diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 090011ce47d..ce9e2756cef 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -10,12 +10,12 @@ adjusted_flags = SLOT_HEAD sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/balaclava/attack_self(mob/user) @@ -31,12 +31,12 @@ w_class = WEIGHT_CLASS_SMALL sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/luchador/tecnicos diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 28a0dad852d..895b0214f71 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -11,14 +11,14 @@ actions_types = list(/datum/action/item_action/adjust) resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi' ) /obj/item/clothing/mask/breath/attack_self(mob/user) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index d8cba5290b7..14dd7f3653e 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -11,13 +11,13 @@ permeability_coefficient = 0.01 resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Plasmaman" = 'icons/mob/species/plasmaman/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Plasmaman" = 'icons/mob/clothing/species/plasmaman/mask.dmi' ) // **** Welding gas mask **** @@ -50,12 +50,12 @@ resistance_flags = FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) /obj/item/clothing/mask/gas/explorer/marines diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index e663856e3c5..ece319c7a1a 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -13,7 +13,7 @@ var/locked = FALSE //Indicates if a mask is locked, should always start as 0. sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi' ) // Clumsy folks can't take the mask off themselves. @@ -91,11 +91,11 @@ flags = DROPDEL sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) /obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user) @@ -119,12 +119,12 @@ materials = list(MAT_METAL=500, MAT_GLASS=50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/muzzle/safety/shock @@ -216,12 +216,12 @@ actions_types = list(/datum/action/item_action/adjust) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) @@ -237,12 +237,12 @@ dog_fashion = /datum/dog_fashion/head/not_ian sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/fakemoustache/attack_self(mob/user) @@ -318,8 +318,8 @@ var/originalname = "" sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) /obj/item/clothing/mask/horsehead/equipped(mob/user, slot) @@ -427,12 +427,12 @@ icon_state = "bandbotany" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi', - "Grey" = 'icons/mob/species/grey/mask.dmi', - "Drask" = 'icons/mob/species/drask/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi', + "Grey" = 'icons/mob/clothing/species/grey/mask.dmi', + "Drask" = 'icons/mob/clothing/species/drask/mask.dmi' ) actions_types = list(/datum/action/item_action/adjust) diff --git a/code/modules/clothing/patreon/glasses.dm b/code/modules/clothing/patreon/glasses.dm index 08d5d6b0af8..88b8216338f 100644 --- a/code/modules/clothing/patreon/glasses.dm +++ b/code/modules/clothing/patreon/glasses.dm @@ -9,7 +9,7 @@ item_state = "gar" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi' ) diff --git a/code/modules/clothing/patreon/hats.dm b/code/modules/clothing/patreon/hats.dm index 8b769ba4150..6c34a2576c5 100644 --- a/code/modules/clothing/patreon/hats.dm +++ b/code/modules/clothing/patreon/hats.dm @@ -11,7 +11,7 @@ flags = BLOCKHAIR sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) //gold top hat and recolours @@ -22,7 +22,7 @@ item_state = "goldtophat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) @@ -47,7 +47,7 @@ flags = BLOCKHAIR sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) //black sombrero @@ -59,5 +59,5 @@ flags = BLOCKHAIR sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index e546d67f485..f5e75dd2b9f 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -34,7 +34,7 @@ icon = 'icons/obj/clothing/species/unathi/hats.dmi' species_restricted = list("Unathi") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/helmet.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi' ) /obj/item/clothing/head/helmet/space/unathi/helmet_cheap @@ -48,7 +48,7 @@ icon = 'icons/obj/clothing/species/unathi/suits.dmi' species_restricted = list("Unathi") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/suit.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi' ) /obj/item/clothing/suit/space/unathi/rig_cheap @@ -82,8 +82,8 @@ icon = 'icons/obj/clothing/species/vox/suits.dmi' species_restricted = list("Vox", "Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi', ) /obj/item/clothing/head/helmet/space/vox @@ -93,8 +93,8 @@ icon = 'icons/obj/clothing/species/vox/hats.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/head.dmi', ) /obj/item/clothing/head/helmet/space/vox/pressure @@ -151,7 +151,7 @@ icon = 'icons/obj/clothing/species/vox/uniforms.dmi' species_restricted = list("Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi' ) /obj/item/clothing/under/vox/vox_casual @@ -170,8 +170,8 @@ item_state = "vox-casual-2" species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/suit.dmi' ) /obj/item/clothing/gloves/color/yellow/vox @@ -185,8 +185,8 @@ icon = 'icons/obj/clothing/species/vox/gloves.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/gloves.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/gloves.dmi', + "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/gloves.dmi', ) /obj/item/clothing/shoes/magboots/vox @@ -197,8 +197,8 @@ icon = 'icons/obj/clothing/species/vox/shoes.dmi' species_restricted = list("Vox","Vox Armalis") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/feet.dmi', - "Vox Armalis" = 'icons/mob/species/armalis/feet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/feet.dmi', + "Vox Armalis" = 'icons/mob/clothing/species/armalis/feet.dmi' ) /obj/item/clothing/shoes/magboots/vox/attack_self(mob/user) diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index b8c4c7e86f0..571785f46a0 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -12,8 +12,8 @@ strip_delay = 130 sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi' ) /obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize() @@ -59,8 +59,8 @@ strip_delay = 130 resistance_flags = FIRE_PROOF sprite_sheets = list( - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Commander @@ -206,11 +206,11 @@ resistance_flags = FIRE_PROOF has_camera = FALSE sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi' ) /obj/item/clothing/suit/space/hardsuit/ert/paranormal @@ -221,10 +221,10 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal resistance_flags = FIRE_PROOF sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi' + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi' ) hide_tail_by_species = list("Unathi, Tajaran, Vox, Vulpkanin") diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index e4a5b029328..58514aa5a59 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -23,13 +23,13 @@ //Species-specific stuff. species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Skrell" = 'icons/mob/species/skrell/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Drask" = 'icons/mob/species/drask/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi', @@ -157,12 +157,12 @@ hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran") species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Skrell" = 'icons/mob/species/skrell/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi' + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi' ) sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi', diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 226196fbc32..32c192c213e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -10,8 +10,8 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) /obj/item/clothing/head/helmet/space/capspace/equipped(mob/living/carbon/human/user, slot) @@ -34,7 +34,7 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Deathsquad space suit, not hardsuits because no flashlight! @@ -77,7 +77,7 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/head/helmet/space/deathsquad/beret @@ -117,8 +117,8 @@ icon_state = "santahat" sprite_sheets = list( - "Grey" = 'icons/mob/species/Grey/head.dmi', - "Drask" = 'icons/mob/species/Drask/helmet.dmi' + "Grey" = 'icons/mob/clothing/species/Grey/head.dmi', + "Drask" = 'icons/mob/clothing/species/Drask/helmet.dmi' ) flags = BLOCKHAIR | STOPSPRESSUREDMAGE flags_cover = HEADCOVERSEYES @@ -177,13 +177,13 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Skrell" = 'icons/mob/species/skrell/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Drask" = 'icons/mob/species/drask/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Drask" = 'icons/mob/clothing/species/drask/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', ) sprite_sheets_obj = list( "Vox" = 'icons/obj/clothing/species/vox/hats.dmi' @@ -198,12 +198,12 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Skrell" = 'icons/mob/species/skrell/suit.dmi', - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', ) sprite_sheets_obj = list( "Vox" = 'icons/obj/clothing/species/vox/suits.dmi' @@ -218,10 +218,10 @@ species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', ) sprite_sheets_obj = list( "Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi', @@ -240,11 +240,11 @@ flash_protect = 0 species_restricted = list("exclude", "Wryn") sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Grey" = 'icons/mob/species/grey/helmet.dmi' + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi' ) sprite_sheets_obj = list( "Vox" = 'icons/obj/clothing/species/vox/hats.dmi', @@ -260,7 +260,7 @@ item_state = "spacemimehelmet" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') sprite_sheets_obj = null /obj/item/clothing/suit/space/eva/mime @@ -271,7 +271,7 @@ item_state = "spacemime_items" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') sprite_sheets_obj = null /obj/item/clothing/head/helmet/space/eva/clown @@ -282,7 +282,7 @@ item_state = "clownhelmet" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') sprite_sheets_obj = null /obj/item/clothing/suit/space/eva/clown @@ -293,5 +293,5 @@ item_state = "spaceclown_items" species_restricted = list("exclude","Wryn") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') sprite_sheets_obj = null diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index e672852858d..df18facbb10 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -22,7 +22,7 @@ visor_flags_inv = HIDEEYES|HIDEFACE icon = 'icons/obj/clothing/species/plasmaman/hats.dmi' species_restricted = list("Plasmaman") - sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/helmet.dmi') + sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/helmet.dmi') /obj/item/clothing/head/helmet/space/plasmaman/New() ..() diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 52a230fa60b..696428b90ff 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -7,11 +7,11 @@ desc = "Has a tag on it: Totally not property of a hostile corporation, honest!" armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85) sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') /obj/item/clothing/suit/space/syndicate @@ -23,10 +23,10 @@ allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals) armor = list("melee" = 40, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 80, "acid" = 85) sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') //Green syndicate space suit diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index e279b4697d3..e81482dd340 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -7,11 +7,11 @@ item_state = "void" flags_inv = HIDEMASK|HIDEEARS sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi', - "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/helmet.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Vox" = 'icons/mob/species/vox/helmet.dmi') + "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/helmet.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi', + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi') /obj/item/clothing/suit/space/nasavoid name = "NASA Void Suit" @@ -20,10 +20,10 @@ desc = "A high tech, NASA Centcom branch designed space suit. Used for AI satellite maintenance." allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/multitool) sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi') + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi') //Colors!!! /obj/item/clothing/head/helmet/space/nasavoid/green diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index 1fde5cd6f84..4021f440433 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -1,7 +1,7 @@ //Unathi clothing. /obj/item/clothing/suit/unathi sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/unathi/robe diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0a53e5c0abf..b928ff403b5 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -11,7 +11,7 @@ resistance_flags = NONE armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', ) w_class = WEIGHT_CLASS_NORMAL @@ -41,7 +41,7 @@ name = "security armor" desc = "An armored vest that protects against some damage. This one has a clip for a holobadge." sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) icon_state = "armor" item_state = "armor" diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 996ce7e3ad9..448df4cf4e7 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -11,11 +11,11 @@ resistance_flags = ACID_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Unathi" = 'icons/mob/species/unathi/head.dmi', - "Tajaran" = 'icons/mob/species/tajaran/head.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/suit/bio_suit @@ -36,10 +36,10 @@ put_on_delay = 70 resistance_flags = ACID_PROOF sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) @@ -103,8 +103,8 @@ put_on_delay = 20 sprite_sheets = list( - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', ) hide_tail_by_species = list("Unathi, Tajaran, Vulpkanin") diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index b3fd2c5aa85..ed7c776058f 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -12,7 +12,7 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 10, fire = 50, acid = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Brig Physician @@ -27,7 +27,7 @@ armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 50) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Botanist @@ -41,7 +41,7 @@ allowed = list(/obj/item/reagent_containers/spray/plantbgone,/obj/item/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator,/obj/item/reagent_containers/spray/pestspray,/obj/item/hatchet,/obj/item/storage/bag/plants) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Captain @@ -55,7 +55,7 @@ allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/internals/emergency_oxygen) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/captunic/capjacket @@ -67,7 +67,7 @@ flags_inv = HIDEJUMPSUIT sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/mantle/armor/captain @@ -88,7 +88,7 @@ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Chaplain @@ -103,7 +103,7 @@ allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Chaplain @@ -143,7 +143,7 @@ allowed = list (/obj/item/kitchen/knife) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Chef @@ -185,7 +185,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Forensics @@ -221,7 +221,7 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Engineering @@ -235,13 +235,13 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Lawyer /obj/item/clothing/suit/storage/lawyer sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/storage/lawyer/blackjacket @@ -313,7 +313,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/storage/ntrep @@ -328,7 +328,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Medical @@ -346,7 +346,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //Mime @@ -358,7 +358,7 @@ blood_overlay_type = "armor" //it's the less thing that I can put here sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/suspenders/nodrop diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index ea0a76b4427..fd0cc650679 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -11,8 +11,8 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) species_exception = list(/datum/species/golem) sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6b27515dd93..47b79e2d228 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -21,7 +21,7 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/redtag @@ -36,7 +36,7 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /* @@ -49,7 +49,7 @@ item_state = "pirate_old" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/pirate_black @@ -59,7 +59,7 @@ item_state = "pirate" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/hgpirate @@ -122,7 +122,7 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/apron/overalls @@ -269,7 +269,7 @@ item_state = "classicponcho" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/poncho/green @@ -373,7 +373,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) - sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/head/hooded/winterhood name = "winter hood" @@ -385,7 +385,7 @@ flags = BLOCKHAIR flags_inv = HIDEEARS - sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') /obj/item/clothing/suit/hooded/wintercoat/captain name = "captain's winter coat" @@ -502,7 +502,7 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen) hoodtype = /obj/item/clothing/head/hooded/hood sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/head/hooded/hood @@ -515,7 +515,7 @@ flags_inv = HIDEEARS sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) /obj/item/clothing/head/hooded/hood/blue @@ -576,7 +576,7 @@ item_state = "ianshirt" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) @@ -626,7 +626,7 @@ item_state = "brtrenchcoat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/blacktrenchcoat @@ -636,7 +636,7 @@ item_state = "bltrenchcoat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) //trackjackets @@ -653,7 +653,7 @@ adjust_flavour = "unzip" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/tracksuit/green @@ -786,7 +786,7 @@ adjust_flavour = "unzip" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/jacket/pilot @@ -826,9 +826,9 @@ adjust_flavour = "unzip" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) /obj/item/clothing/suit/jacket/leather/overcoat @@ -848,7 +848,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/soldiercoat @@ -861,7 +861,7 @@ adjust_flavour = "unbutton" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/toggle/owlwings diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 6cd8596d8b3..78321ba9733 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -36,7 +36,7 @@ item_state = "firefighter" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/suit/fire/heavy @@ -55,7 +55,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /* @@ -79,8 +79,8 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/suit/bomb_suit @@ -105,7 +105,7 @@ resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/head/bomb_hood/security @@ -133,8 +133,8 @@ resistance_flags = NONE flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/suit/radiation @@ -156,5 +156,5 @@ resistance_flags = NONE flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index d7c146e3602..8d529d82160 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -38,9 +38,9 @@ item_state = "wizhatmime" dog_fashion = null sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) /obj/item/clothing/head/wizard/fake @@ -113,9 +113,9 @@ icon_state = "wizzmime" item_state = "wizzmime" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) /obj/item/clothing/suit/wizrobe/marisa diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 53b53f54f48..b17f32df7a6 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -124,7 +124,7 @@ item_color = "waistcoat" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/stethoscope @@ -526,7 +526,7 @@ item_color = "cowboyshirt" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/short_sleeved @@ -537,7 +537,7 @@ item_color = "cowboyshirt_s" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/white @@ -548,7 +548,7 @@ item_color = "cowboyshirt_white" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/white/short_sleeved @@ -559,7 +559,7 @@ item_color = "cowboyshirt_whites" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/pink @@ -570,7 +570,7 @@ item_color = "cowboyshirt_pink" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved @@ -581,7 +581,7 @@ item_color = "cowboyshirt_pinks" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/navy @@ -592,7 +592,7 @@ item_color = "cowboyshirt_navy" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved @@ -603,7 +603,7 @@ item_color = "cowboyshirt_navys" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/red @@ -614,7 +614,7 @@ item_color = "cowboyshirt_red" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/cowboyshirt/red/short_sleeved @@ -625,9 +625,9 @@ item_color = "cowboyshirt_reds" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi' ) /obj/item/clothing/accessory/corset diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 8d7cbc1a143..dc15bd65d88 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -80,7 +80,7 @@ item_color = "webbing" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) /obj/item/clothing/accessory/storage/black_vest diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 8d0e68eddb0..607113803fd 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -109,7 +109,7 @@ item_color = "psyche" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi' ) /obj/item/clothing/under/color/lightblue diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm index b3d7ce83431..05cb5a1fb71 100644 --- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm +++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm @@ -9,7 +9,7 @@ var/extinguishes_left = 5 icon = 'icons/obj/clothing/species/plasmaman/uniform.dmi' species_restricted = list("Plasmaman") - sprite_sheets = list("Plasmaman" = 'icons/mob/species/plasmaman/uniform.dmi') + sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/uniform.dmi') icon_state = "plasmaman" item_state = "plasmaman" item_color = "plasmaman" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index f022ab40d9d..6908a405a88 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -84,7 +84,7 @@ strip_delay = 50 sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/uniform.dmi' + "Vox" = 'icons/mob/clothing/species/vox/uniform.dmi' ) /* diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index e645c9e264e..f316f486379 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -344,7 +344,7 @@ M.icon = 'icons/obj/custom_items.dmi' M.icon_state = "gas_tariq" M.sprite_sheets = list( - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi' ) user.update_icons() qdel(src) @@ -935,7 +935,7 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "k3_webbing" - sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') ignore_suitadjust = 0 actions_types = list(/datum/action/item_action/toggle) suit_adjusted = 0 @@ -1648,7 +1648,7 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi') icon_state = "kiaoutfit" item_state = "kiaoutfit" item_color = "kiaoutfit" @@ -1671,7 +1671,7 @@ icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - sprite_sheets = list("Vox" = 'icons/mob/species/vox/mask.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi') icon_state = "kiamask" item_state = "kiamask" item_color = "kiamask" @@ -1704,7 +1704,7 @@ desc = "A simple black dress with a white undercoat, tied with a blue ribbon." lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/uniform.dmi') icon = 'icons/obj/custom_items.dmi' icon_state = "kikeridress" item_state = "kikeridress" diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm index b36231d3829..ec17f3c4a5a 100644 --- a/code/modules/food_and_drinks/food/foods/junkfood.dm +++ b/code/modules/food_and_drinks/food/foods/junkfood.dm @@ -84,6 +84,14 @@ list_reagents = list("nutriment" = 2, "sugar" = 4) tastes = list("bread" = 1) +/obj/item/reagent_containers/food/snacks/stroopwafel + name = "stroopwafel" + desc = "Straight from the snack factories of Space Den Haag comes a classic dutch treat!" + icon_state = "stroopwafel" + filling_color = "#EDB878" + junkiness = 5 + list_reagents = list("nutriment" = 10, "sugar" = 4) + tastes = list("syrup" = 3, "waffle" = 2) ////////////////////// // Homemade // diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index a1db59b83a5..6d1f482adf9 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -13,6 +13,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 + face_while_pulling = TRUE /// The maximum number of items the fridge can hold. Multiplicated by the matter bin component's rating. var/max_n_of_items = 1500 /// Associative list (/text => /number) tracking the amounts of a specific item held by the fridge. diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 8315d0ef781..b76c036390b 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -16,11 +16,11 @@ hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/suit.dmi', - "Drask" = 'icons/mob/species/drask/suit.dmi', - "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi' ) /obj/item/clothing/head/hooded/explorer @@ -37,10 +37,10 @@ resistance_flags = FIRE_PROOF sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi', - "Drask" = 'icons/mob/species/drask/head.dmi', - "Grey" = 'icons/mob/species/grey/head.dmi', - "Skrell" = 'icons/mob/species/skrell/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Skrell" = 'icons/mob/clothing/species/skrell/head.dmi' ) /obj/item/clothing/suit/space/hostile_environment diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 79ac1299164..b5bd17ed1e9 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -106,8 +106,8 @@ to_chat(src, "[speaker_name][speaker.GetAltName()] [track][verb], \"[message]\"") // Create map text message - if (client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) // can_hear is checked up there on L99 - create_chat_message(speaker.runechat_msg_location, message_clean, italics) + if(client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) // can_hear is checked up there on L99 + create_chat_message(locateUID(speaker.runechat_msg_location), message_clean, italics) if(speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z)) var/turf/source = speaker? get_turf(speaker) : get_turf(src) diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 76a5d0bbb50..5452dc84d19 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -111,8 +111,8 @@ I'm using this for Stat to give it a more nifty interface to work with /mob/living/carbon/brain/update_runechat_msg_location() if(ismecha(loc)) - runechat_msg_location = loc + runechat_msg_location = loc.UID() else if(container) - runechat_msg_location = container + runechat_msg_location = container.UID() else - runechat_msg_location = src + return ..() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4fc523a5466..ca9b0b9c028 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1939,9 +1939,9 @@ Eyes need to have significantly high darksight to shine unless the mob has the X /mob/living/carbon/human/update_runechat_msg_location() if(ismecha(loc)) - runechat_msg_location = loc + runechat_msg_location = loc.UID() else - runechat_msg_location = src + return ..() /mob/living/carbon/human/verb/Examine_OOC() set name = "Examine Meta-Info (OOC)" diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm index 3813dedbdd7..294735c434d 100644 --- a/code/modules/mob/living/carbon/human/species/diona.dm +++ b/code/modules/mob/living/carbon/human/species/diona.dm @@ -10,6 +10,7 @@ burn_mod = 1.25 heatmod = 1.5 + brain_mod = 0 var/pod = FALSE //did they come from a pod? If so, they're stronger than normal Diona. blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \ @@ -37,13 +38,13 @@ reagent_tag = PROCESS_ORG has_organ = list( - "nutrient channel" = /obj/item/organ/internal/liver/diona, - "respiratory vacuoles" = /obj/item/organ/internal/lungs/diona, - "neural strata" = /obj/item/organ/internal/heart/diona, + "liver" = /obj/item/organ/internal/liver/diona, + "lungs" = /obj/item/organ/internal/lungs/diona, + "heart" = /obj/item/organ/internal/heart/diona, "eyes" = /obj/item/organ/internal/eyes/diona, //Default darksight of 2. - "gas bladder" = /obj/item/organ/internal/brain/diona, - "polyp segment" = /obj/item/organ/internal/kidneys/diona, - "anchoring ligament" = /obj/item/organ/internal/appendix/diona + "brain" = /obj/item/organ/internal/brain/diona, + "kidneys" = /obj/item/organ/internal/kidneys/diona, + "appendix" = /obj/item/organ/internal/appendix/diona ) has_limbs = list( "chest" = list("path" = /obj/item/organ/external/chest/diona), diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm index 05767c244f1..5f91e9ad1bb 100644 --- a/code/modules/mob/living/carbon/human/species/drask.dm +++ b/code/modules/mob/living/carbon/human/species/drask.dm @@ -56,7 +56,7 @@ has_organ = list( "heart" = /obj/item/organ/internal/heart/drask, "lungs" = /obj/item/organ/internal/lungs/drask, - "metabolic strainer" = /obj/item/organ/internal/liver/drask, + "liver" = /obj/item/organ/internal/liver/drask, "eyes" = /obj/item/organ/internal/eyes/drask, //5 darksight. "brain" = /obj/item/organ/internal/brain/drask ) diff --git a/code/modules/mob/living/carbon/human/species/nucleation.dm b/code/modules/mob/living/carbon/human/species/nucleation.dm index 4c2f7623f0e..b4dc9d1f952 100644 --- a/code/modules/mob/living/carbon/human/species/nucleation.dm +++ b/code/modules/mob/living/carbon/human/species/nucleation.dm @@ -24,7 +24,7 @@ reagent_tag = PROCESS_ORG has_organ = list( "heart" = /obj/item/organ/internal/heart, - "crystallized brain" = /obj/item/organ/internal/brain/crystal, + "brain" = /obj/item/organ/internal/brain/crystal, "eyes" = /obj/item/organ/internal/eyes/luminescent_crystal, //Standard darksight of 2. "strange crystal" = /obj/item/organ/internal/nucleation/strange_crystal ) diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index 7fc3640ac3d..547f2ad31b1 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -59,7 +59,7 @@ "lungs" = /obj/item/organ/internal/lungs/vox, "liver" = /obj/item/organ/internal/liver/vox, "kidneys" = /obj/item/organ/internal/kidneys/vox, - "cortical stack" = /obj/item/organ/internal/brain/vox, + "brain" = /obj/item/organ/internal/brain/vox, "appendix" = /obj/item/organ/internal/appendix, "eyes" = /obj/item/organ/internal/eyes/vox, //Default darksight of 2. ) //for determining the success of the heist game-mode's 'leave nobody behind' objective, while this is just an organ. diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index af90d80e995..79d6c50ebfc 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -250,7 +250,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) apply_overlay(LIMBS_LAYER) //Underwear - var/icon/underwear_standing = new /icon('icons/mob/underwear.dmi', "nude") + var/icon/underwear_standing = new /icon('icons/mob/clothing/underwear.dmi', "nude") if(underwear && dna.species.clothing_flags & HAS_UNDERWEAR) var/datum/sprite_accessory/underwear/U = GLOB.underwear_list[underwear] if(U) @@ -546,7 +546,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(!t_color) t_color = icon_state - var/mutable_appearance/standing = mutable_appearance('icons/mob/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) + var/mutable_appearance/standing = mutable_appearance('icons/mob/clothing/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) if(w_uniform.icon_override) standing.icon = w_uniform.icon_override @@ -638,7 +638,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.name]) standing = mutable_appearance(gloves.sprite_sheets[dna.species.name], "[t_state]", layer = -GLOVES_LAYER) else - standing = mutable_appearance('icons/mob/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) + standing = mutable_appearance('icons/mob/clothing/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) if(gloves.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") @@ -676,7 +676,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(glasses.sprite_sheets && glasses.sprite_sheets[head_organ.dna.species.name]) new_glasses = mutable_appearance(glasses.sprite_sheets[head_organ.dna.species.name], "[glasses.icon_state]", layer = -GLASSES_LAYER) else - new_glasses = mutable_appearance('icons/mob/eyes.dmi', "[glasses.icon_state]", layer = -GLASSES_LAYER) + new_glasses = mutable_appearance('icons/mob/clothing/eyes.dmi', "[glasses.icon_state]", layer = -GLASSES_LAYER) var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style] var/obj/item/clothing/glasses/G = glasses @@ -722,7 +722,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.name]) overlays_standing[EARS_LAYER] = mutable_appearance(l_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER) else - overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER) + overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/clothing/ears.dmi', "[t_type]", layer = -EARS_LAYER) if(r_ear) if(client && hud_used && hud_used.hud_shown) @@ -739,7 +739,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.name]) overlays_standing[EARS_LAYER] = mutable_appearance(r_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER) else - overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER) + overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/clothing/ears.dmi', "[t_type]", layer = -EARS_LAYER) apply_overlay(EARS_LAYER) /mob/living/carbon/human/update_inv_shoes() @@ -761,7 +761,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(shoes.sprite_sheets && shoes.sprite_sheets[dna.species.name]) standing = mutable_appearance(shoes.sprite_sheets[dna.species.name], "[shoes.icon_state]", layer = -SHOES_LAYER) else - standing = mutable_appearance('icons/mob/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER) + standing = mutable_appearance('icons/mob/clothing/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER) if(shoes.blood_DNA) @@ -793,7 +793,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) var/t_state = s_store.item_state if(!t_state) t_state = s_store.icon_state - var/dmi='icons/mob/belt_mirror.dmi' + var/dmi='icons/mob/clothing/belt_mirror.dmi' overlays_standing[SUIT_STORE_LAYER] = mutable_appearance(dmi, "[t_state]", layer = -SUIT_STORE_LAYER) s_store.screen_loc = ui_sstore1 //TODO apply_overlay(SUIT_STORE_LAYER) @@ -814,7 +814,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(head.sprite_sheets && head.sprite_sheets[dna.species.name]) standing = mutable_appearance(head.sprite_sheets[dna.species.name], "[head.icon_state]", layer = -HEAD_LAYER) else - standing = mutable_appearance('icons/mob/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER) + standing = mutable_appearance('icons/mob/clothing/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER) if(head.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "helmetblood") @@ -847,7 +847,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(belt.sprite_sheets && belt.sprite_sheets[dna.species.name]) overlays_standing[BELT_LAYER] = mutable_appearance(belt.sprite_sheets[dna.species.name], "[t_state]", layer = -BELT_LAYER) else - overlays_standing[BELT_LAYER] = mutable_appearance('icons/mob/belt.dmi', "[t_state]", layer = -BELT_LAYER) + overlays_standing[BELT_LAYER] = mutable_appearance('icons/mob/clothing/belt.dmi', "[t_state]", layer = -BELT_LAYER) apply_overlay(BELT_LAYER) @@ -870,7 +870,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.name]) standing = mutable_appearance(wear_suit.sprite_sheets[dna.species.name], "[wear_suit.icon_state]", layer = -SUIT_LAYER) else - standing = mutable_appearance('icons/mob/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER) + standing = mutable_appearance('icons/mob/clothing/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER) if(wear_suit.breakouttime) drop_l_hand() @@ -951,7 +951,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) mask_icon = new(wear_mask.sprite_sheets[dna.species.name]) standing = mutable_appearance(wear_mask.sprite_sheets[dna.species.name], "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) else - standing = mutable_appearance('icons/mob/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) + standing = mutable_appearance('icons/mob/clothing/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) if(!istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "maskblood") @@ -975,7 +975,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) else if(back.sprite_sheets && back.sprite_sheets[dna.species.name]) standing = mutable_appearance(back.sprite_sheets[dna.species.name], "[back.icon_state]", layer = -BACK_LAYER) else - standing = mutable_appearance('icons/mob/back.dmi', "[back.icon_state]", layer = -BACK_LAYER) + standing = mutable_appearance('icons/mob/clothing/back.dmi', "[back.icon_state]", layer = -BACK_LAYER) //create the image standing.alpha = back.alpha @@ -1239,11 +1239,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_tail_layer() //Adds a collar overlay above the helmet layer if the suit has one -// Suit needs an identically named sprite in icons/mob/collar.dmi -// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi. +// Suit needs an identically named sprite in icons/mob/clothing/collar.dmi +// For suits with sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/clothing/species/[species_name_here]/collar.dmi. /mob/living/carbon/human/proc/update_collar() remove_overlay(COLLAR_LAYER) - var/icon/C = new('icons/mob/collar.dmi') + var/icon/C = new('icons/mob/clothing/collar.dmi') var/mutable_appearance/standing = null if(wear_suit) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 9ac4200faec..6c646d2509e 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1251,7 +1251,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( var/rendered = "Relayed Speech: [name_used] [message]" if(client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) var/message_clean = combine_message(message_pieces, null, M) - create_chat_message(M.runechat_msg_location, message_clean) + create_chat_message(locateUID(M.runechat_msg_location), message_clean) show_message(rendered, 2) /mob/living/silicon/ai/proc/malfhacked(obj/machinery/power/apc/apc) @@ -1371,8 +1371,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( /mob/living/silicon/ai/update_runechat_msg_location() if(istype(loc, /obj/item/aicard) || ismecha(loc)) - runechat_msg_location = loc + runechat_msg_location = loc.UID() else - runechat_msg_location = src + return ..() #undef TEXT_ANNOUNCEMENT_COOLDOWN diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 9ddbaf61a03..677f67ebf13 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -520,6 +520,6 @@ /mob/living/silicon/pai/update_runechat_msg_location() if(istype(loc, /obj/item/paicard)) - runechat_msg_location = loc + runechat_msg_location = loc.UID() else - runechat_msg_location = src + return ..() diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 3e4686e146d..1df0f15bcf4 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -65,6 +65,6 @@ /mob/living/simple_animal/shade/update_runechat_msg_location() if(istype(loc, /obj/item/soulstone)) - runechat_msg_location = loc + runechat_msg_location = loc.UID() else - runechat_msg_location = src + return ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 91a6bad69ff..f801c0f072f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -32,7 +32,6 @@ GLOB.alive_mob_list += src set_focus(src) prepare_huds() - runechat_msg_location = src update_runechat_msg_location() . = ..() @@ -1455,9 +1454,11 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ /** * Updates the mob's runechat maptext display location. + * + * By default, we set this to the src mob's `UID()`. */ /mob/proc/update_runechat_msg_location() - return + runechat_msg_location = UID() /** diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 423908e689d..2f7511e3b04 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -201,5 +201,5 @@ /// Overrides the health HUD element state if set. var/health_hud_override = HEALTH_HUD_OVERRIDE_NONE - /// The location our runechat message should appear. Should be src by default. - var/atom/runechat_msg_location + /// A soft reference to the location where this mob's runechat message will appear. Uses `UID()`. + var/runechat_msg_location diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index ed75caa8f39..21b357146cb 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -168,8 +168,13 @@ direct = newdir n = get_step(mob, direct) - . = mob.SelfMove(n, direct, delay) - if(mob.pulling?.face_while_pulling) + var/prev_pulling_loc = null + if(mob.pulling) + prev_pulling_loc = mob.pulling.loc + + . = mob.SelfMove(n, direct, delay) // The actual movement + + if(prev_pulling_loc && mob.pulling?.face_while_pulling && (mob.pulling.loc != prev_pulling_loc)) mob.setDir(get_dir(mob, mob.pulling)) // Face welding tanks and stuff when pulling else mob.setDir(direct) diff --git a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm index 6e618dba0d0..7d9be34c063 100644 --- a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm @@ -167,11 +167,11 @@ // Underwear Definitions // /////////////////////////// /datum/sprite_accessory/underwear - icon = 'icons/mob/underwear.dmi' + icon = 'icons/mob/clothing/underwear.dmi' species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/underwear.dmi', - "Grey" = 'icons/mob/species/grey/underwear.dmi' + "Vox" = 'icons/mob/clothing/species/vox/underwear.dmi', + "Grey" = 'icons/mob/clothing/species/grey/underwear.dmi' ) gender = NEUTER @@ -297,11 +297,11 @@ // Undershirt Definitions // //////////////////////////// /datum/sprite_accessory/undershirt - icon = 'icons/mob/underwear.dmi' + icon = 'icons/mob/clothing/underwear.dmi' species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/underwear.dmi', - "Grey" = 'icons/mob/species/grey/underwear.dmi') + "Vox" = 'icons/mob/clothing/species/vox/underwear.dmi', + "Grey" = 'icons/mob/clothing/species/grey/underwear.dmi') gender = NEUTER /datum/sprite_accessory/undershirt/nude @@ -536,9 +536,9 @@ // Socks Definitions // /////////////////////// /datum/sprite_accessory/socks - icon = 'icons/mob/underwear.dmi' + icon = 'icons/mob/clothing/underwear.dmi' species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox") - sprite_sheets = list("Vox" = 'icons/mob/species/vox/underwear.dmi') + sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/underwear.dmi') gender = NEUTER /datum/sprite_accessory/socks/nude diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index f88ada9f0b4..b61258440bd 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -13,10 +13,10 @@ Contents: item_state = "s-ninja_mask" sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi', - "Unathi" = 'icons/mob/species/unathi/mask.dmi', - "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', - "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + "Vox" = 'icons/mob/clothing/species/vox/mask.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/mask.dmi' ) var/obj/item/voice_changer/voice_changer diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 973e7da9596..135923c6ef6 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -52,7 +52,7 @@ ammo_type = list(/obj/item/ammo_casing/energy/sonic) cell_type = /obj/item/stock_parts/cell/super restricted_species = list(/datum/species/vox/armalis) - sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/species/armalis/held.dmi') //Big guns big birds. + sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/held.dmi') //Big guns big birds. /obj/item/gun/energy/noisecannon/update_icon() return diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 316a22a4db1..e4bb23b0ceb 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -86,17 +86,30 @@ damage = 70 stun = 5 weaken = 5 - dismemberment = 50 armour_penetration = 50 - var/breakthings = TRUE -/obj/item/projectile/bullet/sniper/on_hit(atom/target, blocked = 0, hit_zone) - if((blocked != 100) && (!ismob(target) && breakthings)) +/obj/item/ammo_box/magazine/sniper_rounds/antimatter + name = "sniper rounds (Antimatter)" + desc = "Antimatter sniper rounds, for when you really don't like something." + icon_state = "antimatter" + ammo_type = /obj/item/ammo_casing/antimatter + +/obj/item/ammo_casing/antimatter + desc = "A .50 antimatter bullet casing, designed to cause massive damage to whatever is hit." + caliber = ".50" + projectile_type = /obj/item/projectile/bullet/sniper/antimatter + icon_state = ".50" + +/obj/item/projectile/bullet/sniper/antimatter + name = "antimatter bullet" + dismemberment = 50 + +/obj/item/projectile/bullet/sniper/antimatter/on_hit(atom/target, blocked = 0, hit_zone) + if((blocked != 100) && (!ismob(target))) target.ex_act(rand(1,2)) return ..() - //Sleepy ammo /obj/item/ammo_box/magazine/sniper_rounds/soporific name = "sniper rounds (Zzzzz)" @@ -117,9 +130,7 @@ armour_penetration = 0 nodamage = 1 stun = 0 - dismemberment = 0 weaken = 0 - breakthings = FALSE /obj/item/projectile/bullet/sniper/soporific/on_hit(atom/target, blocked = 0, hit_zone) if((blocked != 100) && istype(target, /mob/living)) @@ -145,17 +156,15 @@ icon_state = ".50" /obj/item/projectile/bullet/sniper/haemorrhage - armour_penetration = 15 - damage = 15 - stun = 0 - dismemberment = 0 - weaken = 0 - breakthings = FALSE + armour_penetration = 25 + damage = 45 + stun = 3 + weaken = 3 /obj/item/projectile/bullet/sniper/haemorrhage/on_hit(atom/target, blocked = 0, hit_zone) if((blocked != 100) && iscarbon(target)) var/mob/living/carbon/C = target - C.bleed(100) + C.bleed(150) return ..() @@ -163,6 +172,7 @@ /obj/item/ammo_box/magazine/sniper_rounds/penetrator name = "sniper rounds (penetrator)" desc = "An extremely powerful round capable of passing straight through cover and anyone unfortunate enough to be behind it." + icon_state = "penetrator" ammo_type = /obj/item/ammo_casing/penetrator origin_tech = "combat=6;syndicate=3" max_ammo = 5 @@ -181,7 +191,6 @@ stun = 0 dismemberment = 0 weaken = 0 - breakthings = FALSE //compact ammo /obj/item/ammo_box/magazine/sniper_rounds/compact @@ -193,14 +202,11 @@ /obj/item/ammo_casing/compact desc = "A .50 caliber compact round casing." caliber = ".50" - projectile_type = /obj/item/projectile/bullet/sniper/compact + projectile_type = /obj/item/projectile/bullet/sniper //Same as the base sniper bullet, but can't be reloaded with any fancy sniper ammo in the mag, which only holds 4 muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL icon_state = ".50" -/obj/item/projectile/bullet/sniper/compact //Can't dismember, and can't break things; just deals massive damage. - dismemberment = 0 - breakthings = FALSE //toy magazine /obj/item/ammo_box/magazine/toy/sniper_rounds diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 94172e14f0e..fa2765e54b4 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -1458,3 +1458,58 @@ drink_desc = "A sawed-off cola bottle filled with Fernet Cola. You can hear cuarteto music coming from the inside." taste_description = "low class heaven" remove_nutrition = 1 + +/datum/reagent/consumable/ethanol/gimlet + name = "Gimlet" + id = "gimlet" + description = "A sharp cocktail dating back to the 19th century. Gin and lime, nothing else." + color = "#DEF8AB" // rgb (222, 248, 171) + alcohol_perc = 0.3 + drink_icon = "gimlet" + drink_name = "Gimlet" + drink_desc = "There are debates on whether this drink should be half gin and half lime, or three parts gin and one part lime. All you know is, it's alcohol." + taste_description = "sharpness" + +/datum/reagent/consumable/ethanol/sidecar + name = "Sidecar" + id = "sidecar" + description = "A citrus cocktail of cognac, lemon and orange." + color = "#D7A61E" // rgb (215, 166, 30) + alcohol_perc = 0.4 + drink_icon = "sidecar" + drink_name = "Sidecar" + drink_desc = "You can smell the citrus from here!" + taste_description = "smooth cognac and tart citrus" + +/datum/reagent/consumable/ethanol/whiskey_sour + name = "Whiskey Sour" + id = "whiskeysour" + description = "A tantalizing mixture of whiskey, sugar, lemon juice... and egg whites?" + color = "#E4D629" // rgb (228, 214, 41) + alcohol_perc = 0.6 + drink_icon = "whiskeysour" + drink_name = "Whiskey Sour" + drink_desc = "Lemon and whiskey, with a cute foamy head!" + taste_description = "warm whiskey and sweetness" + +/datum/reagent/consumable/ethanol/mint_julep + name = "Mint Julep" + id = "mintjulep" + description = "A refreshing, cold mix of whiskey and mint. Perfect for summer!" + color = "#EAE2C8" // rgb (243, 226, 200) + alcohol_perc = 0.4 + drink_icon = "mintjulep" + drink_name = "Mint Julep" + drink_desc = "A dainty glass of whiskey and mint on the rocks. Perfect for summer!" + taste_description = "sweet and cooling mint" + +/datum/reagent/consumable/ethanol/pina_colada + name = "Pina Colada" + id = "pinacolada" + description = "Tropical deliciousness." + color = "#F9D17D" // rgb (249, 209, 125) + alcohol_perc = 0.4 + drink_icon = "pinacolada" + drink_name = "Pina Colada" + drink_desc = "After taking a sip, you feel contractually obligated to start singing a certain song of the same name." + taste_description = "tart and tropical pineapple" diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index 3d225263359..e589b07cf03 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -177,3 +177,13 @@ /datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M) M.Jitter(5) return ..() + +/datum/reagent/consumable/drink/cold/arnold_palmer + name = "Arnold Palmer" + id = "arnold_palmer" + description = "A wholesome mixture of lemonade and iced tea." + color = "#8B5427" // rgb: 139, 84, 39 + drink_icon = "arnoldpalmer" + drink_name = "Arnold Palmer" + drink_desc = "A wholesome mixture of lemonade and iced tea... looks like somebody didn't stir this one very well." + taste_description = "sweet and fizzy" diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index 1bdb91f1ab6..f03ae9b316b 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -902,3 +902,51 @@ result_amount = 3 mix_message = "The ingredients mix into a dark brown godly substance" mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/arnold_palmer + name = "Arnold Palmer" + id = "arnold_palmer" + result = "arnold_palmer" + required_reagents = list("icetea" = 1, "lemonade" = 1) + result_amount = 2 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/gimlet + name = "Gimlet" + id = "gimlet" + result = "gimlet" + required_reagents = list("gin" = 1, "limejuice" = 1) + result_amount = 2 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/sidecar + name = "Sidecar" + id = "sidecar" + result = "sidecar" + required_reagents = list("cognac" = 1, "orangejuice" = 1, "lemonjuice" = 1) + result_amount = 3 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/whiskey_sour + name = "Whiskey Sour" + id = "whiskeysour" + result = "whiskeysour" + required_reagents = list("whiskey" = 1, "lemonjuice" = 1, "sugar" = 1, "egg" = 1) + result_amount = 4 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/mint_julep + name = "Mint Julep" + id = "mintjulep" + result = "mintjulep" + required_reagents = list("whiskey" = 1, "sugar" = 1, "ice" = 1, "mint" = 1) + result_amount = 4 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/pina_colada + name = "Pina Colada" + id = "pinacolada" + result = "pinacolada" + required_reagents = list("rum" = 3, "pineapplejuice" = 2, "cream" = 1) + result_amount = 6 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' diff --git a/icons/mob/back.dmi b/icons/mob/clothing/back.dmi similarity index 100% rename from icons/mob/back.dmi rename to icons/mob/clothing/back.dmi diff --git a/icons/mob/belt.dmi b/icons/mob/clothing/belt.dmi similarity index 100% rename from icons/mob/belt.dmi rename to icons/mob/clothing/belt.dmi diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi similarity index 100% rename from icons/mob/belt_mirror.dmi rename to icons/mob/clothing/belt_mirror.dmi diff --git a/icons/mob/collar.dmi b/icons/mob/clothing/collar.dmi similarity index 100% rename from icons/mob/collar.dmi rename to icons/mob/clothing/collar.dmi diff --git a/icons/mob/ears.dmi b/icons/mob/clothing/ears.dmi similarity index 100% rename from icons/mob/ears.dmi rename to icons/mob/clothing/ears.dmi diff --git a/icons/mob/eyes.dmi b/icons/mob/clothing/eyes.dmi similarity index 100% rename from icons/mob/eyes.dmi rename to icons/mob/clothing/eyes.dmi diff --git a/icons/mob/feet.dmi b/icons/mob/clothing/feet.dmi similarity index 100% rename from icons/mob/feet.dmi rename to icons/mob/clothing/feet.dmi diff --git a/icons/mob/hands.dmi b/icons/mob/clothing/hands.dmi similarity index 100% rename from icons/mob/hands.dmi rename to icons/mob/clothing/hands.dmi diff --git a/icons/mob/head.dmi b/icons/mob/clothing/head.dmi similarity index 100% rename from icons/mob/head.dmi rename to icons/mob/clothing/head.dmi diff --git a/icons/mob/mask.dmi b/icons/mob/clothing/mask.dmi similarity index 100% rename from icons/mob/mask.dmi rename to icons/mob/clothing/mask.dmi diff --git a/icons/mob/species/armalis/back.dmi b/icons/mob/clothing/species/armalis/back.dmi similarity index 100% rename from icons/mob/species/armalis/back.dmi rename to icons/mob/clothing/species/armalis/back.dmi diff --git a/icons/mob/species/armalis/belt.dmi b/icons/mob/clothing/species/armalis/belt.dmi similarity index 100% rename from icons/mob/species/armalis/belt.dmi rename to icons/mob/clothing/species/armalis/belt.dmi diff --git a/icons/mob/species/armalis/ears.dmi b/icons/mob/clothing/species/armalis/ears.dmi similarity index 100% rename from icons/mob/species/armalis/ears.dmi rename to icons/mob/clothing/species/armalis/ears.dmi diff --git a/icons/mob/species/armalis/feet.dmi b/icons/mob/clothing/species/armalis/feet.dmi similarity index 100% rename from icons/mob/species/armalis/feet.dmi rename to icons/mob/clothing/species/armalis/feet.dmi diff --git a/icons/mob/species/armalis/gloves.dmi b/icons/mob/clothing/species/armalis/gloves.dmi similarity index 100% rename from icons/mob/species/armalis/gloves.dmi rename to icons/mob/clothing/species/armalis/gloves.dmi diff --git a/icons/mob/species/armalis/head.dmi b/icons/mob/clothing/species/armalis/head.dmi similarity index 100% rename from icons/mob/species/armalis/head.dmi rename to icons/mob/clothing/species/armalis/head.dmi diff --git a/icons/mob/species/armalis/held.dmi b/icons/mob/clothing/species/armalis/held.dmi similarity index 100% rename from icons/mob/species/armalis/held.dmi rename to icons/mob/clothing/species/armalis/held.dmi diff --git a/icons/mob/species/armalis/mask.dmi b/icons/mob/clothing/species/armalis/mask.dmi similarity index 100% rename from icons/mob/species/armalis/mask.dmi rename to icons/mob/clothing/species/armalis/mask.dmi diff --git a/icons/mob/species/armalis/suit.dmi b/icons/mob/clothing/species/armalis/suit.dmi similarity index 100% rename from icons/mob/species/armalis/suit.dmi rename to icons/mob/clothing/species/armalis/suit.dmi diff --git a/icons/mob/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi similarity index 100% rename from icons/mob/species/drask/eyes.dmi rename to icons/mob/clothing/species/drask/eyes.dmi diff --git a/icons/mob/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi similarity index 100% rename from icons/mob/species/drask/gloves.dmi rename to icons/mob/clothing/species/drask/gloves.dmi diff --git a/icons/mob/species/drask/gloves1.dmi b/icons/mob/clothing/species/drask/gloves1.dmi similarity index 100% rename from icons/mob/species/drask/gloves1.dmi rename to icons/mob/clothing/species/drask/gloves1.dmi diff --git a/icons/mob/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi similarity index 100% rename from icons/mob/species/drask/head.dmi rename to icons/mob/clothing/species/drask/head.dmi diff --git a/icons/mob/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi similarity index 100% rename from icons/mob/species/drask/helmet.dmi rename to icons/mob/clothing/species/drask/helmet.dmi diff --git a/icons/mob/species/drask/mask.dmi b/icons/mob/clothing/species/drask/mask.dmi similarity index 100% rename from icons/mob/species/drask/mask.dmi rename to icons/mob/clothing/species/drask/mask.dmi diff --git a/icons/mob/species/drask/shoes.dmi b/icons/mob/clothing/species/drask/shoes.dmi similarity index 100% rename from icons/mob/species/drask/shoes.dmi rename to icons/mob/clothing/species/drask/shoes.dmi diff --git a/icons/mob/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi similarity index 100% rename from icons/mob/species/drask/suit.dmi rename to icons/mob/clothing/species/drask/suit.dmi diff --git a/icons/mob/species/drask/uniform.dmi b/icons/mob/clothing/species/drask/uniform.dmi similarity index 100% rename from icons/mob/species/drask/uniform.dmi rename to icons/mob/clothing/species/drask/uniform.dmi diff --git a/icons/mob/species/grey/back.dmi b/icons/mob/clothing/species/grey/back.dmi similarity index 100% rename from icons/mob/species/grey/back.dmi rename to icons/mob/clothing/species/grey/back.dmi diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi similarity index 100% rename from icons/mob/species/grey/eyes.dmi rename to icons/mob/clothing/species/grey/eyes.dmi diff --git a/icons/mob/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi similarity index 100% rename from icons/mob/species/grey/head.dmi rename to icons/mob/clothing/species/grey/head.dmi diff --git a/icons/mob/species/grey/helmet.dmi b/icons/mob/clothing/species/grey/helmet.dmi similarity index 100% rename from icons/mob/species/grey/helmet.dmi rename to icons/mob/clothing/species/grey/helmet.dmi diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi similarity index 100% rename from icons/mob/species/grey/mask.dmi rename to icons/mob/clothing/species/grey/mask.dmi diff --git a/icons/mob/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi similarity index 100% rename from icons/mob/species/grey/suit.dmi rename to icons/mob/clothing/species/grey/suit.dmi diff --git a/icons/mob/species/grey/underwear.dmi b/icons/mob/clothing/species/grey/underwear.dmi similarity index 100% rename from icons/mob/species/grey/underwear.dmi rename to icons/mob/clothing/species/grey/underwear.dmi diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/clothing/species/grey/uniform.dmi similarity index 100% rename from icons/mob/species/grey/uniform.dmi rename to icons/mob/clothing/species/grey/uniform.dmi diff --git a/icons/mob/species/kidan/head.dmi b/icons/mob/clothing/species/kidan/head.dmi similarity index 100% rename from icons/mob/species/kidan/head.dmi rename to icons/mob/clothing/species/kidan/head.dmi diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi similarity index 100% rename from icons/mob/species/plasmaman/helmet.dmi rename to icons/mob/clothing/species/plasmaman/helmet.dmi diff --git a/icons/mob/species/plasmaman/mask.dmi b/icons/mob/clothing/species/plasmaman/mask.dmi similarity index 100% rename from icons/mob/species/plasmaman/mask.dmi rename to icons/mob/clothing/species/plasmaman/mask.dmi diff --git a/icons/mob/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi similarity index 100% rename from icons/mob/species/plasmaman/uniform.dmi rename to icons/mob/clothing/species/plasmaman/uniform.dmi diff --git a/icons/mob/species/skrell/head.dmi b/icons/mob/clothing/species/skrell/head.dmi similarity index 100% rename from icons/mob/species/skrell/head.dmi rename to icons/mob/clothing/species/skrell/head.dmi diff --git a/icons/mob/species/skrell/held.dmi b/icons/mob/clothing/species/skrell/held.dmi similarity index 100% rename from icons/mob/species/skrell/held.dmi rename to icons/mob/clothing/species/skrell/held.dmi diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/clothing/species/skrell/helmet.dmi similarity index 100% rename from icons/mob/species/skrell/helmet.dmi rename to icons/mob/clothing/species/skrell/helmet.dmi diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/clothing/species/skrell/suit.dmi similarity index 100% rename from icons/mob/species/skrell/suit.dmi rename to icons/mob/clothing/species/skrell/suit.dmi diff --git a/icons/mob/species/tajaran/head.dmi b/icons/mob/clothing/species/tajaran/head.dmi similarity index 100% rename from icons/mob/species/tajaran/head.dmi rename to icons/mob/clothing/species/tajaran/head.dmi diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/clothing/species/tajaran/helmet.dmi similarity index 100% rename from icons/mob/species/tajaran/helmet.dmi rename to icons/mob/clothing/species/tajaran/helmet.dmi diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/clothing/species/tajaran/mask.dmi similarity index 100% rename from icons/mob/species/tajaran/mask.dmi rename to icons/mob/clothing/species/tajaran/mask.dmi diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/clothing/species/tajaran/suit.dmi similarity index 100% rename from icons/mob/species/tajaran/suit.dmi rename to icons/mob/clothing/species/tajaran/suit.dmi diff --git a/icons/mob/species/unathi/feet.dmi b/icons/mob/clothing/species/unathi/feet.dmi similarity index 100% rename from icons/mob/species/unathi/feet.dmi rename to icons/mob/clothing/species/unathi/feet.dmi diff --git a/icons/mob/species/unathi/gloves.dmi b/icons/mob/clothing/species/unathi/gloves.dmi similarity index 100% rename from icons/mob/species/unathi/gloves.dmi rename to icons/mob/clothing/species/unathi/gloves.dmi diff --git a/icons/mob/species/unathi/head.dmi b/icons/mob/clothing/species/unathi/head.dmi similarity index 100% rename from icons/mob/species/unathi/head.dmi rename to icons/mob/clothing/species/unathi/head.dmi diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/clothing/species/unathi/helmet.dmi similarity index 100% rename from icons/mob/species/unathi/helmet.dmi rename to icons/mob/clothing/species/unathi/helmet.dmi diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi similarity index 100% rename from icons/mob/species/unathi/mask.dmi rename to icons/mob/clothing/species/unathi/mask.dmi diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi similarity index 100% rename from icons/mob/species/unathi/suit.dmi rename to icons/mob/clothing/species/unathi/suit.dmi diff --git a/icons/mob/species/vox/back.dmi b/icons/mob/clothing/species/vox/back.dmi similarity index 100% rename from icons/mob/species/vox/back.dmi rename to icons/mob/clothing/species/vox/back.dmi diff --git a/icons/mob/species/vox/collar.dmi b/icons/mob/clothing/species/vox/collar.dmi similarity index 100% rename from icons/mob/species/vox/collar.dmi rename to icons/mob/clothing/species/vox/collar.dmi diff --git a/icons/mob/species/vox/ears.dmi b/icons/mob/clothing/species/vox/ears.dmi similarity index 100% rename from icons/mob/species/vox/ears.dmi rename to icons/mob/clothing/species/vox/ears.dmi diff --git a/icons/mob/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi similarity index 100% rename from icons/mob/species/vox/eyes.dmi rename to icons/mob/clothing/species/vox/eyes.dmi diff --git a/icons/mob/species/vox/feet.dmi b/icons/mob/clothing/species/vox/feet.dmi similarity index 100% rename from icons/mob/species/vox/feet.dmi rename to icons/mob/clothing/species/vox/feet.dmi diff --git a/icons/mob/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi similarity index 100% rename from icons/mob/species/vox/gloves.dmi rename to icons/mob/clothing/species/vox/gloves.dmi diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi similarity index 100% rename from icons/mob/species/vox/head.dmi rename to icons/mob/clothing/species/vox/head.dmi diff --git a/icons/mob/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi similarity index 100% rename from icons/mob/species/vox/helmet.dmi rename to icons/mob/clothing/species/vox/helmet.dmi diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi similarity index 100% rename from icons/mob/species/vox/mask.dmi rename to icons/mob/clothing/species/vox/mask.dmi diff --git a/icons/mob/species/vox/shoes.dmi b/icons/mob/clothing/species/vox/shoes.dmi similarity index 100% rename from icons/mob/species/vox/shoes.dmi rename to icons/mob/clothing/species/vox/shoes.dmi diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi similarity index 100% rename from icons/mob/species/vox/suit.dmi rename to icons/mob/clothing/species/vox/suit.dmi diff --git a/icons/mob/species/vox/underwear.dmi b/icons/mob/clothing/species/vox/underwear.dmi similarity index 100% rename from icons/mob/species/vox/underwear.dmi rename to icons/mob/clothing/species/vox/underwear.dmi diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi similarity index 100% rename from icons/mob/species/vox/uniform.dmi rename to icons/mob/clothing/species/vox/uniform.dmi diff --git a/icons/mob/species/vulpkanin/head.dmi b/icons/mob/clothing/species/vulpkanin/head.dmi similarity index 100% rename from icons/mob/species/vulpkanin/head.dmi rename to icons/mob/clothing/species/vulpkanin/head.dmi diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/clothing/species/vulpkanin/helmet.dmi similarity index 100% rename from icons/mob/species/vulpkanin/helmet.dmi rename to icons/mob/clothing/species/vulpkanin/helmet.dmi diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi similarity index 100% rename from icons/mob/species/vulpkanin/mask.dmi rename to icons/mob/clothing/species/vulpkanin/mask.dmi diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/clothing/species/vulpkanin/suit.dmi similarity index 100% rename from icons/mob/species/vulpkanin/suit.dmi rename to icons/mob/clothing/species/vulpkanin/suit.dmi diff --git a/icons/mob/suit.dmi b/icons/mob/clothing/suit.dmi similarity index 100% rename from icons/mob/suit.dmi rename to icons/mob/clothing/suit.dmi diff --git a/icons/mob/underwear.dmi b/icons/mob/clothing/underwear.dmi similarity index 100% rename from icons/mob/underwear.dmi rename to icons/mob/clothing/underwear.dmi diff --git a/icons/mob/uniform.dmi b/icons/mob/clothing/uniform.dmi similarity index 100% rename from icons/mob/uniform.dmi rename to icons/mob/clothing/uniform.dmi diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index b1303637768..6c090bdc386 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index fb7c28c3f6d..02b2cff8a8d 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 6159735faf8..3cb9250df9e 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 5cf13a408d5..6d9d83e4fca 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 15d46a44f86..45adf5cc6e9 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ