Resomi Refactoring

maps/torch_fd/fd_torch.dm

@@ -141,6 +141,7 @@
 	#include "job/addition/exploration_jobs.dm"
 	#include "job/addition/research_jobs.dm"
 	#include "job/addition/service_jobs.dm"
+	#include "job/addition/security.dm"
 
 	// --- MACHINERY --- //
 	#include "../torch/machinery/apc_shuttle.dm"
@@ -155,7 +156,7 @@
 	#include "../torch/structures/closets/medical.dm"
 	#include "../torch/structures/closets/misc.dm"
 	#include "../torch/structures/closets/research.dm"
-	#include "../torch/structures/closets/security.dm"
+//	#include "../torch/structures/closets/security.dm"
 	#include "../torch/structures/closets/services.dm"
 	#include "../torch/structures/closets/supply.dm"
 	#include "../torch/structures/closets/exploration.dm"
@@ -165,6 +166,7 @@
 
 	// --- LOADOUT --- //
 	#include "loadout/_defines.dm"
+	#include "loadout/augments.dm"
 	#include "../torch/loadout/loadout_accessories.dm"
 	#include "../torch/loadout/loadout_ec_skillbadges.dm"
 	#include "../torch/loadout/loadout_eyes.dm"
@@ -213,6 +215,7 @@
 	#include "../away/miningstation/miningstation.dm"
 	#include "../away/mininghome/mininghome.dm"
 	#include "../away/scavver/scavver_gantry.dm"
+	#include "../away/sfv_warspite/code/core.dm"
 	#include "../away/abandoned_hotel/abandoned_hotel.dm"
 
 		// ~EVENT SHIPS~ //
@@ -226,7 +229,7 @@
 
 	#include "../../mods/antagonists/_antagonists.dme"
 	// #include "../../mods/atmos_ret_field/_atm_ret_field.dme"
-	#include "../../mods/bluespace_kitty/_bluespace_kitty.dme"
+//	#include "../../mods/bluespace_kitty/_bluespace_kitty.dme"
 	#include "../../mods/fancy_sofas/_fancy_sofas.dme"
 	#include "../../mods/guns/_guns.dme"
 	#include "../../mods/jukebox_tapes/_jukebox_tapes.dme"
@@ -244,8 +247,6 @@
 
 		// ~NON-UPSTREAM MODS~ //
 
-	#include "../../mods/resomi_fd/_resomi.dme"
-
 	#include "../../mods/_fd/runechat/_runechat.dme"
 	#include "../../mods/_fd/fd_assets/_fd_assets.dme"
 	#include "../../mods/_fd/fd_guns/_fd_guns.dme"
@@ -255,18 +256,24 @@
 	#include "../../mods/_fd/ascent/_ascent.dme"
 	#include "../../mods/_fd/backgrounds/_fd_backgrounds.dme"
 	#include "../../mods/_fd/bruno_items/_bruno_items.dme"
+	#include "../../mods/_fd/chem_furniture/_furniture.dme"
 	#include "../../mods/_fd/combat_stances/_combat_stances.dme"
 	#include "../../mods/_fd/complementary_xeno_ablities/_complementary_xeno_ablities.dme"
 	#include "../../mods/_fd/conference_holopads/_conference_holopads.dme"
+	#include "../../mods/_fd/cyberware_mayhem/_cyberware_mayhem.dme"
+	#include "../../mods/_fd/expanded_traders/_expanded_traders.dme"
 	#include "../../mods/_fd/fd_species/_fd_species.dme"
 	#include "../../mods/_fd/hestia_missiles/_hestia_missiles.dme"
 	#include "../../mods/_fd/immersive_overmap/_immersive_overmap.dme"
+	#include "../../mods/_fd/junk_heaven/_junk_heaven.dme"
 	#include "../../mods/_fd/landing_eye/_landing_eye.dme"
 	#include "../../mods/_fd/mob_interactions/_mob_interactions.dme"
 	#include "../../mods/_fd/multitile_vehicles/_multitile_vehicles.dme"
+	#include "../../mods/_fd/polaris_portals/_polaris_portals.dme"
 	#include "../../mods/_fd/old_space_cannons/_old_space_cannons.dme"
-	#include "../../mods/_fd/random_rooms/_random_rooms.dme"
 	#include "../../mods/_fd/structure_storage/_structure_storage.dme"
+	#include "../../mods/_fd/random_rooms/_random_rooms.dme"
+	#include "../../mods/_fd/resomi_fd/_resomi.dme"
 
 	#include "../../mods/_fd/_maps/airfield/_airfield.dme"
 	#include "../../mods/_fd/_maps/ares/_ares.dme"
@@ -278,15 +285,21 @@
 	#include "../../mods/_fd/_maps/lighthouse/_lighthouse.dme"
 	#include "../../mods/_fd/_maps/new_blueriver/_new_blueriver.dme"
 	#include "../../mods/_fd/_maps/providence/_providence.dme"
+	#include "../../mods/_fd/_maps/small_exoplanet_1/_small_exoplanet_1.dme"
 	#include "../../mods/_fd/_maps/smugglers_ship/_smugglers_ship.dme"
 	#include "../../mods/_fd/_maps/snow_cage/_snow_cage.dme"
