diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index f9ce5a1b7f3..0a14535c66a 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -502,3 +502,5 @@ GLOBAL_LIST_INIT(all_volume_channels, list( #define APPEARANCECHANGER_CHANGED_F_HAIRSTYLE "Facial Hair Style" #define APPEARANCECHANGER_CHANGED_F_HAIRCOLOR "Facial Hair Color" #define APPEARANCECHANGER_CHANGED_EYES "Eye Color" + +#define GET_DECL(D) (ispath(D, /decl) ? (decls_repository.fetched_decls[D] || decls_repository.get_decl(D)) : null) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index dd75d8a62e0..5024a1b1a11 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -222,7 +222,9 @@ var/global/list/edible_trash = list(/obj/item/broken_device, /obj/item/weapon/storage/fancy/crayons, /obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/storage/wallet, - /obj/item/weapon/storage/vore_egg) + /obj/item/weapon/storage/vore_egg, + /obj/item/weapon/bikehorn/tinytether + ) var/global/list/contamination_flavors = list( "Generic" = contamination_flavors_generic, diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm index 4bcf49a3b06..19597091741 100644 --- a/code/controllers/subsystems/plants.dm +++ b/code/controllers/subsystems/plants.dm @@ -74,7 +74,7 @@ SUBSYSTEM_DEF(plants) S.update_seed() //Might as well mask the gene types while we're at it. - var/list/gene_datums = decls_repository.decls_of_subtype(/decl/plantgene) + var/list/gene_datums = decls_repository.get_decls_of_subtype(/decl/plantgene) var/list/used_masks = list() var/list/plant_traits = ALL_GENES while(plant_traits && plant_traits.len) diff --git a/code/datums/repositories/decls.dm b/code/datums/repositories/decls.dm index 61b24c21e9e..5217481ad97 100644 --- a/code/datums/repositories/decls.dm +++ b/code/datums/repositories/decls.dm @@ -1,4 +1,20 @@ -/var/repository/decls/decls_repository = new() +// /decl is a subtype used for singletons that should never have more than one instance +// in existence at a time. If you want to use a /decl you should use a pattern like: +// var/decl/somedecl/mydecl = GET_DECL(/decl/somedecl) + +// /decls are created the first time they are fetched from decls_repository and will +// automatically call Initialize() and such when created in this way. + +// decls_repository.get_decls_of_type() and decls_repository.get_decls_of_subtype() +// can be used similarly to typesof() and subtypesof(), returning assoc instance lists. + +// The /decl commandments: +// I. Thou shalt not create a /decl with new(). +// II. Thou shalt not del() or qdel() a /decl. +// III. Thou shalt not write a decl that relies on arguments supplied to New(). +// IV. Thou shalt not call Initialize() on a /decl. + +var/repository/decls/decls_repository = new() /repository/decls var/list/fetched_decls @@ -11,29 +27,45 @@ fetched_decl_types = list() fetched_decl_subtypes = list() -/repository/decls/proc/decls_of_type(var/decl_prototype) - . = fetched_decl_types[decl_prototype] - if(!.) - . = get_decls(typesof(decl_prototype)) - fetched_decl_types[decl_prototype] = . - -/repository/decls/proc/decls_of_subtype(var/decl_prototype) - . = fetched_decl_subtypes[decl_prototype] - if(!.) - . = get_decls(subtypesof(decl_prototype)) - fetched_decl_subtypes[decl_prototype] = . - /repository/decls/proc/get_decl(var/decl_type) + ASSERT(ispath(decl_type)) . = fetched_decls[decl_type] if(!.) . = new decl_type() fetched_decls[decl_type] = . + var/decl/decl = . + if(istype(decl)) + decl.Initialize() + /repository/decls/proc/get_decls(var/list/decl_types) . = list() for(var/decl_type in decl_types) - .[decl_type] = get_decl(decl_type) + .[decl_type] = get_decl(decl_type) -/decls/Destroy() +/repository/decls/proc/get_decls_unassociated(var/list/decl_types) + . = list() + for(var/decl_type in decl_types) + . += get_decl(decl_type) + +/repository/decls/proc/get_decls_of_type(var/decl_prototype) + . = fetched_decl_types[decl_prototype] + if(!.) + . = get_decls(typesof(decl_prototype)) + fetched_decl_types[decl_prototype] = . + +/repository/decls/proc/get_decls_of_subtype(var/decl_prototype) + . = fetched_decl_subtypes[decl_prototype] + if(!.) + . = get_decls(subtypesof(decl_prototype)) + fetched_decl_subtypes[decl_prototype] = . + +/decl/proc/Initialize() + //SHOULD_CALL_PARENT(TRUE) + //SHOULD_NOT_SLEEP(TRUE) + return + +/decl/Destroy() + //SHOULD_CALL_PARENT(FALSE) crash_with("Prevented attempt to delete a decl instance: [log_info_line(src)]") - return QDEL_HINT_LETMELIVE // Prevents Decl destruction + return QDEL_HINT_LETMELIVE // Prevents decl destruction diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm index e31fb2415a4..5d65a98ca9d 100644 --- a/code/datums/supplypacks/costumes_vr.dm +++ b/code/datums/supplypacks/costumes_vr.dm @@ -23,16 +23,16 @@ name = "Teshari smocks" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/smock, - /obj/item/clothing/under/seromi/smock/white, - /obj/item/clothing/under/seromi/smock/red, - /obj/item/clothing/under/seromi/smock/yellow, - /obj/item/clothing/under/seromi/smock/rainbow, - /obj/item/clothing/under/seromi/smock/dress, - /obj/item/clothing/under/seromi/smock/blackutilitysmock, - /obj/item/clothing/under/seromi/smock/greydress, - /obj/item/clothing/under/seromi/smock/blackutility, - /obj/item/clothing/under/seromi/smock/bluegreydress + /obj/item/clothing/under/teshari/smock, + /obj/item/clothing/under/teshari/smock/white, + /obj/item/clothing/under/teshari/smock/red, + /obj/item/clothing/under/teshari/smock/yellow, + /obj/item/clothing/under/teshari/smock/rainbow, + /obj/item/clothing/under/teshari/smock/dress, + /obj/item/clothing/under/teshari/smock/blackutilitysmock, + /obj/item/clothing/under/teshari/smock/greydress, + /obj/item/clothing/under/teshari/smock/blackutility, + /obj/item/clothing/under/teshari/smock/bluegreydress ) cost = 20 containertype = /obj/structure/closet/crate @@ -42,18 +42,18 @@ name = "Teshari undercoats" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/undercoat/standard/orange_grey, - /obj/item/clothing/under/seromi/undercoat/standard/rainbow, - /obj/item/clothing/under/seromi/undercoat/standard/lightgrey_grey, - /obj/item/clothing/under/seromi/undercoat/standard/white_grey, - /obj/item/clothing/under/seromi/undercoat/standard/red_grey, - /obj/item/clothing/under/seromi/undercoat/standard/orange, - /obj/item/clothing/under/seromi/undercoat/standard/yellow_grey, - /obj/item/clothing/under/seromi/undercoat/standard/green_grey, - /obj/item/clothing/under/seromi/undercoat/standard/blue_grey, - /obj/item/clothing/under/seromi/undercoat/standard/purple_grey, - /obj/item/clothing/under/seromi/undercoat/standard/pink_grey, - /obj/item/clothing/under/seromi/undercoat/standard/brown_grey + /obj/item/clothing/under/teshari/undercoat/standard/orange_grey, + /obj/item/clothing/under/teshari/undercoat/standard/rainbow, + /obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey, + /obj/item/clothing/under/teshari/undercoat/standard/white_grey, + /obj/item/clothing/under/teshari/undercoat/standard/red_grey, + /obj/item/clothing/under/teshari/undercoat/standard/orange, + /obj/item/clothing/under/teshari/undercoat/standard/yellow_grey, + /obj/item/clothing/under/teshari/undercoat/standard/green_grey, + /obj/item/clothing/under/teshari/undercoat/standard/blue_grey, + /obj/item/clothing/under/teshari/undercoat/standard/purple_grey, + /obj/item/clothing/under/teshari/undercoat/standard/pink_grey, + /obj/item/clothing/under/teshari/undercoat/standard/brown_grey ) cost = 20 containertype = /obj/structure/closet/crate @@ -63,18 +63,18 @@ name = "Teshari undercoats (black)" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/undercoat, - /obj/item/clothing/under/seromi/undercoat/standard/black_orange, - /obj/item/clothing/under/seromi/undercoat/standard/black_grey, - /obj/item/clothing/under/seromi/undercoat/standard/black_white, - /obj/item/clothing/under/seromi/undercoat/standard/black_red, - /obj/item/clothing/under/seromi/undercoat/standard/black, - /obj/item/clothing/under/seromi/undercoat/standard/black_yellow, - /obj/item/clothing/under/seromi/undercoat/standard/black_green, - /obj/item/clothing/under/seromi/undercoat/standard/black_blue, - /obj/item/clothing/under/seromi/undercoat/standard/black_purple, - /obj/item/clothing/under/seromi/undercoat/standard/black_pink, - /obj/item/clothing/under/seromi/undercoat/standard/black_brown + /obj/item/clothing/under/teshari/undercoat, + /obj/item/clothing/under/teshari/undercoat/standard/black_orange, + /obj/item/clothing/under/teshari/undercoat/standard/black_grey, + /obj/item/clothing/under/teshari/undercoat/standard/black_white, + /obj/item/clothing/under/teshari/undercoat/standard/black_red, + /obj/item/clothing/under/teshari/undercoat/standard/black, + /obj/item/clothing/under/teshari/undercoat/standard/black_yellow, + /obj/item/clothing/under/teshari/undercoat/standard/black_green, + /obj/item/clothing/under/teshari/undercoat/standard/black_blue, + /obj/item/clothing/under/teshari/undercoat/standard/black_purple, + /obj/item/clothing/under/teshari/undercoat/standard/black_pink, + /obj/item/clothing/under/teshari/undercoat/standard/black_brown ) cost = 20 containertype = /obj/structure/closet/crate @@ -84,18 +84,18 @@ name = "Teshari cloaks" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/cloak/standard/white, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/red_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/orange_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/yellow_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/green_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/blue_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/purple_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/pink_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/brown_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/rainbow, - /obj/item/clothing/suit/storage/seromi/cloak/standard/orange + /obj/item/clothing/suit/storage/teshari/cloak/standard/white, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/red_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/orange_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/yellow_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/green_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/blue_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/purple_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/pink_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/brown_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/rainbow, + /obj/item/clothing/suit/storage/teshari/cloak/standard/orange ) cost = 40 containertype = /obj/structure/closet/crate @@ -105,19 +105,19 @@ name = "Teshari cloaks (black)" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/cloak, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_red, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_orange, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_yellow, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_green, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_blue, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_purple, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_pink, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_brown, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_grey, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_white, - /obj/item/clothing/suit/storage/seromi/cloak/standard/black_glow, - /obj/item/clothing/suit/storage/seromi/cloak/standard/dark_retrowave + /obj/item/clothing/suit/storage/teshari/cloak, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_red, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_orange, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_yellow, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_green, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_blue, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_purple, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_pink, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_brown, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_grey, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_white, + /obj/item/clothing/suit/storage/teshari/cloak/standard/black_glow, + /obj/item/clothing/suit/storage/teshari/cloak/standard/dark_retrowave ) cost = 40 containertype = /obj/structure/closet/crate @@ -127,16 +127,16 @@ name = "Teshari worksuits" num_contained = 4 contains = list( - /obj/item/clothing/under/seromi/undercoat/standard/worksuit, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackpurple, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackorange, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackblue, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackgreen, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitered, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitepurple, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteorange, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteblue, - /obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitegreen + /obj/item/clothing/under/teshari/undercoat/standard/worksuit, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue, + /obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen ) cost = 20 containertype = /obj/structure/closet/crate @@ -146,18 +146,18 @@ name = "Teshari cloaks (belted)" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/rainbow, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/lightgrey_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/red_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/yellow_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/green_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/blue_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/purple_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/pink_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/brown_grey + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/rainbow, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/lightgrey_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/red_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/yellow_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/green_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/blue_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/purple_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/pink_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/brown_grey ) cost = 40 containertype = /obj/structure/closet/crate @@ -167,20 +167,20 @@ name = "Teshari cloaks (belted, black)" num_contained = 4 contains = list( - /obj/item/clothing/suit/storage/seromi/beltcloak, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_orange, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_grey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_midgrey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_lightgrey, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_white, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_red, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_yellow, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_green, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_blue, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_purple, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_pink, - /obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_brown + /obj/item/clothing/suit/storage/teshari/beltcloak, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_orange, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_grey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_midgrey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_lightgrey, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_white, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_red, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_yellow, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_green, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_blue, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_purple, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_pink, + /obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_brown ) cost = 40 containertype = /obj/structure/closet/crate diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index db81cd20619..8471bce6ef7 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -86,3 +86,23 @@ containertype = /obj/structure/closet/crate containername = "Shiny clothes crate" cost = 30 + +//3/19/21 +/datum/supply_pack/recreation/smoleworld + name = "Smole Bulding Bricks" + contains = list( + /obj/item/weapon/storage/smolebrickcase, /obj/item/weapon/storage/smolebrickcase, + ) + cost = 200 + containertype = /obj/structure/closet/crate + containername = "Smole Bulding Brick crate" + +/datum/supply_pack/recreation/smolesnackplanets + name = "Snack planets pack" + num_contained = 4 + contains = list( + /obj/item/weapon/storage/bagoplanets, /obj/item/weapon/storage/bagoplanets + ) + cost = 25 + containertype = /obj/structure/closet/crate + containername = "Snack planets crate" diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 93b13625952..f4078595c89 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -39,3 +39,9 @@ /area/engineering/engine_gas name = "\improper Engine Gas Storage" icon_state = "engine_waste" + +//holodeck 3/29/21 +/area/holodeck/source_smoleworld + name = "\improper Holodeck - Smolworld" + + diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index 42fb58e6625..3912bc6c6b8 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -13,7 +13,7 @@ TECH_COMBAT = 7, TECH_MAGNET = 9, TECH_DATA = 5 ) sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/back.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' ) var/energy = 10000 var/max_energy = 10000 diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index c4c4e663d4b..5f30171a8d9 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -1175,7 +1175,7 @@ /obj/item/clothing/suit/varsity/blue = 5, /obj/item/clothing/suit/varsity/brown = 5, /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 5) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) prices = list(/obj/item/clothing/suit/storage/apron = 100, /obj/item/clothing/suit/storage/flannel/aqua = 100, /obj/item/clothing/suit/storage/toggle/bomber = 100, @@ -1262,7 +1262,7 @@ /obj/item/clothing/suit/varsity/blue = 100, /obj/item/clothing/suit/varsity/brown = 100, /obj/item/clothing/suit/storage/hooded/wintercoat = 100, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 100) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) premium = list(/obj/item/clothing/suit/imperium_monk = 3) contraband = list(/obj/item/toy/katana = 1) @@ -2536,7 +2536,7 @@ /obj/item/clothing/suit/varsity/blue = 5, /obj/item/clothing/suit/varsity/brown = 5, /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 5) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) prices = list(/obj/item/clothing/suit/storage/apron = 100, /obj/item/clothing/suit/storage/flannel/aqua = 100, /obj/item/clothing/suit/storage/toggle/bomber = 100, @@ -2623,7 +2623,7 @@ /obj/item/clothing/suit/varsity/blue = 100, /obj/item/clothing/suit/varsity/brown = 100, /obj/item/clothing/suit/storage/hooded/wintercoat = 100, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 100) + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) premium = list(/obj/item/clothing/suit/imperium_monk = 3) contraband = list(/obj/item/toy/katana = 1) @@ -3520,7 +3520,7 @@ /obj/item/clothing/suit/varsity/blue = 5, /obj/item/clothing/suit/varsity/brown = 5, /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey = 5, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5, /obj/item/clothing/suit/imperium_monk = 3, /obj/item/clothing/head/helmet/space/void/engineering = 5, /obj/item/clothing/suit/space/void/engineering = 5, diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 21b74636374..7c64f1b2038 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -8,7 +8,7 @@ subspace_transmission = 1 canhear_range = 0 // can't hear headsets from very far away slot_flags = SLOT_EARS - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi') var/translate_binary = 0 var/translate_hive = 0 diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index 2682d9db97c..8285fade758 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -22,7 +22,7 @@ icon_state = "nt_headset_alt" /obj/item/device/radio/headset - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi', + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi') /obj/item/device/radio/headset/mob_headset //Adminbus headset for simplemob shenanigans. diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 924d753c28f..0f7405096dc 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -19,7 +19,7 @@ var/cuff_sound = 'sound/weapons/handcuffs.ogg' var/cuff_type = "handcuffs" var/use_time = 30 - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/handcuffs.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi') /obj/item/weapon/handcuffs/get_worn_icon_state(var/slot_name) if(slot_name == slot_handcuffed_str) @@ -214,7 +214,7 @@ var/last_chew = 0 origin_tech = list(TECH_MATERIAL = 1) breakouttime = 300 //Deciseconds = 30s = 0.5 minute cuff_type = "legcuffs" - sprite_sheets = list("Teshari" = 'icons/mob/species/seromi/handcuffs.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi') elastic = 0 cuff_sound = 'sound/weapons/handcuffs.ogg' //This shold work for now. diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 4f21a737c8e..5a8fe7448de 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -5,7 +5,7 @@ item_state = "card-id" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/id.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/id.dmi' ) var/access = list() diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm index 4cb6c565ac0..0a9015145a7 100644 --- a/code/game/objects/items/weapons/id cards/station_ids_vr.dm +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -5,7 +5,7 @@ var/list/title_strings = list() var/preset_rank = FALSE -/obj/item/weapon/card/id/event/attack_self(mob/user as mob) +/obj/item/weapon/card/id/event/attack_self(var/mob/user) if(configured == 1) return ..() @@ -28,10 +28,12 @@ configured = 1 to_chat(user, "Card settings set.") -/obj/item/weapon/card/id/event/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/weapon/card/id/event/attackby(obj/item/I as obj, var/mob/user) if(istype(I, /obj/item/weapon/card/id) && !accessset) var/obj/item/weapon/card/id/O = I access |= O.access + desc = I.desc + rank = O.rank to_chat(user, "You copy the access from \the [I] to \the [src].") user.drop_from_inventory(I) qdel(I) @@ -52,31 +54,24 @@ icon = 'icons/obj/card_vr.dmi' base_icon = 'icons/obj/card_vr.dmi' icon_state = "itg" - item_state = "itg_id" /obj/item/weapon/card/id/event/accessset/itg/green icon_state = "itg_green" - item_state = "itg_green_id" /obj/item/weapon/card/id/event/accessset/itg/red icon_state = "itg_red" - item_state = "itg_red_id" /obj/item/weapon/card/id/event/accessset/itg/purple icon_state = "itg_purple" - item_state = "itg_purple_id" /obj/item/weapon/card/id/event/accessset/itg/white icon_state = "itg_white" - item_state = "itg_white_id" /obj/item/weapon/card/id/event/accessset/itg/orange icon_state = "itg_orange" - item_state = "itg_orange_id" /obj/item/weapon/card/id/event/accessset/itg/blue icon_state = "itg_blue" - item_state = "itg_blue_id" /obj/item/weapon/card/id/event/accessset/itg/crew name = "\improper ITG Crew ID" @@ -97,7 +92,6 @@ assignment = "Cook" rank = "Cook" icon_state = "itg_green" - item_state = "itg_green_id" /obj/item/weapon/card/id/event/accessset/itg/crew/security name = "\improper ITG Security's ID" @@ -105,7 +99,6 @@ assignment = "Security" rank = "Security" icon_state = "itg_red" - item_state = "itg_red_id" /obj/item/weapon/card/id/event/accessset/itg/crew/research name = "\improper ITG Research's ID" @@ -113,7 +106,6 @@ assignment = "Research" rank = "Research" icon_state = "itg_purple" - item_state = "itg_purple_id" /obj/item/weapon/card/id/event/accessset/itg/crew/medical name = "\improper ITG Medic's ID" @@ -121,7 +113,6 @@ assignment = "Medic" rank = "Medic" icon_state = "itg_white" - item_state = "itg_white_id" /obj/item/weapon/card/id/event/accessset/itg/crew/engineer name = "\improper ITG Engineer's ID" @@ -129,7 +120,6 @@ assignment = "Engineer" rank = "Engineer" icon_state = "itg_orange" - item_state = "itg_orange_id" /obj/item/weapon/card/id/event/accessset/itg/crew/passengerliason name = "\improper ITG Passenger Liason's ID" @@ -137,7 +127,6 @@ assignment = "Passenger Liason" rank = "Passenger Liason" icon_state = "itg_blue" - item_state = "itg_blue_id" /obj/item/weapon/card/id/event/accessset/itg/crew/captain name = "\improper ITG Captain's ID" @@ -145,132 +134,140 @@ assignment = "Captain" rank = "Captain" icon_state = "itg_blue" - item_state = "itg_blue_id" access = list(777, 778) /obj/item/weapon/card/id/event/altcard icon = 'icons/obj/card_alt_vr.dmi' base_icon = 'icons/obj/card_alt_vr.dmi' icon_state = "id" - item_state = "id_id" -/obj/item/weapon/card/id/event/altcard/hop - icon_state = "silver" - item_state = "silver_id" - -/obj/item/weapon/card/id/event/altcard/cap - icon_state = "cap" - item_state = "cap_id" - -/obj/item/weapon/card/id/event/altcard/centcom - icon_state = "centcom" - item_state = "centcom_id" - -/obj/item/weapon/card/id/event/altcard/cargo - icon_state = "cargo" - item_state = "cargo_id" - -/obj/item/weapon/card/id/event/altcard/qm - icon_state = "cargoGold" - item_state = "cargoGold_id" - -/obj/item/weapon/card/id/event/altcard/miner - icon_state = "miner" - item_state = "miner_id" - -/obj/item/weapon/card/id/event/altcard/sci - icon_state = "sci" - item_state = "sci_id" - -/obj/item/weapon/card/id/event/altcard/rd - icon_state = "sciGold" - item_state = "sciGold_id" - -/obj/item/weapon/card/id/event/altcard/sec - icon_state = "sec" - item_state = "sec_id" - -/obj/item/weapon/card/id/event/altcard/hos - icon_state = "secGold" - item_state = "secGold_id" - -/obj/item/weapon/card/id/event/altcard/warden - icon_state = "warden" - item_state = "warden_id" - -/obj/item/weapon/card/id/event/altcard/eng - icon_state = "eng" - item_state = "eng_id" - -/obj/item/weapon/card/id/event/altcard/ce - icon_state = "engGold" - item_state = "engGold_id" - -/obj/item/weapon/card/id/event/altcard/atmos - icon_state = "atmos" - item_state = "atmos_id" - -/obj/item/weapon/card/id/event/altcard/med - icon_state = "med" - item_state = "med_id" - -/obj/item/weapon/card/id/event/altcard/cmo - icon_state = "medGold" - item_state = "medGold_id" - -/obj/item/weapon/card/id/event/altcard/paramed - icon_state = "paramed" - item_state = "paramed_id" +/obj/item/weapon/card/id/event/altcard/spare + icon_state = "spare" /obj/item/weapon/card/id/event/altcard/clown - icon_state = "clown" - item_state = "clown_id" + icon_state = "Clown" /obj/item/weapon/card/id/event/altcard/mime - icon_state = "mime" - item_state = "mime_id" + icon_state = "Mime" -/obj/item/weapon/card/id/event/altcard/syndie - icon_state = "syndie" - item_state = "syndie_id" +/obj/item/weapon/card/id/event/altcard/centcom + icon_state = "CentCom Officer" + +/obj/item/weapon/card/id/event/altcard/ert + icon_state = "Emergency Responder" + +/obj/item/weapon/card/id/event/altcard/nt + icon_state = "nanotrasen" /obj/item/weapon/card/id/event/altcard/syndiegold icon_state = "syndieGold" - item_state = "syndieGold_id" -/obj/item/weapon/card/id/event/altcard/green - icon_state = "green" - item_state = "green_id" +/obj/item/weapon/card/id/event/altcard/syndie + icon_state = "syndie" /obj/item/weapon/card/id/event/altcard/greengold icon_state = "greenGold" - item_state = "greenGold_id" - -/obj/item/weapon/card/id/event/altcard/explo - icon_state = "explo" - item_state = "explo_id" - -/obj/item/weapon/card/id/event/altcard/pf - icon_state = "exploGold" - item_state = "exploGold_id" - -/obj/item/weapon/card/id/event/altcard/fm - icon_state = "fieldmed" - item_state = "fieldmed_id" - -/obj/item/weapon/card/id/event/altcard/chaplain - icon_state = "chaplain" - item_state = "chaplain_id" - -/obj/item/weapon/card/id/event/altcard/nanotrasen - icon_state = "nanotrasen" - item_state = "nanotrasen_id" /obj/item/weapon/card/id/event/altcard/pink icon_state = "pink" - item_state = "pink_id" /obj/item/weapon/card/id/event/altcard/pinkgold icon_state = "pinkGold" - item_state = "pinkGold_id" +/obj/item/weapon/card/id/event/polymorphic + var/base_icon_state + +/obj/item/weapon/card/id/event/polymorphic/digest_act(atom/movable/item_storage = null) + var/gimmeicon = icon + . = ..() + icon = gimmeicon + icon_state = base_icon_state + "_digested" + +/obj/item/weapon/card/id/event/polymorphic/altcard/attack_self(var/mob/user) + if(configured == 1) + return ..() + else + icon_state = user.job + base_icon_state = user.job + return ..() + +/obj/item/weapon/card/id/event/polymorphic/altcard + icon = 'icons/obj/card_alt_vr.dmi' + base_icon = 'icons/obj/card_alt_vr.dmi' + icon_state = "blank" + name = "contractor identification card" + desc = "An ID card typically used by contractors." + +/obj/item/weapon/card/id/event/polymorphic/itg/attack_self(var/mob/user) + if(!configured) + var/list/jobs_to_icon = list( //ITG only has a few kinds of icons so we have to group them up! + "Pilot" = "itg", + "Visitor" = "itg", + "Quartermaster" = "itg", + "Cargo Technician" = "itg", + "Shaft Miner" = "itg", + "Intern" = "itg", + "Talon Pilot" = "itg", + "Bartender" = "itg_green", + "Botanist" = "itg_green", + "Chef" = "itg_green", + "Janitor" = "itg_green", + "Chaplain" = "itg_green", + "Entertainer" = "itg_green", + "Janitor" = "itg_green", + "Librarian" = "itg_green", + "Warden" = "itg_red", + "Detective" = "itg_red", + "Security Officer" = "itg_red", + "Talon Guard" = "itg_red", + "Roboticist" = "itg_purple", + "Scientist" = "itg_purple", + "Xenobiologist" = "itg_purple", + "Xenobotanist" = "itg_purple", + "Pathfinder" = "itg_purple", + "Explorer" = "itg_purple", + "Chemist" = "itg_white", + "Medical Doctor" = "itg_white", + "Paramedic" = "itg_white", + "Psychiatrist" = "itg_white", + "Field Medic" = "itg_white", + "Talon Doctor" = "itg_white", + "Atmospheric Technician" = "itg_orange", + "Station Engineer" = "itg_orange", + "Off-duty Officer" = "itg_red", + "Off-duty Engineer" = "itg_orange", + "Off-duty Medic" = "itg_white", + "Off-duty Scientist" = "itg_purple", + "Off-duty Cargo" = "itg", + "Off-duty Explorer" = "itg_purple", + "Off-duty Worker" = "itg_green" + ) + var/guess = jobs_to_icon[user.job] + + if(!guess) + to_chat(user, "ITG Cards do not seem to be able to accept the access codes for your ID.") + return + else + icon_state = guess + base_icon_state = guess + . = ..() + name = user.name + "'s ITG ID card" + " ([assignment])" + + +/obj/item/weapon/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user) + if(istype(I, /obj/item/weapon/card/id) && !accessset) + var/obj/item/weapon/card/id/O = I + var/list/itgdont = list("Site Manager", "Head of Personnel", "Command Secretary", "Head of Security", "Chief Engineer", "Chief Medical Officer", "Research Director", "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG + if(O.rank in itgdont) + to_chat(user, "ITG Cards do not seem to be able to accept the access codes for your ID.") + return + . = ..() + desc = "A small card designating affiliation with the Ironcrest Transport Group. It has a NanoTrasen insignia and a lot of very small print on the back to do with practices and regulations for contractors to use." + + +/obj/item/weapon/card/id/event/polymorphic/itg + icon = 'icons/obj/card_vr.dmi' + base_icon = 'icons/obj/card_vr.dmi' + icon_state = "itg" + name = "\improper ITG identification card" + desc = "A small card designating affiliation with the Ironcrest Transport Group. It has a NanoTrasen insignia and a lot of very small print on the back to do with practices and regulations for contractors to use." diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 5741387b7ba..8660d8a6734 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/clothing/backpack.dmi' icon_state = "backpack" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' ) w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index c201dd5c72e..ab83c877527 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -77,7 +77,7 @@ /obj/item/weapon/storage/backpack sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/back.dmi') /obj/item/weapon/storage/backpack/ert diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index c3dba166bc4..5dc7f83da8b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -11,7 +11,7 @@ equip_sound = 'sound/items/toolbelt_equip.ogg' drop_sound = 'sound/items/drop/toolbelt.ogg' pickup_sound = 'sound/items/pickup/toolbelt.ogg' - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi') var/show_above_suit = 0 diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index e726e30b9cf..defdcc296b0 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -1,6 +1,6 @@ /obj/item/weapon/storage/belt sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/belt.dmi') /obj/item/weapon/storage/belt/explorer diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index f6045c6174d..806d26c90b6 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -8,7 +8,7 @@ var/list/global/tank_gauge_cache = list() name = "tank" icon = 'icons/obj/tank.dmi' sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/back.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/back.dmi' ) drop_sound = 'sound/items/drop/gascan.ogg' pickup_sound = 'sound/items/pickup/gascan.ogg' diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index 2b41ce51637..77e1c43960a 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -15,11 +15,11 @@ ..() switch(slot) if(slot_head) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi') if(slot_wear_suit) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi') if(slot_belt) - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/belt.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/belt.dmi') /obj/item/weapon/towel/attack_self(mob/living/user as mob) user.visible_message(text("[] uses [] to towel themselves off.", user, src)) diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index b024211d2cc..bc6e620b7a7 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -19,6 +19,7 @@ var/list/admin_verbs_default = list( ) var/list/admin_verbs_admin = list( + /client/proc/toggle_vantag_hud, /datum/admins/proc/set_tcrystals, /datum/admins/proc/add_tcrystals, /client/proc/invisimin, //allows our mob to go invisible/visible, @@ -393,6 +394,7 @@ var/list/admin_verbs_mod = list( ) var/list/admin_verbs_event_manager = list( + /client/proc/toggle_vantag_hud, /client/proc/cmd_event_say, /client/proc/cmd_admin_pm_context, /client/proc/cmd_admin_pm_panel, diff --git a/code/modules/admin/verbs/randomverbs_vr.dm b/code/modules/admin/verbs/randomverbs_vr.dm index d4fa30c8243..997556e3a4b 100644 --- a/code/modules/admin/verbs/randomverbs_vr.dm +++ b/code/modules/admin/verbs/randomverbs_vr.dm @@ -97,3 +97,20 @@ log_admin("ZNarrate: [key_name(usr)] : [msg]") message_admins(" ZNarrate: [key_name_admin(usr)] : [msg]
", 1) feedback_add_details("admin_verb","GLNA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/proc/toggle_vantag_hud(var/mob/target as mob) + set category = "Fun" + set name = "Give/Remove Event HUD" + set desc = "Give a mob the event hud, which shows them other people's event preferences, or remove it from them" + + if(target.vantag_hud) + target.vantag_hud = FALSE + target.recalculate_vis() + to_chat(src, "You removed the event HUD from [key_name(target)].") + to_chat(target, "You no longer have the event HUD.") + else + target.vantag_hud = TRUE + target.recalculate_vis() + to_chat(src, "You gave the event HUD to [key_name(target)].") + to_chat(target, "You now have the event HUD. Icons will appear next to characters indicating if they prefer to be killed(red crosshairs), devoured(belly), or kidnapped(blue crosshairs) by event characters.") + feedback_add_details("admin_verb","GREHud") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 4835fa92cf9..c28cb0f718d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -1079,7 +1079,7 @@ character_name = list("Roanna Ti'Rox") /datum/gear/fluff/harmony_id - path = /obj/item/weapon/card/id/event/fluff/harmony + path = /obj/item/weapon/card/id/event/polymorphic/itg display_name = "Harmony's ITG-ID card" ckeywhitelist = list("verysoft") character_name = list("Harmony") diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 1e638aa039b..36b3ead7a66 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -55,3 +55,8 @@ display_name = "science dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sci allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist","Explorer","Pathfinder") + +/datum/gear/utility/ID + display_name = "contractor identification card" + path = /obj/item/weapon/card/id/event/polymorphic/altcard + cost = 1 diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index a04feb1d6b5..c4c9fe564e8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -94,43 +94,43 @@ /datum/gear/uniform/smock display_name = "smock selection (Teshari)" - path = /obj/item/clothing/under/seromi/smock + path = /obj/item/clothing/under/teshari/smock whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/uniform/smock/New() ..() var/list/smocks = list() - for(var/smock in typesof(/obj/item/clothing/under/seromi/smock)) - var/obj/item/clothing/under/seromi/smock/smock_type = smock + for(var/smock in typesof(/obj/item/clothing/under/teshari/smock)) + var/obj/item/clothing/under/teshari/smock/smock_type = smock smocks[initial(smock_type.name)] = smock_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(smocks)) /datum/gear/uniform/undercoat display_name = "undercoat selection (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/standard + path = /obj/item/clothing/under/teshari/undercoat/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/uniform/undercoat/New() ..() var/list/undercoats = list() - for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat/standard)) - var/obj/item/clothing/under/seromi/undercoat/standard/undercoat_type = undercoat + for(var/undercoat in typesof(/obj/item/clothing/under/teshari/undercoat/standard)) + var/obj/item/clothing/under/teshari/undercoat/standard/undercoat_type = undercoat undercoats[initial(undercoat_type.name)] = undercoat_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) /datum/gear/suit/cloak display_name = "cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/standard + path = /obj/item/clothing/suit/storage/teshari/cloak/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/suit/cloak/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/standard)) - var/obj/item/clothing/suit/storage/seromi/cloak/standard/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/standard)) + var/obj/item/clothing/suit/storage/teshari/cloak/standard/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) @@ -168,107 +168,107 @@ /datum/gear/uniform/dept/undercoat/cap display_name = "facility director undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/cap + path = /obj/item/clothing/under/teshari/undercoat/jobs/cap allowed_roles = list("Facility Director") /datum/gear/uniform/dept/undercoat/hop display_name = "head of personnel undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/hop + path = /obj/item/clothing/under/teshari/undercoat/jobs/hop allowed_roles = list("Head of Personnel") /datum/gear/uniform/dept/undercoat/rd display_name = "research director undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/rd + path = /obj/item/clothing/under/teshari/undercoat/jobs/rd allowed_roles = list("Research Director") /datum/gear/uniform/dept/undercoat/hos display_name = "head of security undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/hos + path = /obj/item/clothing/under/teshari/undercoat/jobs/hos allowed_roles = list("Head of Security") /datum/gear/uniform/dept/undercoat/ce display_name = "chief engineer undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/ce + path = /obj/item/clothing/under/teshari/undercoat/jobs/ce allowed_roles = list("Chief Engineer") /datum/gear/uniform/dept/undercoat/cmo display_name = "chief medical officer undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/cmo + path = /obj/item/clothing/under/teshari/undercoat/jobs/cmo allowed_roles = list("Chief Medical Officer") /datum/gear/uniform/dept/undercoat/qm display_name = "quartermaster undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/qm + path = /obj/item/clothing/under/teshari/undercoat/jobs/qm allowed_roles = list("Quartermaster") /datum/gear/uniform/dept/undercoat/cargo display_name = "cargo undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/cargo + path = /obj/item/clothing/under/teshari/undercoat/jobs/cargo allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner") /datum/gear/uniform/dept/undercoat/mining display_name = "mining undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/mining + path = /obj/item/clothing/under/teshari/undercoat/jobs/mining allowed_roles = list("Quartermaster","Shaft Miner") /datum/gear/uniform/dept/undercoat/security display_name = "security undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/sec + path = /obj/item/clothing/under/teshari/undercoat/jobs/sec allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) /datum/gear/uniform/dept/undercoat/service display_name = "service undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/service + path = /obj/item/clothing/under/teshari/undercoat/jobs/service allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/engineer + path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer allowed_roles = list("Chief Engineer","Station Engineer") /datum/gear/uniform/dept/undercoat/atmos display_name = "atmospherics undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/atmos + path = /obj/item/clothing/under/teshari/undercoat/jobs/atmos allowed_roles = list("Chief Engineer","Atmospheric Technician") /datum/gear/uniform/dept/undercoat/research display_name = "scientist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/sci + path = /obj/item/clothing/under/teshari/undercoat/jobs/sci allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") /datum/gear/uniform/dept/undercoat/robo display_name = "roboticist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/robo + path = /obj/item/clothing/under/teshari/undercoat/jobs/robo allowed_roles = list("Research Director","Roboticist") /datum/gear/uniform/dept/undercoat/medical display_name = "medical undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/medical + path = /obj/item/clothing/under/teshari/undercoat/jobs/medical allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist") /datum/gear/uniform/dept/undercoat/chemistry display_name = "chemist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/chemistry + path = /obj/item/clothing/under/teshari/undercoat/jobs/chemistry allowed_roles = list("Chief Medical Officer","Chemist") /datum/gear/uniform/dept/undercoat/virology display_name = "virologist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/viro + path = /obj/item/clothing/under/teshari/undercoat/jobs/viro allowed_roles = list("Chief Medical Officer","Medical Doctor") /datum/gear/uniform/dept/undercoat/psych display_name = "psychiatrist undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/psych + path = /obj/item/clothing/under/teshari/undercoat/jobs/psych allowed_roles = list("Chief Medical Officer","Psychiatrist") /datum/gear/uniform/dept/undercoat/paramedic display_name = "paramedic undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/para + path = /obj/item/clothing/under/teshari/undercoat/jobs/para allowed_roles = list("Chief Medical Officer","Paramedic") /datum/gear/uniform/dept/undercoat/iaa display_name = "internal affairs undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/iaa + path = /obj/item/clothing/under/teshari/undercoat/jobs/iaa allowed_roles = list("Internal Affairs Agent") /datum/gear/suit/dept/cloak @@ -277,248 +277,248 @@ /datum/gear/suit/dept/cloak/cap display_name = "facility director cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs allowed_roles = list("Facility Director") /datum/gear/suit/dept/cloak/hop display_name = "head of personnel cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hop + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hop allowed_roles = list("Head of Personnel") /datum/gear/suit/dept/cloak/rd display_name = "research director cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/rd + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/rd allowed_roles = list("Research Director") /datum/gear/suit/dept/cloak/hos display_name = "head of security cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hos + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hos allowed_roles = list("Head of Security") /datum/gear/suit/dept/cloak/hos/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/hos)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/hos,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/hos)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/cloak/dept/ce display_name = "chief engineer cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/ce + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/ce allowed_roles = list("Chief Engineer") /datum/gear/suit/dept/cloak/ce/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/ce,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/ce)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/cmo display_name = "chief medical officer cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo allowed_roles = list("Chief Medical Officer") /datum/gear/suit/dept/cloak/cmo/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cmo)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/qm display_name = "quartermaster cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/qm allowed_roles = list("Chief Medical Officer") /datum/gear/suit/dept/cloak/qm/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/qm,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/qm)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/cargo display_name = "cargo cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician") /datum/gear/suit/dept/cloak/cargo/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cargo)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/mining display_name = "mining cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/mining + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/mining allowed_roles = list("Quartermaster","Shaft Miner") /datum/gear/suit/dept/cloak/mining/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/mining,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/mining)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/security display_name = "security cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sec allowed_roles = list("Head of Security","Detective","Warden","Security Officer") /datum/gear/suit/dept/cloak/security/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/sec,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sec)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/service display_name = "service cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/service + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/service allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") /datum/gear/suit/dept/cloak/service/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/service,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/service,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/service)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/engineer display_name = "engineering cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer allowed_roles = list("Chief Engineer","Station Engineer") /datum/gear/suit/dept/cloak/engineer/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/engineer)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/engineer)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/atmos display_name = "atmospherics cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos allowed_roles = list("Chief Engineer","Atmospheric Technician") /datum/gear/suit/dept/cloak/atmos/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/atmos)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/research display_name = "scientist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sci + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sci allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist") /datum/gear/suit/dept/cloak/research/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/sci,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sci)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/robo display_name = "roboticist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/robo + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/robo allowed_roles = list("Research Director","Roboticist") /datum/gear/suit/dept/cloak/robo/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/robo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/robo)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/medical display_name = "medical cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/medical + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/medical allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/dept/cloak/medical/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/medical,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/medical)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/chemistry display_name = "chemist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry allowed_roles = list("Chemist") /datum/gear/suit/dept/cloak/chemistry/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/chemistry)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/virology display_name = "virologist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/viro + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/viro allowed_roles = list("Medical Doctor") /datum/gear/suit/dept/cloak/virology/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/viro,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/viro)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/psych display_name = "psychiatrist cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/psych + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/psych allowed_roles = list("Chief Medical Officer","Psychiatrist") /datum/gear/suit/dept/cloak/paramedic display_name = "paramedic cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/para + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/para allowed_roles = list("Chief Medical Officer","Paramedic") /datum/gear/suit/dept/cloak/paramedic/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/para,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/para,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/para)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/iaa display_name = "internal affairs cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa + path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa allowed_roles = list("Internal Affairs Agent") /datum/gear/suit/dept/cloak/iaa/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/iaa)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/uniform/smockcolor display_name = "smock, recolorable (Teshari)" - path = /obj/item/clothing/under/seromi/smock/white + path = /obj/item/clothing/under/teshari/smock/white whitelisted = SPECIES_TESHARI sort_category = "Xenowear" @@ -528,21 +528,21 @@ /datum/gear/suit/beltcloak display_name = "belted cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard + path = /obj/item/clothing/suit/storage/teshari/beltcloak/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/suit/beltcloak/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/standard)) - var/obj/item/clothing/suit/storage/seromi/beltcloak/standard/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/beltcloak/standard)) + var/obj/item/clothing/suit/storage/teshari/beltcloak/standard/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/beltcloak_color display_name = "belted cloak, recolorable (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey + path = /obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey whitelisted = SPECIES_TESHARI sort_category = "Xenowear" @@ -552,17 +552,17 @@ /datum/gear/suit/dept/beltcloak/wrdn display_name = "warden belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn + path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn allowed_roles = list("Head of Security","Warden") /datum/gear/suit/dept/beltcloak/jani display_name = "janitor belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani + path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani allowed_roles = list("Janitor") /datum/gear/suit/dept/beltcloak/cmd display_name = "command belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command + path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director") /datum/gear/suit/cloak_hood @@ -575,27 +575,27 @@ ..() var/list/cloaks = list() for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard)) - var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + var/obj/item/clothing/suit/storage/teshari/cloak/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/uniform/worksuit display_name = "worksuit selection (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/standard/worksuit + path = /obj/item/clothing/under/teshari/undercoat/standard/worksuit whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/uniform/worksuit/New() ..() var/list/worksuits = list() - for(var/worksuit in typesof(/obj/item/clothing/under/seromi/undercoat/standard/worksuit)) - var/obj/item/clothing/under/seromi/undercoat/standard/worksuit/worksuit_type = worksuit + for(var/worksuit in typesof(/obj/item/clothing/under/teshari/undercoat/standard/worksuit)) + var/obj/item/clothing/under/teshari/undercoat/standard/worksuit/worksuit_type = worksuit worksuits[initial(worksuit_type.name)] = worksuit_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(worksuits)) /datum/gear/uniform/undercoatcolor display_name = "undercoat, recolorable (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/standard/white_grey + path = /obj/item/clothing/under/teshari/undercoat/standard/white_grey whitelisted = SPECIES_TESHARI sort_category = "Xenowear" @@ -605,7 +605,7 @@ /datum/gear/suit/cloakcolor display_name = "cloak, recolorable (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey + path = /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey whitelisted = SPECIES_TESHARI sort_category = "Xenowear" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index eea01d31b8c..de9bb813a77 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -229,7 +229,7 @@ throwforce = 2 slot_flags = SLOT_EARS sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi') + SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi') /obj/item/clothing/ears/attack_hand(mob/user as mob) if (!user) return @@ -328,7 +328,7 @@ slot_flags = SLOT_GLOVES attack_verb = list("challenged") sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/gloves.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi', SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi' ) drop_sound = 'sound/items/drop/gloves.ogg' @@ -470,7 +470,7 @@ var/image/helmet_light sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi' ) drop_sound = 'sound/items/drop/hat.ogg' @@ -576,7 +576,7 @@ body_parts_covered = FACE|EYES blood_sprite_state = "maskblood" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/masks.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/masks.dmi', SPECIES_VOX = 'icons/mob/species/vox/masks.dmi', SPECIES_TAJ = 'icons/mob/species/tajaran/mask.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/mask.dmi' @@ -630,7 +630,7 @@ var/overshoes = 0 species_restricted = list("exclude",SPECIES_TESHARI, SPECIES_VOX) sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/shoes.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi', SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi' ) drop_sound = 'sound/items/drop/shoes.ogg' @@ -753,7 +753,7 @@ sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi' ) @@ -847,7 +847,7 @@ var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/uniform.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi', SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi' ) diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index e5b1649fa57..11116baa8ee 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -5,7 +5,7 @@ var/list/inside_emotes = list() var/recent_squish = 0 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/shoes.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/shoes.dmi', SPECIES_VOX = 'icons/mob/species/vox/shoes.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/feet.dmi') @@ -85,13 +85,13 @@ /obj/item/clothing/gloves sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/gloves.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/gloves.dmi', SPECIES_VOX = 'icons/mob/species/vox/gloves.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/hands.dmi') /obj/item/clothing/ears sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ears.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/ears.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/ears.dmi') /obj/item/clothing/relaymove(var/mob/living/user,var/direction) @@ -131,7 +131,7 @@ slot_wear_mask_str = 'icons/mob/mask_vr.dmi' ) sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/masks_vr.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/masks_vr.dmi', SPECIES_VOX = 'icons/mob/species/vox/masks.dmi', SPECIES_TAJ = 'icons/mob/species/tajaran/mask_vr.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/mask_vr.dmi', @@ -149,7 +149,7 @@ //Switch to taur sprites if a taur equips /obj/item/clothing/suit sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi') @@ -158,7 +158,7 @@ sensor_mode = 3 var/sensorpref = 5 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/uniform.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/uniform.dmi', SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi') @@ -178,6 +178,6 @@ /obj/item/clothing/head sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi') diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 60ff3b8e352..49cf22bd9b6 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -31,8 +31,8 @@ BLIND // can't see anything pickup_sound = 'sound/items/pickup/accessory.ogg' sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/eyes.dmi', - "Vox" = 'icons/mob/species/vox/eyes.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi', + SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi' ) /obj/item/clothing/glasses/update_clothing_icon() diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index 7cef44b83c8..4471f3d9c51 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -125,7 +125,7 @@ /obj/item/clothing/glasses sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/eyes.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/eyes.dmi', SPECIES_VOX = 'icons/mob/species/vox/eyes.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/eyes.dmi' ) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 79642d34c14..4b410163fe2 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -10,7 +10,7 @@ desc = "an ultra rare hat. It commands a certain respect." icon_state = "petehat" sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi' ) diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index 135c73d5396..519f7cd1a79 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -6,7 +6,7 @@ icon_state = "pilot_helmet1" item_icons = list(slot_head_str = 'icons/mob/pilot_helmet.dmi') sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/pilot_helmet.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/pilot_helmet.dmi' ) flags = THICKMATERIAL armor = list(melee = 20, bullet = 10, laser = 10, energy = 5, bomb = 10, bio = 0, rad = 0) diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 8ae8ca36741..cc76771d459 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -15,7 +15,7 @@ SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' ) species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them max_pressure_protection = null @@ -57,7 +57,7 @@ SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' ) supporting_limbs = list() species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_PROMETHEAN, SPECIES_TESHARI) //vox, diona, and zaddat can't use hardsuits not designed for them diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index 6157dca2558..1d211e0bf15 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm @@ -12,7 +12,7 @@ SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi', SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' ) @@ -31,7 +31,7 @@ SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi', SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' ) /obj/item/clothing/head/helmet/space/rig diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index cd2f05f5e72..162b097aa71 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -38,7 +38,7 @@ verbs |= /obj/item/clothing/head/helmet/space/proc/toggle_camera if(type == /obj/item/clothing/head/helmet/space) //VOREStation edit - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes. - sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/seromi/helmet_vr.dmi' + sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/teshari/helmet_vr.dmi' /obj/item/clothing/head/helmet/space/proc/toggle_camera() set name = "Toggle Helmet Camera" @@ -96,7 +96,7 @@ /obj/item/clothing/suit/space/Initialize() . = ..() if(type == /obj/item/clothing/suit/space) - sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/seromi/suit_vr.dmi' + sprite_sheets[SPECIES_TESHARI] = 'icons/mob/species/teshari/suit_vr.dmi' //VOREStation edit end. /obj/item/clothing/suit/space/equipped(mob/M) diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 7b4be66f222..7b4cf74057d 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -186,7 +186,7 @@ /obj/item/clothing/head/helmet/space/void/medical/alt/tesh sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi' ) sprite_sheets_obj = list( SPECIES_TESHARI = 'icons/obj/clothing/hats.dmi' @@ -222,7 +222,7 @@ /obj/item/clothing/suit/space/void/medical/alt/tesh sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' ) sprite_sheets_obj = list( SPECIES_TESHARI = 'icons/obj/clothing/spacesuits.dmi' diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index d92b1351eee..88ccc7370e3 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -24,7 +24,7 @@ SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi', SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi', SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/hats.dmi' + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/hats.dmi' ) light_overlay = "helmet_light" @@ -54,7 +54,7 @@ SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi', SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi', SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/suits.dmi' + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/suits.dmi' ) //Breach thresholds, should ideally be inherited by most (if not all) voidsuits. diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index d1c8d16f3a4..4c21007a8b2 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -11,7 +11,7 @@ SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi', SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi', SPECIES_AKULA = 'icons/mob/species/akula/helmet_vr.dmi', SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_vr.dmi', @@ -24,7 +24,7 @@ SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi', // Copied from void.dm SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', // Copied from void.dm SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/hats.dmi', // Copied from void.dm - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/hats.dmi', // Copied from void.dm + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/hats.dmi', // Copied from void.dm SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/hats.dmi', SPECIES_AKULA = 'icons/obj/clothing/species/akula/hats.dmi', SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/hats.dmi', @@ -40,7 +40,7 @@ SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi', SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi', SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi', SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi', SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi', SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi', @@ -53,7 +53,7 @@ SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi', // Copied from void.dm SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', // Copied from void.dm SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/suits.dmi', // Copied from void.dm - SPECIES_TESHARI = 'icons/obj/clothing/species/seromi/suits.dmi', // Copied from void.dm + SPECIES_TESHARI = 'icons/obj/clothing/species/teshari/suits.dmi', // Copied from void.dm SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/suits.dmi', SPECIES_AKULA = 'icons/obj/clothing/species/akula/suits.dmi', SPECIES_SERGAL = 'icons/obj/clothing/species/sergal/suits.dmi', @@ -163,7 +163,7 @@ SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit_vr.dmi', SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit_vr.dmi', SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_vr.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/suit_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi' ) sprite_sheets_obj = list( SPECIES_TAJ = 'icons/obj/clothing/suits_vr.dmi', @@ -242,7 +242,7 @@ SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet_vr.dmi', SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet_vr.dmi', SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_vr.dmi', - SPECIES_TESHARI = 'icons/mob/species/seromi/helmet_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi' ) sprite_sheets_obj = list( SPECIES_TAJ = 'icons/obj/clothing/hats_vr.dmi', diff --git a/code/modules/clothing/suits/aliens/seromi.dm b/code/modules/clothing/suits/aliens/teshari.dm similarity index 77% rename from code/modules/clothing/suits/aliens/seromi.dm rename to code/modules/clothing/suits/aliens/teshari.dm index 4ce78dff7b2..65a19bf8c20 100644 --- a/code/modules/clothing/suits/aliens/seromi.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -1,141 +1,141 @@ // Standard Cloaks -/obj/item/clothing/suit/storage/seromi/cloak +/obj/item/clothing/suit/storage/teshari/cloak name = "black cloak" desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside." - icon = 'icons/mob/species/seromi/teshari_cloak.dmi' - icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi' + icon = 'icons/mob/species/teshari/teshari_cloak.dmi' + icon_override = 'icons/mob/species/teshari/teshari_cloak.dmi' icon_state = "tesh_cloak_bn" item_state = "tesh_cloak_bn" species_restricted = list(SPECIES_TESHARI) body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_red +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_red name = "black and red cloak" icon_state = "tesh_cloak_br" item_state = "tesh_cloak_br" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_orange +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_orange name = "black and orange cloak" icon_state = "tesh_cloak_bo" item_state = "tesh_cloak_bo" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_yellow +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_yellow name = "black and yellow cloak" icon_state = "tesh_cloak_by" item_state = "tesh_cloak_by" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_green +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_green name = "black and green cloak" icon_state = "tesh_cloak_bgr" item_state = "tesh_cloak_bgr" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_blue +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_blue name = "black and blue cloak" icon_state = "tesh_cloak_bbl" item_state = "tesh_cloak_bbl" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_purple +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_purple name = "black and purple cloak" icon_state = "tesh_cloak_bp" item_state = "tesh_cloak_bp" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_pink +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_pink name = "black and pink cloak" icon_state = "tesh_cloak_bpi" item_state = "tesh_cloak_bpi" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_brown +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_brown name = "black and brown cloak" icon_state = "tesh_cloak_bbr" item_state = "tesh_cloak_bbr" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_grey name = "black and grey cloak" icon_state = "tesh_cloak_bg" item_state = "tesh_cloak_bg" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_white +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_white name = "black and white cloak" icon_state = "tesh_cloak_bw" item_state = "tesh_cloak_bw" -/obj/item/clothing/suit/storage/seromi/cloak/standard/white +/obj/item/clothing/suit/storage/teshari/cloak/standard/white name = "white cloak" icon_state = "tesh_cloak_wn" item_state = "tesh_cloak_wn" -/obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey name = "white and grey cloak" icon_state = "tesh_cloak_wg" item_state = "tesh_cloak_wg" -/obj/item/clothing/suit/storage/seromi/cloak/standard/red_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/red_grey name = "red and grey cloak" icon_state = "tesh_cloak_rg" item_state = "tesh_cloak_rg" -/obj/item/clothing/suit/storage/seromi/cloak/standard/orange_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/orange_grey name = "orange and grey cloak" icon_state = "tesh_cloak_og" item_state = "tesh_cloak_og" -/obj/item/clothing/suit/storage/seromi/cloak/standard/yellow_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/yellow_grey name = "yellow and grey cloak" icon_state = "tesh_cloak_yg" item_state = "tesh_cloak_yg" -/obj/item/clothing/suit/storage/seromi/cloak/standard/green_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/green_grey name = "green and grey cloak" icon_state = "tesh_cloak_gg" item_state = "tesh_cloak_gg" -/obj/item/clothing/suit/storage/seromi/cloak/standard/blue_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/blue_grey name = "blue and grey cloak" icon_state = "tesh_cloak_blug" item_state = "tesh_cloak_blug" -/obj/item/clothing/suit/storage/seromi/cloak/standard/purple_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/purple_grey name = "purple and grey cloak" icon_state = "tesh_cloak_pg" item_state = "tesh_cloak_pg" -/obj/item/clothing/suit/storage/seromi/cloak/standard/pink_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/pink_grey name = "pink and grey cloak" icon_state = "tesh_cloak_pig" item_state = "tesh_cloak_pig" -/obj/item/clothing/suit/storage/seromi/cloak/standard/brown_grey +/obj/item/clothing/suit/storage/teshari/cloak/standard/brown_grey name = "brown and grey cloak" icon_state = "tesh_cloak_brg" item_state = "tesh_cloak_brg" -/obj/item/clothing/suit/storage/seromi/cloak/standard/rainbow +/obj/item/clothing/suit/storage/teshari/cloak/standard/rainbow name = "rainbow cloak" icon_state = "tesh_cloak_rainbow" item_state = "tesh_cloak_rainbow" -/obj/item/clothing/suit/storage/seromi/cloak/standard/orange +/obj/item/clothing/suit/storage/teshari/cloak/standard/orange name = "orange cloak" icon_state = "tesh_cloak_on" item_state = "tesh_cloak_on" -/obj/item/clothing/suit/storage/seromi/cloak/standard/dark_retrowave +/obj/item/clothing/suit/storage/teshari/cloak/standard/dark_retrowave name = "dark aesthetic cloak" icon_state = "tesh_cloak_dretrowave" item_state = "tesh_cloak_dretrowave" -/obj/item/clothing/suit/storage/seromi/cloak/standard/black_glow +/obj/item/clothing/suit/storage/teshari/cloak/standard/black_glow name = "black and glowing cloak" icon_state = "tesh_cloak_bglowing" item_state = "tesh_cloak_bglowing" // Job Cloaks -/obj/item/clothing/suit/storage/seromi/cloak/jobs - icon = 'icons/mob/species/seromi/deptcloak.dmi' - icon_override = 'icons/mob/species/seromi/deptcloak.dmi' +/obj/item/clothing/suit/storage/teshari/cloak/jobs + icon = 'icons/mob/species/teshari/deptcloak.dmi' + icon_override = 'icons/mob/species/teshari/deptcloak.dmi' -/obj/item/clothing/suit/storage/seromi/cloak/jobs/cap +/obj/item/clothing/suit/storage/teshari/cloak/jobs/cap name = "facility director cloak" desc = "A soft Teshari cloak made for the Facility Director" icon_state = "tesh_cloak_cap" @@ -143,19 +143,19 @@ //Cargo -/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm +/obj/item/clothing/suit/storage/teshari/cloak/jobs/qm name = "quartermaster cloak" desc = "A soft Teshari cloak made for the Quartermaster" icon_state = "tesh_cloak_qm" item_state = "tesh_cloak_qm" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo +/obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo name = "cargo cloak" desc = "A soft Teshari cloak made for the Cargo department" icon_state = "tesh_cloak_car" item_state = "tesh_cloak_car" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining +/obj/item/clothing/suit/storage/teshari/cloak/jobs/mining name = "mining cloak" desc = "A soft Teshari cloak made for Mining" icon_state = "tesh_cloak_mine" @@ -163,19 +163,19 @@ //Engineering -/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce +/obj/item/clothing/suit/storage/teshari/cloak/jobs/ce name = "cheif engineer cloak" desc = "A soft Teshari cloak made the Chief Engineer" icon_state = "tesh_cloak_ce" item_state = "tesh_cloak_ce" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer +/obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer name = "engineering cloak" desc = "A soft Teshari cloak made for the Engineering department" icon_state = "tesh_cloak_engie" item_state = "tesh_cloak_engie" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos +/obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos name = "atmospherics cloak" desc = "A soft Teshari cloak made for the Atmospheric Technician" icon_state = "tesh_cloak_atmos" @@ -183,37 +183,37 @@ //Medical -/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo +/obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo name = "chief medical officer cloak" desc = "A soft Teshari cloak made the Cheif Medical Officer" icon_state = "tesh_cloak_cmo" item_state = "tesh_cloak_cmo" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical +/obj/item/clothing/suit/storage/teshari/cloak/jobs/medical name = "medical cloak" desc = "A soft Teshari cloak made for the Medical department" icon_state = "tesh_cloak_doc" item_state = "tesh_cloak_doc" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry +/obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry name = "chemist cloak" desc = "A soft Teshari cloak made for the Chemist" icon_state = "tesh_cloak_chem" item_state = "tesh_cloak_chem" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro +/obj/item/clothing/suit/storage/teshari/cloak/jobs/viro name = "virologist cloak" desc = "A soft Teshari cloak made for the Virologist" icon_state = "tesh_cloak_viro" item_state = "tesh_cloak_viro" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/para +/obj/item/clothing/suit/storage/teshari/cloak/jobs/para name = "paramedic cloak" desc = "A soft Teshari cloak made for the Paramedic" icon_state = "tesh_cloak_para" item_state = "tesh_cloak_para" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/psych +/obj/item/clothing/suit/storage/teshari/cloak/jobs/psych name = " psychiatrist cloak" desc = "A soft Teshari cloak made for the Psychiatrist" icon_state = "tesh_cloak_psych" @@ -221,19 +221,19 @@ //Science -/obj/item/clothing/suit/storage/seromi/cloak/jobs/rd +/obj/item/clothing/suit/storage/teshari/cloak/jobs/rd name = "research director cloak" desc = "A soft Teshari cloak made for the Research Director" icon_state = "tesh_cloak_rd" item_state = "tesh_cloak_rd" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci +/obj/item/clothing/suit/storage/teshari/cloak/jobs/sci name = "scientist cloak" desc = "A soft Teshari cloak made for the Science department" icon_state = "tesh_cloak_sci" item_state = "tesh_cloak_sci" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo +/obj/item/clothing/suit/storage/teshari/cloak/jobs/robo name = "roboticist cloak" desc = "A soft Teshari cloak made for the Roboticist" icon_state = "tesh_cloak_robo" @@ -241,19 +241,19 @@ //Security -/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos +/obj/item/clothing/suit/storage/teshari/cloak/jobs/hos name = "head of security cloak" desc = "A soft Teshari cloak made for the Head of Security" icon_state = "tesh_cloak_hos" item_state = "tesh_cloak_hos" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec +/obj/item/clothing/suit/storage/teshari/cloak/jobs/sec name = "security cloak" desc = "A soft Teshari cloak made for the Security department" icon_state = "tesh_cloak_sec" item_state = "tesh_cloak_sec" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa +/obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa name = "internal affairs cloak" desc = "A soft Teshari cloak made for the Internal Affairs Agent" icon_state = "tesh_cloak_iaa" @@ -261,13 +261,13 @@ //Service -/obj/item/clothing/suit/storage/seromi/cloak/jobs/hop +/obj/item/clothing/suit/storage/teshari/cloak/jobs/hop name = "head of personnel cloak" desc = "A soft Teshari cloak made for the Head of Personnel" icon_state = "tesh_cloak_hop" item_state = "tesh_cloak_hop" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/service +/obj/item/clothing/suit/storage/teshari/cloak/jobs/service name = "service cloak" desc = "A soft Teshari cloak made for the Service department" icon_state = "tesh_cloak_serv" @@ -278,16 +278,16 @@ /obj/item/clothing/suit/storage/toggle/labcoat/teshari name = "Teshari labcoat" desc = "A small suit that protects against minor chemical spills. This one is a good fit on Teshari." - icon = 'icons/obj/clothing/species/seromi/suits.dmi' - icon_override = 'icons/mob/species/seromi/suit.dmi' + icon = 'icons/obj/clothing/species/teshari/suits.dmi' + icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesh_labcoat" species_restricted = list(SPECIES_TESHARI) /obj/item/clothing/suit/storage/toggle/tesharicoat name = "small black coat" desc = "A coat that seems too small to fit a human." - icon = 'icons/obj/clothing/species/seromi/suits.dmi' - icon_override = 'icons/mob/species/seromi/suit.dmi' + icon = 'icons/obj/clothing/species/teshari/suits.dmi' + icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesharicoat" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS species_restricted = list(SPECIES_TESHARI) @@ -295,8 +295,8 @@ /obj/item/clothing/suit/storage/toggle/tesharicoatwhite name = "small coat" desc = "A coat that seems too small to fit a human." - icon = 'icons/obj/clothing/species/seromi/suits.dmi' - icon_override = 'icons/mob/species/seromi/suit.dmi' + icon = 'icons/obj/clothing/species/teshari/suits.dmi' + icon_override = 'icons/mob/species/teshari/suit.dmi' icon_state = "tesharicoatwhite" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS species_restricted = list(SPECIES_TESHARI) @@ -305,8 +305,8 @@ /obj/item/clothing/suit/storage/hooded/teshari name = "Hooded Teshari Cloak" desc = "A soft teshari cloak with an added hood." - icon_override = 'icons/mob/species/seromi/teshari_hood.dmi' - icon = 'icons/mob/species/seromi/teshari_hood.dmi' + icon_override = 'icons/mob/species/teshari/teshari_hood.dmi' + icon = 'icons/mob/species/teshari/teshari_hood.dmi' icon_state = "tesh_hcloak_bo" item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo") body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -319,8 +319,8 @@ /obj/item/clothing/head/tesh_hood name = "Cloak Hood" desc = "A hood attached to a teshari cloak." - icon_override = 'icons/mob/species/seromi/teshari_hood.dmi' - icon = 'icons/mob/species/seromi/teshari_hood.dmi' + icon_override = 'icons/mob/species/teshari/teshari_hood.dmi' + icon = 'icons/mob/species/teshari/teshari_hood.dmi' icon_state = "tesh_hood_bo" item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo") flags_inv = BLOCKHAIR @@ -603,261 +603,261 @@ item_state = "tesh_hood_brg" //Belted cloaks -/obj/item/clothing/suit/storage/seromi/beltcloak +/obj/item/clothing/suit/storage/teshari/beltcloak name = "belted cloak" desc = "A more ridged and stylized Teshari cloak." - icon = 'icons/mob/species/seromi/teshari_cloak.dmi' - icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi' + icon = 'icons/mob/species/teshari/teshari_cloak.dmi' + icon_override = 'icons/mob/species/teshari/teshari_cloak.dmi' icon_state = "tesh_beltcloak_bo" item_state = "tesh_beltcloak_bo" species_restricted = list(SPECIES_TESHARI) body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_orange +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_orange name = "black belted cloak (orange)" icon_state = "tesh_beltcloak_bo" item_state = "tesh_beltcloak_bo" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_grey name = "black belted cloak" icon_state = "tesh_beltcloak_bg" item_state = "tesh_beltcloak_bg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_midgrey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_midgrey name = "black belted cloak (medium grey)" icon_state = "tesh_beltcloak_bmg" item_state = "tesh_beltcloak_bmg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_lightgrey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_lightgrey name = "black belted cloak (light grey)" icon_state = "tesh_beltcloak_blg" item_state = "tesh_beltcloak_blg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_white +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_white name = "black belted cloak (white)" icon_state = "tesh_beltcloak_bw" item_state = "tesh_beltcloak_bw" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_red +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_red name = "black belted cloak (red)" icon_state = "tesh_beltcloak_br" item_state = "tesh_beltcloak_br" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black name = "black simple belted cloak" icon_state = "tesh_beltcloak_bn" item_state = "tesh_beltcloak_bn" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_yellow +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_yellow name = "black belted cloak (yellow)" icon_state = "tesh_beltcloak_by" item_state = "tesh_beltcloak_by" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_green +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_green name = "black belted cloak (green)" icon_state = "tesh_beltcloak_bgr" item_state = "tesh_beltcloak_bgr" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_blue +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_blue name = "black belted cloak (blue)" icon_state = "tesh_beltcloak_bbl" item_state = "tesh_beltcloak_bbl" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_purple +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_purple name = "black belted cloak (purple)" icon_state = "tesh_beltcloak_bp" item_state = "tesh_beltcloak_bp" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_pink +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_pink name = "black belted cloak (pink)" icon_state = "tesh_beltcloak_bpi" item_state = "tesh_beltcloak_bpi" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_brown +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/black_brown name = "black belted cloak (brown)" icon_state = "tesh_beltcloak_bbr" item_state = "tesh_beltcloak_bbr" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange_grey name = "orange belted cloak" icon_state = "tesh_beltcloak_og" item_state = "tesh_beltcloak_og" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/rainbow +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/rainbow name = "rainbow belted cloak" icon_state = "tesh_beltcloak_rainbow" item_state = "tesh_beltcloak_rainbow" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/lightgrey_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/lightgrey_grey name = "light grey belted cloak" icon_state = "tesh_beltcloak_lgg" item_state = "tesh_beltcloak_lgg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey name = "white belted cloak" icon_state = "tesh_beltcloak_wg" item_state = "tesh_beltcloak_wg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/red_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/red_grey name = "red belted cloak" icon_state = "tesh_beltcloak_rg" item_state = "tesh_beltcloak_rg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/orange name = "orange simple belted cloak" icon_state = "tesh_beltcloak_on" item_state = "tesh_beltcloak_on" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/yellow_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/yellow_grey name = "yellow belted cloak" icon_state = "tesh_beltcloak_yg" item_state = "tesh_beltcloak_yg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/green_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/green_grey name = "green belted cloak" icon_state = "tesh_beltcloak_gg" item_state = "tesh_beltcloak_gg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/blue_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/blue_grey name = "blue belted cloak" icon_state = "tesh_beltcloak_blug" item_state = "tesh_beltcloak_blug" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/purple_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/purple_grey name = "purple belted cloak" icon_state = "tesh_beltcloak_pg" item_state = "tesh_beltcloak_pg" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/pink_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/pink_grey name = "pink belted cloak" icon_state = "tesh_beltcloak_pig" item_state = "tesh_beltcloak_pig" -/obj/item/clothing/suit/storage/seromi/beltcloak/standard/brown_grey +/obj/item/clothing/suit/storage/teshari/beltcloak/standard/brown_grey name = "brown belted cloak" icon_state = "tesh_beltcloak_brg" item_state = "tesh_beltcloak_brg" //Belted job cloaks -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs - icon = 'icons/mob/species/seromi/deptcloak.dmi' - icon_override = 'icons/mob/species/seromi/deptcloak.dmi' +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs + icon = 'icons/mob/species/teshari/deptcloak.dmi' + icon_override = 'icons/mob/species/teshari/deptcloak.dmi' -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cargo name = "cargo belted cloak" desc = "A soft Teshari cloak made for the Cargo department" icon_state = "tesh_beltcloak_car" item_state = "tesh_beltcloak_car" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/mining name = "mining belted cloak" desc = "A soft Teshari cloak made for Mining" icon_state = "tesh_beltcloak_mine" item_state = "tesh_beltcloak_mine" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command name = "command belted cloak" desc = "A soft Teshari cloak made for the Command department" icon_state = "tesh_beltcloak_comm" item_state = "tesh_beltcloak_comm" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/ce name = "chief engineer belted cloak" desc = "A soft Teshari cloak made the Chief Engineer" icon_state = "tesh_beltcloak_ce" item_state = "tesh_beltcloak_ce" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/engineer +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/engineer name = "engineering belted cloak" desc = "A soft Teshari cloak made for the Engineering department" icon_state = "tesh_beltcloak_engie" item_state = "tesh_beltcloak_engie" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/atmos name = "atmospherics belted cloak" desc = "A soft Teshari cloak made for the Atmospheric Technician" icon_state = "tesh_beltcloak_atmos" item_state = "tesh_beltcloak_atmos" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cmo name = "chief medical officer belted cloak" desc = "A soft Teshari cloak made the Chief Medical Officer" icon_state = "tesh_beltcloak_cmo" item_state = "tesh_beltcloak_cmo" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/medical name = "medical belted cloak" desc = "A soft Teshari cloak made for the Medical department" icon_state = "tesh_beltcloak_doc" item_state = "tesh_beltcloak_doc" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/chemistry name = "chemist belted cloak" desc = "A soft Teshari cloak made for the Chemist" icon_state = "tesh_beltcloak_vrem" item_state = "tesh_beltcloak_vrem" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/viro name = "virologist belted cloak" desc = "A soft Teshari cloak made for the Virologist" icon_state = "tesh_beltcloak_viro" item_state = "tesh_beltcloak_viro" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/para name = "paramedic belted cloak" desc = "A soft Teshari cloak made for the Paramedic" icon_state = "tesh_beltcloak_para" item_state = "tesh_beltcloak_para" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sci name = "scientist belted cloak" desc = "A soft Teshari cloak made for the Science department" icon_state = "tesh_beltcloak_sci" item_state = "tesh_beltcloak_sci" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/robo name = "roboticist belted cloak" desc = "A soft Teshari cloak made for the Roboticist" icon_state = "tesh_beltcloak_robo" item_state = "tesh_beltcloak_robo" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sec name = "security belted cloak" desc = "A soft Teshari cloak made for the Security department" icon_state = "tesh_beltcloak_sec" item_state = "tesh_beltcloak_sec" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/qm name = "quartermaster belted cloak" desc = "A soft Teshari cloak made for the Quartermaster" icon_state = "tesh_beltcloak_qm" item_state = "tesh_beltcloak_qm" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/service name = "service belted cloak" desc = "A soft Teshari cloak made for the Service department" icon_state = "tesh_beltcloak_serv" item_state = "tesh_beltcloak_serv" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/iaa name = "internal affairs belted cloak" desc = "A soft Teshari cloak made for the Internal Affairs Agent" icon_state = "tesh_beltcloak_iaa" item_state = "tesh_beltcloak_iaa" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn name = "warden belted cloak" desc = "A soft Teshari cloak made for the Warden" icon_state = "tesh_beltcloak_wrdn" item_state = "tesh_beltcloak_wrdn" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/hos +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/hos name = "security chief belted cloak" desc = "A soft Teshari cloak made for the Head of Security" icon_state = "tesh_beltcloak_hos" item_state = "tesh_beltcloak_hos" -/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani +/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani name = "janitor belted cloak" desc = "A soft Teshari cloak made for the Janitor" icon_state = "tesh_beltcloak_jani" diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index e225a53eee3..529547469b0 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -19,14 +19,14 @@ /obj/item/clothing/head/radiation sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/helmet_vr.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/head.dmi' ) /obj/item/clothing/suit/radiation sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/suit_vr.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/suit_vr.dmi', SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi' ) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 39f23ef5e6e..e576016aa7c 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -15,7 +15,7 @@ var/concealed_holster = 0 var/mob/living/carbon/human/wearer = null // To check if the wearer changes, so species spritesheets change properly. var/list/on_rolled = list() // Used when jumpsuit sleevels are rolled ("rolled" entry) or it's rolled down ("down"). Set to "none" to hide in those states. - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/ties.dmi') //Teshari can into webbing, too! + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi') //Teshari can into webbing, too! drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 2d241bf3b5d..85c28047585 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -14,7 +14,7 @@ var/customized = 0 var/icon_previous_override sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi' ) //Forces different sprite sheet on equip @@ -64,7 +64,7 @@ var/writtenon = 0 var/icon_previous_override sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/ties_vr.dmi' + SPECIES_TESHARI = 'icons/mob/species/teshari/ties_vr.dmi' ) //Forces different sprite sheet on equip diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index e34928641aa..04baf0a2695 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -57,17 +57,16 @@ siemens_coefficient = 0.9 w_class = ITEMSIZE_NORMAL slot = ACCESSORY_SLOT_OVER - sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/suit.dmi' - ) + SPECIES_TESHARI = 'icons/mob/species/teshari/suit.dmi' + ) /obj/item/clothing/accessory/poncho/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites. ..() var/mob/living/carbon/human/H = loc if(istype(H) && H.wear_suit == src) - if(H.species.name == "Teshari") - icon_override = 'icons/mob/species/seromi/suit.dmi' + if(H.species.name == SPECIES_TESHARI) + icon_override = 'icons/mob/species/teshari/suit.dmi' else icon_override = 'icons/mob/ties.dmi' update_clothing_icon() diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/teshari.dm similarity index 66% rename from code/modules/clothing/under/xenos/seromi.dm rename to code/modules/clothing/under/xenos/teshari.dm index 0593f78f72f..39c3590bf4e 100644 --- a/code/modules/clothing/under/xenos/seromi.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -1,387 +1,387 @@ -/obj/item/clothing/under/seromi - icon = 'icons/obj/clothing/species/seromi/uniform.dmi' +/obj/item/clothing/under/teshari + icon = 'icons/obj/clothing/species/teshari/uniform.dmi' icon_state = "seromi_grey" species_restricted = list(SPECIES_TESHARI) -/obj/item/clothing/under/seromi/smock +/obj/item/clothing/under/teshari/smock name = "small grey smock" desc = "It looks fitted to nonhuman proportions." icon_state = "seromi_grey" body_parts_covered = 0 // It's a thin piece of cloth with a neck hole. -/obj/item/clothing/under/seromi/smock/white +/obj/item/clothing/under/teshari/smock/white name = "small white smock" icon_state = "seromi_white" -/obj/item/clothing/under/seromi/smock/red +/obj/item/clothing/under/teshari/smock/red name = "small Security smock" icon_state = "seromi_red" -/obj/item/clothing/under/seromi/smock/yellow +/obj/item/clothing/under/teshari/smock/yellow name = "small Engineering smock" icon_state = "seromi_yellow" -/obj/item/clothing/under/seromi/smock/medical +/obj/item/clothing/under/teshari/smock/medical name = "small Medical uniform" icon_state = "seromi_medical" -/obj/item/clothing/under/seromi/smock/science +/obj/item/clothing/under/teshari/smock/science name = "small Research uniform" icon_state = "teshari_science" -/obj/item/clothing/under/seromi/smock/rainbow +/obj/item/clothing/under/teshari/smock/rainbow name = "small rainbow smock" icon_state = "seromi_rainbow" -/obj/item/clothing/under/seromi/smock/dress +/obj/item/clothing/under/teshari/smock/dress name = "small command dress" icon_state = "seromi_dress_cap" -/obj/item/clothing/under/seromi/smock/dress/science +/obj/item/clothing/under/teshari/smock/dress/science name = "small research dress" icon_state = "tesh_dress_science" -/obj/item/clothing/under/seromi/smock/dress/security +/obj/item/clothing/under/teshari/smock/dress/security name = "small security dress" icon_state = "tesh_dress_security" -/obj/item/clothing/under/seromi/smock/dress/engine +/obj/item/clothing/under/teshari/smock/dress/engine name = "small engineering dress" icon_state = "tesh_dress_engine" -/obj/item/clothing/under/seromi/smock/dress/medical +/obj/item/clothing/under/teshari/smock/dress/medical name = "small medical dress" icon_state = "tesh_dress_medical" -/obj/item/clothing/under/seromi/smock/uniform +/obj/item/clothing/under/teshari/smock/uniform name = "small command uniform" icon_state = "seromi_captain" -/obj/item/clothing/under/seromi/smock/formal +/obj/item/clothing/under/teshari/smock/formal name = "small formal uniform" icon_state = "seromi_captain_formal" -/obj/item/clothing/under/seromi/smock/blackutilitysmock +/obj/item/clothing/under/teshari/smock/blackutilitysmock name = "black utility smock" icon_state = "teshari_blackutility_com" -/obj/item/clothing/under/seromi/smock/greydress +/obj/item/clothing/under/teshari/smock/greydress name = "small grey dress" icon_state = "teshari_greydress" -/obj/item/clothing/under/seromi/smock/blackutility +/obj/item/clothing/under/teshari/smock/blackutility name = "Teshari utility uniform" icon_state = "teshari_blackutility" -/obj/item/clothing/under/seromi/smock/bluegreydress +/obj/item/clothing/under/teshari/smock/bluegreydress name = "small blue and grey dress" icon_state = "teshari_bluegreydress" // Worksuits -/obj/item/clothing/under/seromi/undercoat/standard/worksuit +/obj/item/clothing/under/teshari/undercoat/standard/worksuit name = "small black and red worksuit" icon_state = "teshari_black_red_worksuit" item_state = "teshari_black_red_worksuit" desc = "A small worksuit designed for a Teshari" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackpurple +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackpurple name = "small black and purple worksuit" icon_state = "teshari_black_purple_worksuit" item_state = "teshari_black_purple_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackorange +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackorange name = "small black and orange worksuit" icon_state = "teshari_black_orange_worksuit" item_state = "teshari_black_orange_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackblue +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackblue name = "small black and blue worksuit" icon_state = "teshari_black_blue_worksuit" item_state = "teshari_black_blue_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackgreen +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/blackgreen name = "small black and greeen worksuit" icon_state = "teshari_black_green_worksuit" item_state = "teshari_black_green_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitered +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitered name = "small white and red worksuit" icon_state = "teshari_white_red_worksuit" item_state = "teshari_white_red_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitepurple +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitepurple name = "small white and purple worksuit" icon_state = "teshari_white_purple_worksuit" item_state = "teshari_white_purple_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteorange +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteorange name = "small white and orange worksuit" icon_state = "teshari_white_orange_worksuit" item_state = "teshari_white_orange_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteblue +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whiteblue name = "small white and blue worksuit" icon_state = "teshari_white_blue_worksuit" item_state = "teshari_white_blue_worksuit" -/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitegreen +/obj/item/clothing/under/teshari/undercoat/standard/worksuit/whitegreen name = "small white and green worksuit" icon_state = "teshari_white_green_worksuit" item_state = "teshari_white_green_worksuit" //Standard Undercoats -/obj/item/clothing/under/seromi/undercoat +/obj/item/clothing/under/teshari/undercoat name = "Undercoat" desc = "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!" - icon = 'icons/mob/species/seromi/teshari_uniform.dmi' - icon_override = 'icons/mob/species/seromi/teshari_uniform.dmi' + icon = 'icons/mob/species/teshari/teshari_uniform.dmi' + icon_override = 'icons/mob/species/teshari/teshari_uniform.dmi' icon_state = "tesh_uniform_bo" item_state = "tesh_uniform_bo" body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/under/seromi/undercoat/standard/black_orange +/obj/item/clothing/under/teshari/undercoat/standard/black_orange name = "black and orange undercoat" icon_state = "tesh_uniform_bo" item_state = "tesh_uniform_bo" -/obj/item/clothing/under/seromi/undercoat/standard/black_grey +/obj/item/clothing/under/teshari/undercoat/standard/black_grey name = "black and grey undercoat" icon_state = "tesh_uniform_bg" item_state = "tesh_uniform_bg" -/obj/item/clothing/under/seromi/undercoat/standard/black_white +/obj/item/clothing/under/teshari/undercoat/standard/black_white name = "black and white undercoat" icon_state = "tesh_uniform_bw" item_state = "tesh_uniform_bw" -/obj/item/clothing/under/seromi/undercoat/standard/black_red +/obj/item/clothing/under/teshari/undercoat/standard/black_red name = "black and red undercoat" icon_state = "tesh_uniform_br" item_state = "tesh_uniform_br" -/obj/item/clothing/under/seromi/undercoat/standard/black +/obj/item/clothing/under/teshari/undercoat/standard/black name = "black undercoat" icon_state = "tesh_uniform_bn" item_state = "tesh_uniform_bn" -/obj/item/clothing/under/seromi/undercoat/standard/black_yellow +/obj/item/clothing/under/teshari/undercoat/standard/black_yellow name = "black and yellow undercoat" icon_state = "tesh_uniform_by" item_state = "tesh_uniform_by" -/obj/item/clothing/under/seromi/undercoat/standard/black_green +/obj/item/clothing/under/teshari/undercoat/standard/black_green name = "black and green undercoat" icon_state = "tesh_uniform_bgr" item_state = "tesh_uniform_bgr" -/obj/item/clothing/under/seromi/undercoat/standard/black_blue +/obj/item/clothing/under/teshari/undercoat/standard/black_blue name = "black and blue undercoat" icon_state = "tesh_uniform_bbl" item_state = "tesh_uniform_bbl" -/obj/item/clothing/under/seromi/undercoat/standard/black_purple +/obj/item/clothing/under/teshari/undercoat/standard/black_purple name = "black and purple undercoat" icon_state = "tesh_uniform_bp" item_state = "tesh_uniform_bp" -/obj/item/clothing/under/seromi/undercoat/standard/black_pink +/obj/item/clothing/under/teshari/undercoat/standard/black_pink name = "black and pink undercoat" icon_state = "tesh_uniform_bpi" item_state = "tesh_uniform_bpi" -/obj/item/clothing/under/seromi/undercoat/standard/black_brown +/obj/item/clothing/under/teshari/undercoat/standard/black_brown name = "black and brown undercoat" icon_state = "tesh_uniform_bbr" item_state = "tesh_uniform_bbr" -/obj/item/clothing/under/seromi/undercoat/standard/orange_grey +/obj/item/clothing/under/teshari/undercoat/standard/orange_grey name = "orange and grey undercoat" icon_state = "tesh_uniform_og" item_state = "tesh_uniform_og" -/obj/item/clothing/under/seromi/undercoat/standard/rainbow +/obj/item/clothing/under/teshari/undercoat/standard/rainbow name = "rainbow undercoat" icon_state = "tesh_uniform_rainbow" item_state = "tesh_uniform_rainbow" -/obj/item/clothing/under/seromi/undercoat/standard/lightgrey_grey +/obj/item/clothing/under/teshari/undercoat/standard/lightgrey_grey name = "light grey and grey undercoat" icon_state = "tesh_uniform_lgg" item_state = "tesh_uniform_lgg" -/obj/item/clothing/under/seromi/undercoat/standard/white_grey +/obj/item/clothing/under/teshari/undercoat/standard/white_grey name = "white and grey undercoat" icon_state = "tesh_uniform_wg" item_state = "tesh_uniform_wg" -/obj/item/clothing/under/seromi/undercoat/standard/red_grey +/obj/item/clothing/under/teshari/undercoat/standard/red_grey name = "red and grey undercoat" icon_state = "tesh_uniform_rg" item_state = "tesh_uniform_rg" -/obj/item/clothing/under/seromi/undercoat/standard/orange +/obj/item/clothing/under/teshari/undercoat/standard/orange name = "orange undercoat" icon_state = "tesh_uniform_on" item_state = "tesh_uniform_on" -/obj/item/clothing/under/seromi/undercoat/standard/yellow_grey +/obj/item/clothing/under/teshari/undercoat/standard/yellow_grey name = "yellow and grey undercoat" icon_state = "tesh_uniform_yg" item_state = "tesh_uniform_yg" -/obj/item/clothing/under/seromi/undercoat/standard/green_grey +/obj/item/clothing/under/teshari/undercoat/standard/green_grey name = "green and grey undercoat" icon_state = "tesh_uniform_gg" item_state = "tesh_uniform_gg" -/obj/item/clothing/under/seromi/undercoat/standard/blue_grey +/obj/item/clothing/under/teshari/undercoat/standard/blue_grey name = "blue and grey undercoat" icon_state = "tesh_uniform_blug" item_state = "tesh_uniform_blug" -/obj/item/clothing/under/seromi/undercoat/standard/purple_grey +/obj/item/clothing/under/teshari/undercoat/standard/purple_grey name = "purple and grey undercoat" icon_state = "tesh_uniform_pg" item_state = "tesh_uniform_pg" -/obj/item/clothing/under/seromi/undercoat/standard/pink_grey +/obj/item/clothing/under/teshari/undercoat/standard/pink_grey name = "pink and grey undercoat" icon_state = "tesh_uniform_pig" item_state = "tesh_uniform_pig" -/obj/item/clothing/under/seromi/undercoat/standard/brown_grey +/obj/item/clothing/under/teshari/undercoat/standard/brown_grey name = "brown and grey undercoat" icon_state = "tesh_uniform_brg" item_state = "tesh_uniform_brg" //Job Undercoats -/obj/item/clothing/under/seromi/undercoat/jobs - icon = 'icons/mob/species/seromi/deptjacket.dmi' - icon_override = 'icons/mob/species/seromi/deptjacket.dmi' +/obj/item/clothing/under/teshari/undercoat/jobs + icon = 'icons/mob/species/teshari/deptjacket.dmi' + icon_override = 'icons/mob/species/teshari/deptjacket.dmi' -/obj/item/clothing/under/seromi/undercoat/jobs/cap +/obj/item/clothing/under/teshari/undercoat/jobs/cap name = "facility director undercoat" desc = "A traditional Teshari garb made for the Facility Director" icon_state = "tesh_uniform_cap" item_state = "tesh_uniform_cap" -/obj/item/clothing/under/seromi/undercoat/jobs/hop +/obj/item/clothing/under/teshari/undercoat/jobs/hop name = "head of personnel undercoat" desc = "A traditional Teshari garb made for the Head of Personnel" icon_state = "tesh_uniform_hop" item_state = "tesh_uniform_hop" -/obj/item/clothing/under/seromi/undercoat/jobs/ce +/obj/item/clothing/under/teshari/undercoat/jobs/ce name = "cheif engineer undercoat" desc = "A traditional Teshari garb made for the Chief Engineer" icon_state = "tesh_uniform_ce" item_state = "tesh_uniform_ce" -/obj/item/clothing/under/seromi/undercoat/jobs/hos +/obj/item/clothing/under/teshari/undercoat/jobs/hos name = "head of security undercoat" desc = "A traditional Teshari garb made for the Head of Security" icon_state = "tesh_uniform_hos" item_state = "tesh_uniform_hos" -/obj/item/clothing/under/seromi/undercoat/jobs/rd +/obj/item/clothing/under/teshari/undercoat/jobs/rd name = "research director undercoat" desc = "A traditional Teshari garb made for the Research Director" icon_state = "tesh_uniform_rd" item_state = "tesh_uniform_rd" -/obj/item/clothing/under/seromi/undercoat/jobs/engineer +/obj/item/clothing/under/teshari/undercoat/jobs/engineer name = "engineering undercoat" desc = "A traditional Teshari garb made for the Engineering department" icon_state = "tesh_uniform_engie" item_state = "tesh_uniform_engie" -/obj/item/clothing/under/seromi/undercoat/jobs/atmos +/obj/item/clothing/under/teshari/undercoat/jobs/atmos name = "atmospherics undercoat" desc = "A traditional Teshari garb made for the Atmospheric Technician" icon_state = "tesh_uniform_atmos" item_state = "tesh_uniform_atmos" -/obj/item/clothing/under/seromi/undercoat/jobs/cmo +/obj/item/clothing/under/teshari/undercoat/jobs/cmo name = "chief medical officer undercoat" desc = "A traditional Teshari garb made for the Cheif Medical Officer" icon_state = "tesh_uniform_cmo" item_state = "tesh_uniform_cmo" -/obj/item/clothing/under/seromi/undercoat/jobs/qm +/obj/item/clothing/under/teshari/undercoat/jobs/qm name = "quartermaster undercoat" desc = "A traditional Teshari garb made for the Quartermaster" icon_state = "tesh_uniform_qm" item_state = "tesh_uniform_qm" -/obj/item/clothing/under/seromi/undercoat/jobs/cargo +/obj/item/clothing/under/teshari/undercoat/jobs/cargo name = "cargo undercoat" desc = "A traditional Teshari garb made for the Cargo department" icon_state = "tesh_uniform_car" item_state = "tesh_uniform_car" -/obj/item/clothing/under/seromi/undercoat/jobs/mining +/obj/item/clothing/under/teshari/undercoat/jobs/mining name = "mining undercoat" desc = "A traditional Teshari garb made for Mining" icon_state = "tesh_uniform_mine" item_state = "tesh_uniform_mine" -/obj/item/clothing/under/seromi/undercoat/jobs/medical +/obj/item/clothing/under/teshari/undercoat/jobs/medical name = "medical undercoat" desc = "A traditional Teshari garb made for the Medical department" icon_state = "tesh_uniform_doc" item_state = "tesh_uniform_doc" -/obj/item/clothing/under/seromi/undercoat/jobs/chemistry +/obj/item/clothing/under/teshari/undercoat/jobs/chemistry name = "chemist undercoat" desc = "A traditional Teshari garb made for the Chemist" icon_state = "tesh_uniform_chem" item_state = "tesh_uniform_chem" -/obj/item/clothing/under/seromi/undercoat/jobs/viro +/obj/item/clothing/under/teshari/undercoat/jobs/viro name = "virologist undercoat" desc = "A traditional Teshari garb made for the Virologist" icon_state = "tesh_uniform_viro" item_state = "tesh_uniform_viro" -/obj/item/clothing/under/seromi/undercoat/jobs/psych +/obj/item/clothing/under/teshari/undercoat/jobs/psych name = "psychiatrist undercoat" desc = "A traditional Teshari garb made for the Psychiatrist" icon_state = "tesh_uniform_psych" item_state = "tesh_uniform_psych" -/obj/item/clothing/under/seromi/undercoat/jobs/para +/obj/item/clothing/under/teshari/undercoat/jobs/para name = "paramedic undercoat" desc = "A traditional Teshari garb made for the Paramedic" icon_state = "tesh_uniform_para" item_state = "tesh_uniform_para" -/obj/item/clothing/under/seromi/undercoat/jobs/sci +/obj/item/clothing/under/teshari/undercoat/jobs/sci name = "scientist undercoat" desc = "A traditional Teshari garb made for the Science department" icon_state = "tesh_uniform_sci" item_state = "tesh_uniform_sci" -/obj/item/clothing/under/seromi/undercoat/jobs/robo +/obj/item/clothing/under/teshari/undercoat/jobs/robo name = "roboticist undercoat" desc = "A traditional Teshari garb made for the Roboticist" icon_state = "tesh_uniform_robo" item_state = "tesh_uniform_robo" -/obj/item/clothing/under/seromi/undercoat/jobs/sec +/obj/item/clothing/under/teshari/undercoat/jobs/sec name = "security undercoat" desc = "A traditional Teshari garb made for the Security department" icon_state = "tesh_uniform_sec" item_state = "tesh_uniform_sec" -/obj/item/clothing/under/seromi/undercoat/jobs/service +/obj/item/clothing/under/teshari/undercoat/jobs/service name = "service undercoat" desc = "A traditional Teshari garb made for the Service department" icon_state = "tesh_uniform_serv" item_state = "tesh_uniform_serv" -/obj/item/clothing/under/seromi/undercoat/jobs/iaa +/obj/item/clothing/under/teshari/undercoat/jobs/iaa name = "internal affairs undercoat" desc = "A traditional Teshari garb made for the Internal Affairs Agent" icon_state = "tesh_uniform_iaa" diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index bfa684f4e61..8a9e0c2dda2 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -63,6 +63,7 @@ "Meetinghall" = new/datum/holodeck_program(/area/holodeck/source_meetinghall), "Courtroom" = new/datum/holodeck_program(/area/holodeck/source_courtroom, list('sound/music/traitor.ogg')), "Chessboard" = new/datum/holodeck_program(/area/holodeck/source_chess), + "Micro Building Area" = new/datum/holodeck_program(/area/holodeck/source_smoleworld), //VOREStation add "Turn Off" = new/datum/holodeck_program(/area/holodeck/source_plating, list()) ) diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index 0413fe50ac3..3d096c7c372 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -8,13 +8,11 @@ var/plantname var/potency = 1 -/obj/item/weapon/grown/New(newloc,planttype) +/obj/item/weapon/grown/Initialize(ml, planttype) - ..() + . = ..() - var/datum/reagents/R = new/datum/reagents(50) - reagents = R - R.my_atom = src + create_reagents(50) //Handle some post-spawn var stuff. if(planttype) diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 1ac742f2114..0e125bee745 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -224,6 +224,7 @@ var/global/list/ore_data = list() smelts_to = "titanium" result_amount = 5 spread_chance = 12 + alloy = 1 ore = /obj/item/weapon/ore/rutile scan_icon = "mineral_uncommon" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index bc7ab035ec7..c5fdbdf4241 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -121,7 +121,7 @@ // Unclear why this isn't being grabbed by appearance. if(ishuman(body)) var/mob/living/carbon/human/H = body - overlays = H.overlays_standing + add_overlay(H.overlays_standing) if(!T) T = pick(latejoin) //Safety in case we cannot find the body's position forceMove(T) @@ -915,4 +915,4 @@ mob/observer/dead/MayRespawn(var/feedback = 0) /mob/observer/dead/verb/respawn() set name = "Respawn" set category = "Ghost" - src.abandon_mob() \ No newline at end of file + src.abandon_mob() diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index f995e2f4d90..22e57ff15ed 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -11,7 +11,7 @@ var/list/holder_mob_icon_cache = list() show_messages = 1 sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/head.dmi', SPECIES_VOX = 'icons/mob/species/vox/head.dmi' ) diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index b895ccfdbc9..32c579f82d0 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -187,7 +187,7 @@ else return pick(ai_names) -/datum/language/seromi +/datum/language/teshari name = LANGUAGE_SCHECHI desc = "A trilling language spoken by the diminutive Teshari." speech_verb = "chirps" @@ -203,7 +203,7 @@ "ci", "ri", "mi", "si", "ni", "ti", "li", "shi", "schi", "i", "i" ) -/datum/language/seromi/get_random_name(gender) +/datum/language/teshari/get_random_name(gender) return ..(gender, 2, 4, 1.5) diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 5775d3b5968..66745ca9169 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -155,7 +155,7 @@ flags = 0 /datum/language/skrell flags = 0 -/datum/language/seromi +/datum/language/teshari flags = 0 /datum/language/zaddat flags = 0 diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 435ca993546..6795d670647 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -189,6 +189,9 @@ //VOREStation Add - NIF Support if(nif) compiled_vis |= nif.planes_visible() + //event hud + if(vantag_hud) + compiled_vis |= VIS_CH_VANTAG //VOREStation Add End if(!compiled_vis.len && !vis_enabled.len) diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 3b155a08ee7..f87f0de9dd7 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -310,8 +310,8 @@ /datum/species/teshari mob_size = MOB_MEDIUM //To allow normal mob swapping spawn_flags = SPECIES_CAN_JOIN - icobase = 'icons/mob/human_races/r_seromi_vr.dmi' - deform = 'icons/mob/human_races/r_seromi_vr.dmi' + icobase = 'icons/mob/human_races/r_teshari_vr.dmi' + deform = 'icons/mob/human_races/r_teshari_vr.dmi' icobase_tail = 1 color_mult = 1 min_age = 18 diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm similarity index 92% rename from code/modules/mob/living/carbon/human/species/station/seromi.dm rename to code/modules/mob/living/carbon/human/species/station/teshari.dm index 135c8f30ca3..3686ef72555 100644 --- a/code/modules/mob/living/carbon/human/species/station/seromi.dm +++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm @@ -33,12 +33,12 @@ move_trail = /obj/effect/decal/cleanable/blood/tracks/paw - icobase = 'icons/mob/human_races/r_seromi.dmi' - deform = 'icons/mob/human_races/r_seromi.dmi' - damage_overlays = 'icons/mob/human_races/masks/dam_seromi.dmi' - damage_mask = 'icons/mob/human_races/masks/dam_mask_seromi.dmi' - blood_mask = 'icons/mob/human_races/masks/blood_seromi.dmi' - suit_storage_icon = 'icons/mob/species/seromi/belt_mirror.dmi' + icobase = 'icons/mob/human_races/r_teshari.dmi' + deform = 'icons/mob/human_races/r_teshari.dmi' + damage_overlays = 'icons/mob/human_races/masks/dam_teshari.dmi' + damage_mask = 'icons/mob/human_races/masks/dam_mask_teshari.dmi' + blood_mask = 'icons/mob/human_races/masks/blood_teshari.dmi' + suit_storage_icon = 'icons/mob/species/teshari/belt_mirror.dmi' fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying. @@ -102,15 +102,15 @@ has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), BP_GROIN = list("path" = /obj/item/organ/external/groin), - BP_HEAD = list("path" = /obj/item/organ/external/head/seromi), + BP_HEAD = list("path" = /obj/item/organ/external/head/teshari), BP_L_ARM = list("path" = /obj/item/organ/external/arm), BP_R_ARM = list("path" = /obj/item/organ/external/arm/right), BP_L_LEG = list("path" = /obj/item/organ/external/leg), BP_R_LEG = list("path" = /obj/item/organ/external/leg/right), - BP_L_HAND = list("path" = /obj/item/organ/external/hand/seromi), - BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/seromi), - BP_L_FOOT = list("path" = /obj/item/organ/external/foot/seromi), - BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/seromi) + BP_L_HAND = list("path" = /obj/item/organ/external/hand/teshari), + BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/teshari), + BP_L_FOOT = list("path" = /obj/item/organ/external/foot/teshari), + BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/teshari) ) has_organ = list( diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm index abf287c0fb9..43210407bc1 100644 --- a/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm +++ b/code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm @@ -83,21 +83,21 @@ /datum/species/shapeshifter/promethean/avatar/teshari name = "Virtual Reality Teshari" - icobase = 'icons/mob/human_races/r_seromi.dmi' - deform = 'icons/mob/human_races/r_seromi.dmi' + icobase = 'icons/mob/human_races/r_teshari.dmi' + deform = 'icons/mob/human_races/r_teshari.dmi' appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), BP_GROIN = list("path" = /obj/item/organ/external/groin), - BP_HEAD = list("path" = /obj/item/organ/external/head/seromi), + BP_HEAD = list("path" = /obj/item/organ/external/head/teshari), BP_L_ARM = list("path" = /obj/item/organ/external/arm), BP_R_ARM = list("path" = /obj/item/organ/external/arm/right), BP_L_LEG = list("path" = /obj/item/organ/external/leg), BP_R_LEG = list("path" = /obj/item/organ/external/leg/right), - BP_L_HAND = list("path" = /obj/item/organ/external/hand/seromi), - BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/seromi), - BP_L_FOOT = list("path" = /obj/item/organ/external/foot/seromi), - BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/seromi) + BP_L_HAND = list("path" = /obj/item/organ/external/hand/teshari), + BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/teshari), + BP_L_FOOT = list("path" = /obj/item/organ/external/foot/teshari), + BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/teshari) ) /datum/species/shapeshifter/promethean/avatar/diona diff --git a/code/modules/mob/mob_helpers_vr.dm b/code/modules/mob/mob_helpers_vr.dm new file mode 100644 index 00000000000..f16a204153d --- /dev/null +++ b/code/modules/mob/mob_helpers_vr.dm @@ -0,0 +1,14 @@ +/mob/recalculate_vis() + . = ..() + if(!plane_holder || !vis_enabled) + return + + if(vantag_hud) + if(!(VIS_CH_VANTAG in vis_enabled)) + plane_holder.set_vis(VIS_CH_VANTAG,TRUE) + vis_enabled += VIS_CH_VANTAG + else + if(VIS_CH_VANTAG in vis_enabled) + plane_holder.set_vis(VIS_CH_VANTAG,FALSE) + vis_enabled -= VIS_CH_VANTAG + return diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm index fd23037699d..f69ec4a5748 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -97,6 +97,11 @@ icon_state = "eyes_sergal" body_parts = list(BP_HEAD) +/datum/sprite_accessory/marking/vr/closedeyes + name = "Closed Eyes" + icon_state = "eyes_closed" + body_parts = list(BP_HEAD) + /datum/sprite_accessory/marking/vr/brows name = "Eyebrows" icon_state = "brows" diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 012591a8953..0b8d75b84e3 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -503,16 +503,16 @@ desc = "" icon_state = "chimptail_s" -/datum/sprite_accessory/tail/special/seromitail - name = "seromi tail" +/datum/sprite_accessory/tail/special/tesharitail + name = "teshari tail" desc = "" icon_state = "seromitail_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) -/datum/sprite_accessory/tail/special/seromitailfeathered - name = "seromi tail w/ feathers" +/datum/sprite_accessory/tail/special/tesharitailfeathered + name = "teshari tail w/ feathers" desc = "" icon_state = "seromitail_s" extra_overlay = "seromitail_feathers_s" @@ -607,15 +607,15 @@ icon_state = "chimptail_hc_s" do_colouration = 1 -/datum/sprite_accessory/tail/special/seromitailhc - name = "seromi tail, colorable" +/datum/sprite_accessory/tail/special/tesharitailhc + name = "teshari tail, colorable" desc = "" icon_state = "seromitail_hc_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY -/datum/sprite_accessory/tail/special/seromitailfeatheredhc - name = "seromi tail w/ feathers, colorable" +/datum/sprite_accessory/tail/special/tesharitailfeatheredhc + name = "teshari tail w/ feathers, colorable" desc = "" icon_state = "seromitail_feathers_hc_s" do_colouration = 1 diff --git a/code/modules/organs/robolimbs_custom.dm b/code/modules/organs/robolimbs_custom.dm index 727db0927a4..ba9704ffae5 100644 --- a/code/modules/organs/robolimbs_custom.dm +++ b/code/modules/organs/robolimbs_custom.dm @@ -164,7 +164,7 @@ VS Edit - anyone can select these. */ icon = 'icons/mob/human_races/cyberlimbs/DSITeshari/dsi_teshari.dmi' lifelike = 1 skin_tone = 1 - suggested_species = "Teshari" + suggested_species = SPECIES_TESHARI /datum/robolimb/dsi_teshari/New() species_cannot_use = GLOB.all_species.Copy() diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 9e465ce8bac..bad69a23808 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -390,7 +390,7 @@ /obj/item/organ/external/head/skrell eye_icon = "skrell_eyes_s" -/obj/item/organ/external/head/seromi +/obj/item/organ/external/head/teshari eye_icon = "eyes_seromi" /obj/item/organ/external/head/no_eyes diff --git a/code/modules/organs/subtypes/teshari.dm b/code/modules/organs/subtypes/teshari.dm new file mode 100644 index 00000000000..00f673482c9 --- /dev/null +++ b/code/modules/organs/subtypes/teshari.dm @@ -0,0 +1,8 @@ +/obj/item/organ/external/foot/teshari + body_hair = "feathers" +/obj/item/organ/external/foot/right/teshari + body_hair = "feathers" +/obj/item/organ/external/hand/teshari + body_hair = "feathers" +/obj/item/organ/external/hand/right/teshari + body_hair = "feathers" diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index f05a1056fde..298e8efd135 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -11,7 +11,7 @@ var/global/list/obj/item/device/pda/PDAs = list() item_state = "electronic" w_class = ITEMSIZE_SMALL slot_flags = SLOT_ID | SLOT_BELT - sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/id.dmi') + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/id.dmi') //Main variables var/pdachoice = 1 @@ -139,8 +139,8 @@ var/global/list/obj/item/device/pda/PDAs = list() desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a wrist-bound version." slot_flags = SLOT_ID | SLOT_BELT | SLOT_GLOVES sprite_sheets = list( - SPECIES_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', - SPECIES_VR_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + SPECIES_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi', + SPECIES_VR_TESHARI = 'icons/mob/species/teshari/pda_wrist.dmi', ) else icon = 'icons/obj/pda_old.dmi' diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index b3ff9c28371..593a54e52ee 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -670,6 +670,9 @@ to_chat(src, "You can taste the flavor of really bad ideas.") else if(istype(I,/obj/item/toy)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") + else if(istype(I,/obj/item/weapon/bikehorn/tinytether)) + to_chat(src, "You feel a rush of power swallowing such a large, err, tiny structure.") + visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") else if(istype(I,/obj/item/device/paicard) || istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") to_chat(src, "You can taste the sweet flavor of digital friendship. Or maybe it is something else.") diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 78af3b90441..2c3ac9641b4 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1716,7 +1716,7 @@ Departamental Swimsuits, for general use item_state = "latexmaid_mob" sprite_sheets = list( - "Teshari" = 'icons/vore/custom_clothes_tesh_vr.dmi' + SPECIES_TESHARI = 'icons/vore/custom_clothes_tesh_vr.dmi' ) body_parts_covered = UPPER_TORSO|LOWER_TORSO diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 4c62ff40955..89d8e3ed1ad 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -799,16 +799,6 @@ desc = "A primarily blue ID with a holographic 'WAH' etched onto its back. The letters do not obscure anything important on the card. It is shiny and it feels very bumpy." title_strings = list("Amaya Rahl's Wah-identification card", "Amaya Rahl's Wah-ID card") -//verysoft:Harmony - Custom ID (pilot) -/obj/item/weapon/card/id/event/fluff/harmony - registered_name = "CONFIGURE ME" - assignment = "CONFIGURE ME" - icon = 'icons/obj/card_vr.dmi' - base_icon = 'icons/obj/card_vr.dmi' - icon_state = "itg" - desc = "A small card designating affiliation with the Ironcrest Transport Group. It has a NanoTrasen insignia and a lot of very small print on the back to do with practices and regulations for contractors to use." - title_strings = list("Harmony's ITG-ID card") - //General use, Verk felt like sharing. /obj/item/clothing/glasses/fluff/science_proper name = "Aesthetic Science Goggles" diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm new file mode 100644 index 00000000000..5e84d7cbd1f --- /dev/null +++ b/code/modules/vore/smoleworld/smoleworld_vr.dm @@ -0,0 +1,405 @@ +// future to do list for anyone who wants to try: +//Make building turf enterable for small people. +//Make buildings enterable then bustable from the inside. +//Tiny cars drivable only by small people, wheel chair code. +//Add details to planet foods as well as diversify options for cargo ordering. +//make water turfs stomp and apply to player sprites. + + +//turf items + +/turf/simulated/floor/smole + name = "toy floor" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "megablocksturf" + var/list/crossed_dirs = list() + +/turf/simulated/floor/smole/Entered(atom/A) + if(isliving(A)) + var/mob/living/L = A + if(L.hovering) // Flying things shouldn't make footprints. + return ..() + if(L.get_effective_size() <= RESIZE_NORMAL) + return ..() + if(L.get_effective_size() >= RESIZE_A_BIGNORMAL) + playsound(src, 'sound/effects/footstep/giantstep_gigga.ogg', 35, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) + var/mdir = "[A.dir]" + crossed_dirs[mdir] = 1 + update_icon() + . = ..() + +/turf/simulated/floor/smole/update_icon() + ..() + for(var/d in crossed_dirs) + add_overlay(image(icon = 'icons/vore/smoleworld_vr.dmi', icon_state = "stomp", dir = text2num(d))) + +//Extra micro turfs +/turf/simulated/floor/smole/grass + name = "grass" + icon_state = "grass0" + initial_flooring = /decl/flooring/grass/outdoors + +/turf/simulated/floor/smole/desert + icon = 'icons/turf/desert.dmi' + icon_state = "desert" + initial_flooring = /decl/flooring/sand/desert + +/turf/simulated/floor/smole/megablocks + name = "block floor" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "megablocksturf" + +//Used to make smole objects be able to be built from menu + +/datum/material/smolebricks/generate_recipes() + recipes = list() + recipes += new/datum/stack_recipe("road straight", /obj/structure/smoletrack/roadS, 1, time = 5) + recipes += new/datum/stack_recipe("road threeway", /obj/structure/smoletrack/roadT, 1, time = 5) + recipes += new/datum/stack_recipe("road turn ", /obj/structure/smoletrack/roadturn, 1, time = 5) + recipes += new/datum/stack_recipe("road fourway", /obj/structure/smoletrack/roadF, 1, time = 5) + recipes += new/datum/stack_recipe("smole houses", /obj/structure/smolebuilding/houses, 2, time = 10) + recipes += new/datum/stack_recipe("smole business", /obj/structure/smolebuilding/business, 2, time = 10) + recipes += new/datum/stack_recipe("smole warehouses", /obj/structure/smolebuilding/warehouses, 2, time = 10) + recipes += new/datum/stack_recipe("smole musem", /obj/structure/smolebuilding/musem, 2, time = 10) + +/datum/material/smolebricks + name = "smolebricks" + stack_type = /obj/item/stack/material/smolebricks + icon_base = "solid" + icon_reinf = "reinf_over" + destruction_desc = "smashed" + sheet_singular_name = "bag" + sheet_plural_name = "bags" + +//the actual materials + +/obj/item/stack/material/smolebricks + name = "smolebricks" + desc = "A collection of tiny colored bricks ready to be built into whatever you want." + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "smolematerial" + drop_sound = 'sound/items/drop/smolematerial.ogg' + pickup_sound = 'sound/items/pickup/pillbottle.ogg' + default_type = "smolebricks" + w_class = ITEMSIZE_SMALL + +//smolebrick case to make for easy bricks. +/obj/item/weapon/storage/smolebrickcase + name = "smolebrick case" + desc = "you feel the power of imagination." + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "smolestorage" + throw_speed = 1 + throw_range = 4 + w_class = ITEMSIZE_LARGE + max_w_class = ITEMSIZE_NORMAL + max_storage_space = ITEMSIZE_COST_SMALL * 7 // most code copied from toolbox + use_sound = 'sound/items/storage/smolecase.ogg' + drop_sound = 'sound/items/drop/device.ogg' + pickup_sound = 'sound/items/pickup/device.ogg' + starts_with = list( /obj/item/stack/material/smolebricks, + /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, + /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, + /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks, /obj/item/stack/material/smolebricks + ) + +//Track code +//defineing actions +/obj/structure/smoletrack + icon = 'icons/vore/smoleworld_vr.dmi' + density = 0 + +/obj/structure/smoletrack/attack_hand(mob/user) + if(user.a_intent == I_DISARM) + if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) + return + to_chat(user, "[src] was dismantaled into bricks.") + playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) + var/turf/simulated/floor/F = get_turf(src) + if(istype(F)) + new /obj/item/stack/material/smolebricks(F) + qdel(src) + +/obj/structure/smoletrack/verb/rotate_clockwise() + set name = "Rotate Road Clockwise" + set category = "Object" + set src in oview(1) + if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) + return + src.set_dir(turn(src.dir, 270)) + +// Road pieces + +/obj/structure/smoletrack/roadS + name = "road straight piece" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "carstraight" + desc = "A long set of tiny road." + anchored = 1 + +/obj/structure/smoletrack/roadT + name = "road threeway piece" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "carthreeway" + desc = "A tiny threeway road piece." + anchored = 1 + +/obj/structure/smoletrack/roadturn + name = "road turn piece" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "carturn" + desc = "A tiny turn road piece." + anchored = 1 + +/obj/structure/smoletrack/roadF + name = "road fourway piece" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "carfourway" + desc = "A fourway road piece." + anchored = 1 + +//buildings code +//Defining building actions +/obj/structure/smolebuilding + icon = 'icons/vore/smoleworld_vr.dmi' + density = 1 + anchored = 1 + var/health = 75 + var/damage +//makes it so buildings can be dismaintaled or GodZilla style attacked +/obj/structure/smolebuilding/attack_hand(mob/user) + if(user.a_intent == I_DISARM) + if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) + return + to_chat(user, "[src] was dismantaled into bricks.") + playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) + if(!isnull(loc)) + new /obj/item/stack/material/smolebricks(loc) + new /obj/item/stack/material/smolebricks(loc) + qdel(src) + + else if (usr.a_intent == I_HURT) + + if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) + return + + take_damage() + playsound(src, 'sound/items/smolebuildinghit2.ogg', 50, 1) + user.do_attack_animation(src) + usr.visible_message("\The [usr] bangs against \the [src]!", + "You bang against \the [src]!", + "You hear a banging sound.") + else + usr.visible_message("[usr.name] knocks on the [src.name].", + "You knock on the [src.name].") + return + +//takes 3 normal attacks +/obj/structure/smolebuilding/take_damage() + damage = 25 + health = health - damage + + if(health <= 0) + dismantle() + else + return + return +//results of attacks will remove building and spawn in ruins. +/obj/structure/smolebuilding/proc/dismantle() + visible_message("\The [src] falls apart!") + playsound(src, 'sound/items/smolebuildingdestoryed.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) + new /obj/structure/smoleruins(loc) + qdel(src) + return + +//checks for items and does the same as dismaintle but spawns material instead. +/obj/structure/smolebuilding/attackby(obj/item/weapon/W as obj, mob/user as mob) + dismantle() + return +//checks for projectile damage and does the same as dismaintle but spawns material instead. +/obj/structure/smolebuilding/bullet_act(var/obj/item/projectile/Proj) + displode() + return +//is the same as dismaintal but instead of ruins it just makes it all explode +/obj/structure/smolebuilding/proc/displode() + visible_message("\The [src] explodes into pieces!") + playsound(src, 'sound/items/smolebuildingdestoryedshort.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) + new /obj/item/stack/material/smolebricks(loc) + new /obj/item/stack/material/smolebricks(loc) + qdel(src) + return + +//get material from ruins +/obj/structure/smoleruins/attack_hand(mob/user) + if(user.a_intent == I_DISARM) + if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction)) + return + to_chat(user, "[src] was dismantaled into bricks.") + playsound(src, 'sound/items/smolelargeunbuild.ogg', 50, 1, volume_channel = VOLUME_CHANNEL_MASTER) + if(!isnull(loc)) + new /obj/item/stack/material/smolebricks(loc) + new /obj/item/stack/material/smolebricks(loc) + qdel(src) + +//Ruins go asplode same as buildings if attacked +/obj/structure/smoleruins/attackby(obj/item/weapon/W as obj, mob/user as mob) + displode() + return + +/obj/structure/smoleruins/bullet_act(var/obj/item/projectile/Proj) + displode() + return + +/obj/structure/smoleruins/proc/displode() + visible_message("\The [src] explodes into pieces!") + playsound(src, 'sound/items/smolebuildingdestoryedshort.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER) + new /obj/item/stack/material/smolebricks(loc) + new /obj/item/stack/material/smolebricks(loc) + qdel(src) + return + +//buildings +/obj/structure/smoleruins + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "ruins" + density = 0 + +/obj/structure/smolebuilding/houses + name = "smole houses" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "smolehouses" + +/obj/structure/smolebuilding/business + name = "smole business" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "smolebusiness" + +/obj/structure/smolebuilding/warehouses + name = "smole warehouses" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "smolewarehouses" + +/obj/structure/smolebuilding/musem + name = "smole musem" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "smolemusem" +// +//CAR STUFF < WILL BE MESSED WITH IN A LATER UPDATE COMMENTED OUT FOR NOW +///obj/item/smolecar +// name = "toy car" +// desc = "A toy car ready to be snapped together and burn rubber!" +// icon = 'icons/vore/smoleworld_vr.dmi' +// icon_state = "smolecarA_folded" +// item_state = "smolecarA" +// unfolded_type = /obj/structure/bed/chair/wheelchair/smolecar +// +///obj/structure/smolecar +// name = "Toy Car" +// desc = "Lets burn rubber!" +// icon = 'icons/vore/smoleworld_vr.dmi' +// icon_state = "smolecarA" +// anchored = 0 +// buckle_movable = 1 +// var/carry_type = /obj/item/smolecar +// +///obj/structure/bed/chair/wheelchair/smolecar/can_buckle_check(mob/living/M, forced = FALSE) +// . = ..() +// if(.) +// +// if(M.get_effective_size() > RESIZE_TINY) +// to_chat(M, SPAN_WARNING("You are to big to fit in \the [src].")) + // . = FALSE +// +// +//snack planets, currently just plopped out will be organized later. +/obj/item/trash/Asteroidsmall + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_asteriodB" + name = "asteriod" + desc = "A solid chunk of candy crumb that looks like a asteriod." + +/obj/item/trash/Asteroidlarge + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_asteriodA" + name = "asteriod" + desc = "A solid chunk of candy crumb that looks like a asteriod." + +/obj/item/trash/Asteroidmulti + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_asteriodC" + name = "asteriod" + desc = "Several chunks of sugar crumbs that looks like asteriods." + +/obj/item/weapon/bikehorn/tinytether + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "tether_trash" + name = "tether" + desc = "Its a tiny bit of plastic in the shape of the tether. There seems to be a small button on top." + +/obj/item/weapon/bikehorn/tinytether/attack_self(mob/user as mob) + if(spam_flag == 0) + spam_flag = 1 + playsound(src, 'sound/items/tinytether.ogg', 30, 1, volume_channel = VOLUME_CHANNEL_MASTER) + src.add_fingerprint(user) + spawn(20) + spam_flag = 0 + return + +/obj/item/weapon/reagent_containers/food/snacks/snackplanet/moon + name = "moon" + desc = "A firm solid mass of white powdery sugar in the shape of a moon!" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_moon" + bitesize = 1 + trash = /obj/item/trash/Asteroidsmall + nutriment_amt = 2 + nutriment_desc = list("sugar" = 2) + drop_sound = 'sound/items/drop/basketball.ogg' + +/obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgo3b + name = "virgo3bB" + desc = "A sticky jelly jaw breaker in the shape of Virgo3B, it even has a tiny tether!" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_Virgo3B" + bitesize = 3 + trash = /obj/item/weapon/bikehorn/tinytether + nutriment_amt = 2 + nutriment_desc = list("spicy" = 2, "tang" = 2) + drop_sound = 'sound/items/drop/basketball.ogg' + +/obj/item/weapon/reagent_containers/food/snacks/snackplanet/phoron + name = "phoron giant" + desc = "A spicy jaw breaker that seems to swirl in the light." + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_phoron" + bitesize = 3 + trash = /obj/item/trash/Asteroidmulti + nutriment_amt = 2 + nutriment_desc = list("spicy" = 2) + drop_sound = 'sound/items/drop/basketball.ogg' + +/obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgoprime + name = "virgo prime" + desc = "Its a orange jaw breaker in the shape Virgo Prime!" + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_virgoprime" + bitesize = 3 + trash = /obj/item/trash/Asteroidmulti + nutriment_amt = 2 + nutriment_desc = list("salty" = 2) + drop_sound = 'sound/items/drop/basketball.ogg' + +/obj/item/weapon/storage/bagoplanets + name = "bag o' planets" + desc = "A cosmic bag of fist sized candy planets." + icon = 'icons/vore/smoleworld_vr.dmi' + icon_state = "sp_storage" + w_class = ITEMSIZE_LARGE + max_w_class = ITEMSIZE_NORMAL + max_storage_space = ITEMSIZE_COST_SMALL * 7 // most code copied from toolbox + drop_sound = 'sound/items/drop/food.ogg' + pickup_sound = 'sound/items/pickup/food.ogg' + starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/snackplanet/phoron, + /obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgo3b,/obj/item/weapon/reagent_containers/food/snacks/snackplanet/moon, + /obj/item/weapon/reagent_containers/food/snacks/snackplanet/virgoprime + ) diff --git a/code/unit_tests/integrated_circuits/prefabs.dm b/code/unit_tests/integrated_circuits/prefabs.dm index 056c0d15684..04b31366406 100644 --- a/code/unit_tests/integrated_circuits/prefabs.dm +++ b/code/unit_tests/integrated_circuits/prefabs.dm @@ -3,8 +3,9 @@ /datum/unit_test/integrated_circuit_prefabs_shall_respect_complexity_and_size_contraints/start_test() var/list/failed_prefabs = list() - for(var/prefab_type in subtypesof(/decl/prefab/ic_assembly)) - var/decl/prefab/ic_assembly/prefab = decls_repository.get_decl(prefab_type) + var/list/prefab_types = decls_repository.get_decls_of_subtype(/decl/prefab/ic_assembly) + for(var/prefab_type in prefab_types) + var/decl/prefab/ic_assembly/prefab = prefab_types[prefab_type] var/obj/item/device/electronic_assembly/assembly = prefab.assembly_type var/available_size = initial(assembly.max_components) @@ -33,9 +34,9 @@ /datum/unit_test/integrated_circuit_prefabs_shall_not_fail_to_create/start_test() var/list/failed_prefabs = list() - for(var/prefab_type in subtypesof(/decl/prefab/ic_assembly)) - var/decl/prefab/ic_assembly/prefab = decls_repository.get_decl(prefab_type) - + var/list/prefab_types = decls_repository.get_decls_of_subtype(/decl/prefab/ic_assembly) + for(var/prefab_type in prefab_types) + var/decl/prefab/ic_assembly/prefab = prefab_types[prefab_type] try var/built_item = prefab.create(get_standard_turf()) if(built_item) diff --git a/icons/mob/human_races/masks/blood_seromi.dmi b/icons/mob/human_races/masks/blood_teshari.dmi similarity index 100% rename from icons/mob/human_races/masks/blood_seromi.dmi rename to icons/mob/human_races/masks/blood_teshari.dmi diff --git a/icons/mob/human_races/masks/dam_mask_seromi.dmi b/icons/mob/human_races/masks/dam_mask_teshari.dmi similarity index 100% rename from icons/mob/human_races/masks/dam_mask_seromi.dmi rename to icons/mob/human_races/masks/dam_mask_teshari.dmi diff --git a/icons/mob/human_races/masks/dam_seromi.dmi b/icons/mob/human_races/masks/dam_teshari.dmi similarity index 100% rename from icons/mob/human_races/masks/dam_seromi.dmi rename to icons/mob/human_races/masks/dam_teshari.dmi diff --git a/icons/mob/human_races/r_seromi.dmi b/icons/mob/human_races/r_teshari.dmi similarity index 100% rename from icons/mob/human_races/r_seromi.dmi rename to icons/mob/human_races/r_teshari.dmi diff --git a/icons/mob/human_races/r_seromi_vr.dmi b/icons/mob/human_races/r_teshari_vr.dmi similarity index 100% rename from icons/mob/human_races/r_seromi_vr.dmi rename to icons/mob/human_races/r_teshari_vr.dmi diff --git a/icons/mob/species/seromi/back.dmi b/icons/mob/species/teshari/back.dmi similarity index 100% rename from icons/mob/species/seromi/back.dmi rename to icons/mob/species/teshari/back.dmi diff --git a/icons/mob/species/seromi/belt.dmi b/icons/mob/species/teshari/belt.dmi similarity index 100% rename from icons/mob/species/seromi/belt.dmi rename to icons/mob/species/teshari/belt.dmi diff --git a/icons/mob/species/seromi/belt_mirror.dmi b/icons/mob/species/teshari/belt_mirror.dmi similarity index 100% rename from icons/mob/species/seromi/belt_mirror.dmi rename to icons/mob/species/teshari/belt_mirror.dmi diff --git a/icons/mob/species/seromi/deptcloak.dmi b/icons/mob/species/teshari/deptcloak.dmi similarity index 100% rename from icons/mob/species/seromi/deptcloak.dmi rename to icons/mob/species/teshari/deptcloak.dmi diff --git a/icons/mob/species/seromi/deptjacket.dmi b/icons/mob/species/teshari/deptjacket.dmi similarity index 100% rename from icons/mob/species/seromi/deptjacket.dmi rename to icons/mob/species/teshari/deptjacket.dmi diff --git a/icons/mob/species/seromi/ears.dmi b/icons/mob/species/teshari/ears.dmi similarity index 100% rename from icons/mob/species/seromi/ears.dmi rename to icons/mob/species/teshari/ears.dmi diff --git a/icons/mob/species/seromi/eyes.dmi b/icons/mob/species/teshari/eyes.dmi similarity index 100% rename from icons/mob/species/seromi/eyes.dmi rename to icons/mob/species/teshari/eyes.dmi diff --git a/icons/mob/species/seromi/gloves.dmi b/icons/mob/species/teshari/gloves.dmi similarity index 100% rename from icons/mob/species/seromi/gloves.dmi rename to icons/mob/species/teshari/gloves.dmi diff --git a/icons/mob/species/seromi/handcuffs.dmi b/icons/mob/species/teshari/handcuffs.dmi similarity index 100% rename from icons/mob/species/seromi/handcuffs.dmi rename to icons/mob/species/teshari/handcuffs.dmi diff --git a/icons/mob/species/seromi/head.dmi b/icons/mob/species/teshari/head.dmi similarity index 100% rename from icons/mob/species/seromi/head.dmi rename to icons/mob/species/teshari/head.dmi diff --git a/icons/mob/species/seromi/helmet_vr.dmi b/icons/mob/species/teshari/helmet_vr.dmi similarity index 100% rename from icons/mob/species/seromi/helmet_vr.dmi rename to icons/mob/species/teshari/helmet_vr.dmi diff --git a/icons/mob/species/seromi/id.dmi b/icons/mob/species/teshari/id.dmi similarity index 100% rename from icons/mob/species/seromi/id.dmi rename to icons/mob/species/teshari/id.dmi diff --git a/icons/mob/species/seromi/masks.dmi b/icons/mob/species/teshari/masks.dmi similarity index 100% rename from icons/mob/species/seromi/masks.dmi rename to icons/mob/species/teshari/masks.dmi diff --git a/icons/mob/species/seromi/masks_vr.dmi b/icons/mob/species/teshari/masks_vr.dmi similarity index 100% rename from icons/mob/species/seromi/masks_vr.dmi rename to icons/mob/species/teshari/masks_vr.dmi diff --git a/icons/mob/species/seromi/pda_wrist.dmi b/icons/mob/species/teshari/pda_wrist.dmi similarity index 100% rename from icons/mob/species/seromi/pda_wrist.dmi rename to icons/mob/species/teshari/pda_wrist.dmi diff --git a/icons/mob/species/seromi/pilot_helmet.dmi b/icons/mob/species/teshari/pilot_helmet.dmi similarity index 100% rename from icons/mob/species/seromi/pilot_helmet.dmi rename to icons/mob/species/teshari/pilot_helmet.dmi diff --git a/icons/mob/species/seromi/shoes.dmi b/icons/mob/species/teshari/shoes.dmi similarity index 100% rename from icons/mob/species/seromi/shoes.dmi rename to icons/mob/species/teshari/shoes.dmi diff --git a/icons/mob/species/seromi/suit.dmi b/icons/mob/species/teshari/suit.dmi similarity index 100% rename from icons/mob/species/seromi/suit.dmi rename to icons/mob/species/teshari/suit.dmi diff --git a/icons/mob/species/seromi/suit_vr.dmi b/icons/mob/species/teshari/suit_vr.dmi similarity index 100% rename from icons/mob/species/seromi/suit_vr.dmi rename to icons/mob/species/teshari/suit_vr.dmi diff --git a/icons/mob/species/seromi/teshari_cloak.dmi b/icons/mob/species/teshari/teshari_cloak.dmi similarity index 100% rename from icons/mob/species/seromi/teshari_cloak.dmi rename to icons/mob/species/teshari/teshari_cloak.dmi diff --git a/icons/mob/species/seromi/teshari_hood.dmi b/icons/mob/species/teshari/teshari_hood.dmi similarity index 100% rename from icons/mob/species/seromi/teshari_hood.dmi rename to icons/mob/species/teshari/teshari_hood.dmi diff --git a/icons/mob/species/seromi/teshari_uniform.dmi b/icons/mob/species/teshari/teshari_uniform.dmi similarity index 100% rename from icons/mob/species/seromi/teshari_uniform.dmi rename to icons/mob/species/teshari/teshari_uniform.dmi diff --git a/icons/mob/species/seromi/ties.dmi b/icons/mob/species/teshari/ties.dmi similarity index 100% rename from icons/mob/species/seromi/ties.dmi rename to icons/mob/species/teshari/ties.dmi diff --git a/icons/mob/species/seromi/ties_vr.dmi b/icons/mob/species/teshari/ties_vr.dmi similarity index 100% rename from icons/mob/species/seromi/ties_vr.dmi rename to icons/mob/species/teshari/ties_vr.dmi diff --git a/icons/mob/species/seromi/uniform.dmi b/icons/mob/species/teshari/uniform.dmi similarity index 100% rename from icons/mob/species/seromi/uniform.dmi rename to icons/mob/species/teshari/uniform.dmi diff --git a/icons/obj/card_alt_vr.dmi b/icons/obj/card_alt_vr.dmi index 3f9a1404a27..a82caf9bc4e 100644 Binary files a/icons/obj/card_alt_vr.dmi and b/icons/obj/card_alt_vr.dmi differ diff --git a/icons/obj/clothing/species/seromi/hats.dmi b/icons/obj/clothing/species/teshari/hats.dmi similarity index 100% rename from icons/obj/clothing/species/seromi/hats.dmi rename to icons/obj/clothing/species/teshari/hats.dmi diff --git a/icons/obj/clothing/species/seromi/suits.dmi b/icons/obj/clothing/species/teshari/suits.dmi similarity index 100% rename from icons/obj/clothing/species/seromi/suits.dmi rename to icons/obj/clothing/species/teshari/suits.dmi diff --git a/icons/obj/clothing/species/seromi/uniform.dmi b/icons/obj/clothing/species/teshari/uniform.dmi similarity index 100% rename from icons/obj/clothing/species/seromi/uniform.dmi rename to icons/obj/clothing/species/teshari/uniform.dmi diff --git a/icons/vore/smoleworld_vr.dmi b/icons/vore/smoleworld_vr.dmi new file mode 100644 index 00000000000..206c0cef32c Binary files /dev/null and b/icons/vore/smoleworld_vr.dmi differ diff --git a/maps/southern_cross/items/clothing/sc_accessory.dm b/maps/southern_cross/items/clothing/sc_accessory.dm index 67dd36ec891..66d977ffc2e 100644 --- a/maps/southern_cross/items/clothing/sc_accessory.dm +++ b/maps/southern_cross/items/clothing/sc_accessory.dm @@ -10,5 +10,5 @@ desc = "Sturdy mess of black synthcotton belts and buckles." icon_state = "pilot_webbing2" sprite_sheets = list( - "Teshari" = 'icons/mob/species/seromi/ties.dmi' - ) \ No newline at end of file + SPECIES_TESHARI = 'icons/mob/species/teshari/ties.dmi' + ) \ No newline at end of file diff --git a/maps/southern_cross/items/clothing/sc_suit.dm b/maps/southern_cross/items/clothing/sc_suit.dm index 204db3afd19..2b15324f4d1 100644 --- a/maps/southern_cross/items/clothing/sc_suit.dm +++ b/maps/southern_cross/items/clothing/sc_suit.dm @@ -8,8 +8,8 @@ item_state_slots = list(slot_r_hand_str = "brown_jacket", slot_l_hand_str = "brown_jacket") icon = 'maps/southern_cross/icons/obj/sc_suit.dmi' sprite_sheets = list( - "Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_suit.dmi' - ) + SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_suit.dmi' + ) min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE //Misc diff --git a/maps/southern_cross/items/clothing/sc_under.dm b/maps/southern_cross/items/clothing/sc_under.dm index 3f7f7eb1a8c..ea024abe7ae 100644 --- a/maps/southern_cross/items/clothing/sc_under.dm +++ b/maps/southern_cross/items/clothing/sc_under.dm @@ -8,8 +8,8 @@ item_icons = list(slot_w_uniform_str = 'maps/southern_cross/icons/mob/sc_under.dmi') icon = 'maps/southern_cross/icons/obj/sc_uniforms.dmi' sprite_sheets = list( - "Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' - ) + SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' + ) starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1) /obj/item/clothing/under/rank/pilot1/no_webbing @@ -25,8 +25,8 @@ item_icons = list(slot_w_uniform_str = 'maps/southern_cross/icons/mob/sc_under.dmi') icon = 'maps/southern_cross/icons/obj/sc_uniforms.dmi' sprite_sheets = list( - "Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' - ) + SPECIES_TESHARI = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' + ) starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot2) /obj/item/clothing/under/rank/pilot2/no_webbing diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 1ace7f3db78..f2c0e029e96 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -2954,6 +2954,9 @@ initial_flooring = null }, /area/space) +"Me" = ( +/turf/simulated/floor/smole/desert, +/area/holodeck/source_smoleworld) "Mf" = ( /obj/effect/step_trigger/lost_in_space/tram, /turf/simulated/floor/tiled/techfloor/grid{ @@ -3102,6 +3105,9 @@ initial_flooring = null }, /area/space) +"PM" = ( +/turf/simulated/floor/smole/megablocks, +/area/holodeck/source_smoleworld) "PU" = ( /obj/effect/floor_decal/transit/orange{ dir = 4 @@ -12493,17 +12499,17 @@ aI aI aI ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aI +aI +aI +aI +aI +aI +aI +aI +aI +aI +ar ap ap ap @@ -12634,6 +12640,17 @@ wa Di HL nW +dB +Me +Me +Me +Me +Me +Me +Me +Me +Me +Me fZ ap ap @@ -12752,17 +12769,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (54,1,1) = {" as @@ -12776,6 +12782,17 @@ pT cm JI vW +dB +Me +Me +Me +Me +Me +Me +Me +Me +Me +Me fZ ap ap @@ -12858,17 +12875,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap iO iO iO @@ -12918,6 +12924,17 @@ CK CJ sb DL +dB +Me +Me +PM +PM +PM +PM +PM +PM +Me +Me fZ ap ap @@ -13000,17 +13017,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap iO El El @@ -13060,6 +13066,17 @@ pT cm Jc ZQ +dB +Me +Me +PM +PM +PM +PM +PM +PM +Me +Me fZ ap ap @@ -13142,17 +13159,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap iO El El @@ -13202,18 +13208,18 @@ CK CJ Wf Kn +dB +Me +Me +PM +PM +PM +PM +PM +PM +Me +Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap cd cd cd @@ -13344,18 +13350,18 @@ pT cm GW YX +dB +Me +Me +PM +PM +PM +PM +PM +PM +Me +Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap cd ci ci @@ -13486,18 +13492,18 @@ CK CJ Mi KQ +dB +Me +Me +PM +PM +PM +PM +PM +PM +Me +Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap cd ci ci @@ -13628,18 +13634,18 @@ pT cm Or Eo +dB +Me +Me +PM +PM +PM +PM +PM +PM +Me +Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap cd ci ci @@ -13770,18 +13776,18 @@ CK CJ nj qv +dB +Me +Me +Me +Me +Me +Me +Me +Me +Me +Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap cd ci ci @@ -13912,18 +13918,18 @@ nW nW nW nW +dB +Me +Me +Me +Me +Me +Me +Me +Me +Me +Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap cd ci ci @@ -14055,16 +14061,16 @@ aL aL aL ar -aI -aI -aI -aI -aI -aI -aI -aI -aI -aI +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL ar cd ci diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 990928201c2..aa78ff5bfff 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -26588,7 +26588,7 @@ /obj/item/clothing/shoes/rainbow, /obj/item/clothing/under/color/rainbow, /obj/item/clothing/gloves/rainbow, -/obj/item/clothing/suit/storage/seromi/cloak/standard/rainbow, +/obj/item/clothing/suit/storage/teshari/cloak/standard/rainbow, /turf/simulated/floor/plating, /area/engineering/atmos) "aTx" = ( diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 20edb75efd5..8d0015ec8f9 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -18154,7 +18154,7 @@ /obj/item/clothing/shoes/boots/winter/medical, /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/under/rank/medical, -/obj/item/clothing/under/seromi/smock/medical, +/obj/item/clothing/under/teshari/smock/medical, /turf/simulated/floor, /area/maintenance/station/sec_lower) "Fu" = ( diff --git a/sound/effects/footstep/giantstep_gigga.ogg b/sound/effects/footstep/giantstep_gigga.ogg new file mode 100644 index 00000000000..d3536922d86 Binary files /dev/null and b/sound/effects/footstep/giantstep_gigga.ogg differ diff --git a/sound/effects/footstep/giantstep_gigga2(unsused).ogg b/sound/effects/footstep/giantstep_gigga2(unsused).ogg new file mode 100644 index 00000000000..d335e0f2be2 Binary files /dev/null and b/sound/effects/footstep/giantstep_gigga2(unsused).ogg differ diff --git a/sound/effects/footstep/giantstep_normal(unsused).ogg b/sound/effects/footstep/giantstep_normal(unsused).ogg new file mode 100644 index 00000000000..aa212e488eb Binary files /dev/null and b/sound/effects/footstep/giantstep_normal(unsused).ogg differ diff --git a/sound/effects/footstep/giantstep_normal2(unsused).ogg b/sound/effects/footstep/giantstep_normal2(unsused).ogg new file mode 100644 index 00000000000..dd08b550fca Binary files /dev/null and b/sound/effects/footstep/giantstep_normal2(unsused).ogg differ diff --git a/sound/items/drop/smolematerial.ogg b/sound/items/drop/smolematerial.ogg new file mode 100644 index 00000000000..bb326e65c79 Binary files /dev/null and b/sound/items/drop/smolematerial.ogg differ diff --git a/sound/items/smolebuildingdestoryed.ogg b/sound/items/smolebuildingdestoryed.ogg new file mode 100644 index 00000000000..f4c49ea5eaa Binary files /dev/null and b/sound/items/smolebuildingdestoryed.ogg differ diff --git a/sound/items/smolebuildingdestoryedshort.ogg b/sound/items/smolebuildingdestoryedshort.ogg new file mode 100644 index 00000000000..ecaa0fca52b Binary files /dev/null and b/sound/items/smolebuildingdestoryedshort.ogg differ diff --git a/sound/items/smolebuildinghit1.ogg b/sound/items/smolebuildinghit1.ogg new file mode 100644 index 00000000000..266cabf80bd Binary files /dev/null and b/sound/items/smolebuildinghit1.ogg differ diff --git a/sound/items/smolebuildinghit2.ogg b/sound/items/smolebuildinghit2.ogg new file mode 100644 index 00000000000..04e65403411 Binary files /dev/null and b/sound/items/smolebuildinghit2.ogg differ diff --git a/sound/items/smolelargebuilding(unused).ogg b/sound/items/smolelargebuilding(unused).ogg new file mode 100644 index 00000000000..7e7d5069dc8 Binary files /dev/null and b/sound/items/smolelargebuilding(unused).ogg differ diff --git a/sound/items/smolelargeunbuild.ogg b/sound/items/smolelargeunbuild.ogg new file mode 100644 index 00000000000..9e6530358db Binary files /dev/null and b/sound/items/smolelargeunbuild.ogg differ diff --git a/sound/items/smolesmallbuild.ogg b/sound/items/smolesmallbuild.ogg new file mode 100644 index 00000000000..92630fb3ad9 Binary files /dev/null and b/sound/items/smolesmallbuild.ogg differ diff --git a/sound/items/storage/smolecase.ogg b/sound/items/storage/smolecase.ogg new file mode 100644 index 00000000000..e7db383cb29 Binary files /dev/null and b/sound/items/storage/smolecase.ogg differ diff --git a/sound/items/tinytether.ogg b/sound/items/tinytether.ogg new file mode 100644 index 00000000000..9a6223ac2c4 Binary files /dev/null and b/sound/items/tinytether.ogg differ diff --git a/vorestation.dme b/vorestation.dme index ed86338fb1e..dff787d94b0 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1995,8 +1995,8 @@ #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\utility_vr.dm" #include "code\modules\clothing\suits\wiz_robe.dm" -#include "code\modules\clothing\suits\aliens\seromi.dm" #include "code\modules\clothing\suits\aliens\tajara.dm" +#include "code\modules\clothing\suits\aliens\teshari.dm" #include "code\modules\clothing\suits\aliens\unathi.dm" #include "code\modules\clothing\suits\aliens\vox.dm" #include "code\modules\clothing\under\color.dm" @@ -2031,7 +2031,7 @@ #include "code\modules\clothing\under\jobs\engineering.dm" #include "code\modules\clothing\under\jobs\medsci.dm" #include "code\modules\clothing\under\jobs\security.dm" -#include "code\modules\clothing\under\xenos\seromi.dm" +#include "code\modules\clothing\under\xenos\teshari.dm" #include "code\modules\clothing\under\xenos\vox.dm" #include "code\modules\compass\^compass.dm" #include "code\modules\compass\_compass.dm" @@ -2469,6 +2469,7 @@ #include "code\modules\mob\mob_grab.dm" #include "code\modules\mob\mob_grab_specials.dm" #include "code\modules\mob\mob_helpers.dm" +#include "code\modules\mob\mob_helpers_vr.dm" #include "code\modules\mob\mob_movement.dm" #include "code\modules\mob\mob_planes.dm" #include "code\modules\mob\mob_planes_vr.dm" @@ -2658,7 +2659,6 @@ #include "code\modules\mob\living\carbon\human\species\station\monkey_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans.dm" #include "code\modules\mob\living\carbon\human\species\station\prometheans_vr.dm" -#include "code\modules\mob\living\carbon\human\species\station\seromi.dm" #include "code\modules\mob\living\carbon\human\species\station\station.dm" #include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station_special_vr.dm" @@ -2674,6 +2674,7 @@ #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_objs.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_recipies.dm" +#include "code\modules\mob\living\carbon\human\species\station\teshari.dm" #include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm" #include "code\modules\mob\living\carbon\human\species\virtual_reality\opaque_form.dm" #include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_powers.dm" @@ -3122,13 +3123,13 @@ #include "code\modules\organs\subtypes\machine.dm" #include "code\modules\organs\subtypes\nano.dm" #include "code\modules\organs\subtypes\replicant.dm" -#include "code\modules\organs\subtypes\seromi.dm" #include "code\modules\organs\subtypes\shadekin.dm" #include "code\modules\organs\subtypes\shadekin_vr.dm" #include "code\modules\organs\subtypes\slime.dm" #include "code\modules\organs\subtypes\slime_vr.dm" #include "code\modules\organs\subtypes\standard.dm" #include "code\modules\organs\subtypes\standard_vr.dm" +#include "code\modules\organs\subtypes\teshari.dm" #include "code\modules\organs\subtypes\unathi.dm" #include "code\modules\organs\subtypes\unbreakable.dm" #include "code\modules\organs\subtypes\unseverable.dm" @@ -3760,6 +3761,7 @@ #include "code\modules\vore\resizing\holder_micro_vr.dm" #include "code\modules\vore\resizing\resize_vr.dm" #include "code\modules\vore\resizing\sizegun_vr.dm" +#include "code\modules\vore\smoleworld\smoleworld_vr.dm" #include "code\modules\vore\weight\fitness_machines_vr.dm" #include "code\modules\xenoarcheaology\anomaly_container.dm" #include "code\modules\xenoarcheaology\boulder.dm"