+	#include "../../mods/_fd/_maps/sfv_dropship/_delman.dme"
 	#include "../../mods/_fd/_maps/trader_ship/_trader_ship.dme"
 	#include "../../mods/_fd/_maps/yacht/_yacht.dme"
+	#include "../../mods/_fd/_maps/gccv_ulyanovsk/_ulyanovsk.dme"
+	#include "../../mods/_fd/_maps/dead_sea/_dead_sea.dme"
+
 
 		// ~EXOPLANET RUINS~ //
 
 	#include "../random_ruins/exoplanet_ruins/small_ruins/build_ruin.dm"
-	#include "../random_ruins\exoplanet_ruins\remains\remains.dm"
+	#include "../random_ruins/exoplanet_ruins/remains/remains.dm"
+	#include "../random_ruins/exoplanet_ruins/research_lab_scg/research_lab_scg.dm"
 	#include "../random_ruins/exoplanet_ruins/scg_city_restored/scg_city_restored.dm"
 	#include "../random_ruins/exoplanet_ruins/scg_ruined_city/scg_ruined_city.dm"
 	#include "../random_ruins/exoplanet_ruins/railway/railway.dm"

mods/resomi_fd/code/body/emotes.dm → mods/_fd/resomi_fd/code/body/emotes.dm

@@ -1,51 +1,51 @@
 // RESOMI EMOTIONS
 
 /singleton/emote/audible/chuckle/resomi
-	emote_sound = 'mods/resomi_fd/sound/resomilaugh.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomilaugh.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/cough/resomi
-	emote_sound = 'mods/resomi_fd/sound/resomicough.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomicough.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/laugh/resomi
-	emote_sound = 'mods/resomi_fd/sound/resomilaugh.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomilaugh.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/scream/resomi
-	emote_sound = 'mods/resomi_fd/sound/resomiscream.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomiscream.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/sneeze/resomi
-	emote_sound = 'mods/resomi_fd/sound/resomisneeze.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/resomisneeze.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/peep/resomi
 	key = "peep"
 	emote_message_3p = "USER пищит"
-	emote_sound = 'mods/resomi_fd/sound/peep.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/peep.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/rustle/resomi
 	key = "rustle"
 	emote_message_3p = "USER шелестит крыльями"
-	emote_sound = 'mods/resomi_fd/sound/rustle.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/rustle.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/trill/resomi
 	key = "trill"
 	emote_message_3p = "USER издаёт трель"
-	emote_sound = 'mods/resomi_fd/sound/trill.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/trill.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/warble/resomi
 	key = "warble"
 	emote_message_3p = "USER издаёт трель"
-	emote_sound = 'mods/resomi_fd/sound/warble.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/warble.ogg'
 	sounded_species = null
 
 /singleton/emote/audible/wurble/resomi
 	key = "wurble"
 	emote_message_3p = "USER урчит"
-	emote_sound = 'mods/resomi_fd/sound/wurble.ogg'
+	emote_sound = 'mods/_fd/resomi_fd/sound/wurble.ogg'
 	sounded_species = null

mods/resomi_fd/code/body/holding.dm → mods/_fd/resomi_fd/code/body/holding.dm

@@ -1,5 +1,5 @@
 /obj/item/holder/human
-	icon = 'mods/resomi_fd/icons/holder_complex.dmi'
+	icon = 'mods/_fd/resomi_fd/icons/holder_complex.dmi'
 	var/list/generate_for_slots = list(slot_l_hand_str, slot_r_hand_str, slot_back_str)
 	w_class = ITEM_SIZE_LARGE
 	slot_flags = SLOT_BACK

mods/resomi_fd/code/body/organs.dm → mods/_fd/resomi_fd/code/body/organs.dm

@@ -26,5 +26,5 @@
 	parent_organ = BP_CHEST
 
 /obj/item/organ/internal/eyes/resomi
-	icon = 'mods/resomi_fd/icons/human_races/eyes.dmi'
-	eye_icon = 'mods/resomi_fd/icons/human_races/eyes.dmi'
+	icon = 'mods/_fd/resomi_fd/icons/human_races/eyes.dmi'
+	eye_icon = 'mods/_fd/resomi_fd/icons/human_races/eyes.dmi'

mods/_fd/resomi_fd/code/clothing/clothing.dm

@@ -0,0 +1,191 @@
+
+
+//Shoes
+
+/obj/item/clothing/shoes/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_feet_resomi.dmi')
+	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_feet_resomi.dmi')
+
+//Gloves
+/obj/item/clothing/gloves/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_hands_resomi.dmi')
+
+
+//suit
+/obj/item/clothing/suit/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi')
+	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi')
+
+//rig
+/obj/item/rig/eva/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/light/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/medical/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/hazard/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/combat/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/merc/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/zero/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/ce/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/industrial/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/hazmat/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/ert/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+/obj/item/rig/command/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_rig_back_resomi.dmi')
+
+
+/*
+/obj/item/clothing/head/helmet/space/rig/Initialize()
+	. = ..()
+	LAZYADD(species_restricted, list(SPECIES_RESOMI))
+
+/obj/item/clothing/gloves/rig/Initialize()
+	. = ..()
+	LAZYADD(species_restricted, list(SPECIES_RESOMI))
+
+/obj/item/clothing/shoes/magboots/rig/Initialize()
+	. = ..()
+	LAZYADD(species_restricted, list(SPECIES_RESOMI))
+
+/obj/item/clothing/suit/space/rig/Initialize()
+	. = ..()
+	LAZYADD(species_restricted, list(SPECIES_RESOMI))
+*/
+
+
+/obj/item/storage/belt/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_belt_resomi.dmi')
+
+/obj/item/clothing/accessory/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_accessories_resomi.dmi')
+	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_accessories_resomi.dmi')
+// back
+/obj/item/storage/backpack/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_back_resomi.dmi')
+
+// under
+/obj/item/clothing/under/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_under_resomi.dmi')
+	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_under_resomi.dmi')
+//ears
+/obj/item/clothing/ears/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_ears_resomi.dmi')
+
+//mask
+/obj/item/clothing/mask/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_mask_resomi.dmi')
+
+//head
+/obj/item/clothing/head/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi')
+	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi')
+
+/obj/item/clothing/head/beret/Initialize()
+	. = ..()
+	LAZYSET(base_sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi')
+
+//glasses
+/obj/item/clothing/glasses/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi')
+	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_eyes_resomi.dmi')
+
+//devices and machines
+/obj/machinery/suit_cycler/Initialize()
+	. = ..()
+	species += SPECIES_RESOMI
+
+/obj/item/auto_cpr/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi')
+
+/obj/item/device/radio/headset/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_ears_resomi.dmi')
+
+/obj/item/clothing/mask/plunger/equipped(M, slot)
+	..()
+	sprite_sheets[SPECIES_RESOMI] = (slot == slot_head ? 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi' : 'mods/_fd/resomi_fd/icons/clothing/onmob_mask_resomi.dmi')
+
+/obj/item/card/id/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_id_resomi.dmi')
+
+/obj/item/handcuffs/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/misc.dmi')
+
+/obj/item/storage/belt/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_belt_resomi.dmi')
+
+/obj/item/tank/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/onmob_back_resomi.dmi')
+
+/obj/item/towel/equipped(M, slot)
+	..()
+	sprite_sheets = list(SPECIES_RESOMI = (slot == slot_head ? 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi' : 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi'))
+
+/obj/item/clothing/under/solgov/utility/expeditionary/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/solgov/onmob_under_resomi.dmi')
+
+/obj/item/clothing/accessory/solgov/department/Initialize()
+	. = ..()
+	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/_fd/resomi_fd/icons/clothing/solgov/onmob_accessories_resomi.dmi')
+
+//
+#define SETUP_SPECIES_ONMOB "sprite_sheets"
+
+/singleton/item_modifier/space_suit/Initialize()
+	. = ..()
+	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
+	helmet_setup[SETUP_SPECIES_ONMOB] += list(SPECIES_RESOMI = 'mods/_fd/resomi_fd/icons/clothing/onmob_head_resomi.dmi')
+
+	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
+	suit_setup[SETUP_SPECIES_ONMOB] += list(SPECIES_RESOMI = 'mods/_fd/resomi_fd/icons/clothing/onmob_suit_resomi.dmi')
+
+#undef SETUP_SPECIES_ONMOB

mods/resomi_fd/code/clothing/glasses.dm → mods/_fd/resomi_fd/code/clothing/glasses.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/glasses/sunglasses/lenses
 	name = "small sun lenses"
 	desc = "It looks fitted to nonhuman proportions. Usually, you can(?) see them in resomis' or monkeys' eyes."
-	item_icons = list(slot_glasses_str = 'mods/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi')
+	item_icons = list(slot_glasses_str = 'mods/_fd/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi')
 	icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_eyes_resomi.dmi'
 	icon_state = "sun_lenses"
 	item_state = null
@@ -12,7 +12,7 @@
 /obj/item/clothing/glasses/sunglasses/sechud/lenses
 	name = "small sechud lenses"
 	desc = "Lenses with a HUD. This one has a sechud."
-	item_icons = list(slot_glasses_str = 'mods/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi')
+	item_icons = list(slot_glasses_str = 'mods/_fd/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi')
 	icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_eyes_resomi.dmi'
 	icon_state = "sec_lenses"
 	item_state = null
@@ -22,7 +22,7 @@
 /obj/item/clothing/glasses/hud/health/lenses
 	name = "small medhud lenses"
 	desc = "A small lenses that scans the creatures in view and provides accurate data about their health status."
-	item_icons = list(slot_glasses_str = 'mods/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi')
+	item_icons = list(slot_glasses_str = 'mods/_fd/resomi_fd/icons/clothing/onmob_eyes_resomi.dmi')
 	icon = 'packs/infinity/icons/obj/clothing/species/resomi/obj_eyes_resomi.dmi'
 	icon_state = "med_lenses"
 	item_state = null