Reimpliments uwu birds (Resomii)

baystation12.dme

@@ -1589,6 +1589,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\resomi.dm"
 #include "code\modules\clothing\underwear\base.dm"
 #include "code\modules\codex\codex_atom.dm"
 #include "code\modules\codex\codex_client.dm"
@@ -1647,6 +1648,7 @@
 #include "code\modules\culture_descriptor\culture\cultures_hidden.dm"
 #include "code\modules\culture_descriptor\culture\cultures_human.dm"
 #include "code\modules\culture_descriptor\culture\cultures_ipc.dm"
+#include "code\modules\culture_descriptor\culture\cultures_resomi.dm"
 #include "code\modules\culture_descriptor\culture\cultures_serpentid.dm"
 #include "code\modules\culture_descriptor\culture\cultures_skrell.dm"
 #include "code\modules\culture_descriptor\culture\cultures_unathi.dm"
@@ -1992,6 +1994,7 @@
 #include "code\modules\mob\language\alien\diona.dm"
 #include "code\modules\mob\language\alien\mantid.dm"
 #include "code\modules\mob\language\alien\monkey.dm"
+#include "code\modules\mob\language\alien\schechi.dm"
 #include "code\modules\mob\language\alien\serpentid.dm"
 #include "code\modules\mob\language\alien\skrell.dm"
 #include "code\modules\mob\language\alien\unathi.dm"
@@ -2462,6 +2465,7 @@
 #include "code\modules\organs\external\species\nabber_stance.dm"
 #include "code\modules\organs\external\species\nabber_threat.dm"
 #include "code\modules\organs\external\species\prometheans.dm"
+#include "code\modules\organs\external\species\resomi.dm"
 #include "code\modules\organs\external\species\vox.dm"
 #include "code\modules\organs\external\species\yeosa.dm"
 #include "code\modules\organs\external\species\ascent\ascent.dm"
@@ -2488,6 +2492,7 @@
 #include "code\modules\organs\internal\species\ipc.dm"
 #include "code\modules\organs\internal\species\nabber.dm"
 #include "code\modules\organs\internal\species\promethean.dm"
+#include "code\modules\organs\internal\species\resomi.dm"
 #include "code\modules\organs\internal\species\skrell.dm"
 #include "code\modules\organs\internal\species\starborn.dm"
 #include "code\modules\organs\internal\species\unathi.dm"
@@ -2892,6 +2897,7 @@
 #include "code\modules\species\station\monkey.dm"
 #include "code\modules\species\station\nabber.dm"
 #include "code\modules\species\station\prometheans.dm"
+#include "code\modules\species\station\resomi.dm"
 #include "code\modules\species\station\station.dm"
 #include "code\modules\spells\artifacts.dm"
 #include "code\modules\spells\construct_spells.dm"
@@ -2982,6 +2988,7 @@
 #include "code\modules\sprite_accessories\accessory_booster.dm"
 #include "code\modules\sprite_accessories\accessory_hair_fade.dm"
 #include "code\modules\sprite_accessories\accessory_ipc.dm"
+#include "code\modules\sprite_accessories\accessory_resomi.dm"
 #include "code\modules\sprite_accessories\accessory_skrell.dm"
 #include "code\modules\sprite_accessories\accessory_unathi.dm"
 #include "code\modules\sprite_accessories\accessory_vox.dm"

code/__defines/chemistry.dm

@@ -25,6 +25,7 @@
 #define IS_SLIME   5
 #define IS_NABBER  6
 #define IS_MANTID  7
+#define IS_RESOMI  8
 
 #define CE_STABLE        "stable"       // Inaprovaline
 #define CE_ANTIBIOTIC    "antibiotic"   // Spaceacilin

code/__defines/colors.dm

@@ -130,6 +130,7 @@
 #define GLASS_COLOR_FROSTED    "#eeeeee"
 
 #define COLOR_BLOOD_HUMAN      "#a10808"
+#define COLOR_BLOOD_RESOMI	   "#D514F7"
 
 //Color defines used by the assembly detailer.
 #define COLOR_ASSEMBLY_BLACK   "#545454"

code/__defines/culture.dm

@@ -160,12 +160,12 @@
 #define CULTURE_UNATHI_SALT_SWAMP     "Salt Swamp Clans"
 #define CULTURE_UNATHI_SPACE          "Space-Faring Clans"
 #define CULTURE_UNATHI_TERSTEN        "Tersten Clans"
- 
+
 #define HOME_SYSTEM_MOGHES          "Moghes"
 #define HOME_SYSTEM_OUERE           "Ouere"
 #define HOME_SYSTEM_UNATHI_TERSTEN  "Tersten - Unathi Clans"
 #define HOME_SYSTEM_OFFWORLD        "Off-world"
- 
+
 #define FACTION_UNATHI_HEGEMONY          "Moghes Hegemony"
 #define FACTION_UNATHI_TERSTEN_HEGEMONY  "Tersten Hegemony"
 #define FACTION_UNATHI_SSEN_UUMA         "Ssen-Uuma Convent"
@@ -174,7 +174,7 @@
 #define FACTION_UNATHI_GRESIS            "Gresis Krukzuz"
 #define FACTION_UNATHI_RAH_ZAKEH         "Rah'Zakeh League"
 #define FACTION_UNATHI_KHARZA            "Kharza Fleet"
- 
+
 #define RELIGION_UNATHI_STRATAGEM    "Grand Stratagem"
 #define RELIGION_UNATHI_PRECURSOR    "Precursor"
 #define RELIGION_UNATHI_VINE         "Hand of the Vine"
@@ -201,3 +201,5 @@
 #define FACTION_ASCENT_ALATE     "Ascent Alate"
 #define FACTION_ASCENT_SERPENTID "Ascent Serpentid"
 #define RELIGION_KHARMAANI       "Nest-Lineage Veneration"
+
+#define CULTURE_RESOMI "PLACEHOLDER"

code/__defines/jobs.dm

@@ -1,3 +1,7 @@
 #define GET_RANDOM_JOB 0
 #define BE_ASSISTANT 1
-#define RETURN_TO_LOBBY 2
+#define RETURN_TO_LOBBY 2
+#define BRANCH_SOLGOV "SolGov Employee"
+#define BRANCH_CONTRACTOR "Civilian"
+#define BRANCH_FLEET "Fleet"
+#define BRANCH_CORPS "Expeditionary Corps"

code/__defines/languages.dm

@@ -21,6 +21,7 @@
 #define LANGUAGE_ADHERENT          "Protocol"
 #define LANGUAGE_VOX               "Vox-pidgin"
 #define LANGUAGE_NABBER            "Serpentid"
+#define LANGUAGE_RESOMI            "Schechi"
 
 //Antag
 #define LANGUAGE_CULT              "Cult"

code/__defines/mobs.dm

@@ -331,8 +331,9 @@
 #define SPECIES_GRAVWORLDER "Grav-Adapted Human"
 #define SPECIES_MULE        "Mule"
 #define SPECIES_MONKEY      "Monkey"
+#define SPECIES_RESOMI		"Resomi"
 
-#define UNRESTRICTED_SPECIES list(SPECIES_HUMAN, SPECIES_DIONA, SPECIES_IPC, SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_SKRELL, SPECIES_TRITONIAN, SPECIES_SPACER, SPECIES_VATGROWN, SPECIES_GRAVWORLDER, SPECIES_MULE)
+#define UNRESTRICTED_SPECIES list(SPECIES_HUMAN, SPECIES_DIONA, SPECIES_IPC, SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_SKRELL, SPECIES_TRITONIAN, SPECIES_SPACER, SPECIES_VATGROWN, SPECIES_GRAVWORLDER, SPECIES_MULE, SPECIES_RESOMI)
 #define RESTRICTED_SPECIES   list(SPECIES_VOX, SPECIES_ALIEN, SPECIES_GOLEM, SPECIES_MANTID_GYNE, SPECIES_MANTID_ALATE, SPECIES_MONARCH_WORKER, SPECIES_MONARCH_QUEEN)
 #define HUMAN_SPECIES        list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_GRAVWORLDER, SPECIES_MULE)
 

code/__defines/species.dm

@@ -33,6 +33,7 @@
 #define HAS_SKIN_TONE_SPCR                                                        0x100  // Skin tone selectable in chargen for spacer humans (0-165)
 #define HAS_SKIN_TONE_TRITON                                                      0x200
 #define HAS_BASE_SKIN_COLOURS                                                     0x400  // Has multiple base skin sprites to go off of
+#define FORCED_XENOWEAR															  0x800  //Forced to wear xenowear
 #define HAS_A_SKIN_TONE (HAS_SKIN_TONE_NORMAL | HAS_SKIN_TONE_GRAV | HAS_SKIN_TONE_SPCR | HAS_SKIN_TONE_TRITON) // Species has a numeric skintone
 
 // Skin Defines

code/game/jobs/job/job.dm

@@ -27,6 +27,7 @@
 	var/economic_power = 2             // With how much does this job modify the initial account amount?
 
 	var/outfit_type                       // The outfit the employee will be dressed in, if any
+	var/species_outfit = list()           //Species outfits
 
 	var/loadout_allowed = TRUE            // Whether or not loadout equipment is allowed and to be created when joining.
 	var/list/allowed_branches             // For maps using branches and ranks, also expandable for other purposes
@@ -99,9 +100,21 @@
 				affected.implants += imp
 				imp.part = affected
 			to_chat(H, SPAN_DANGER("As a registered psionic, you are fitted with a psi-dampening control implant. Using psi-power while the implant is active will result in neural shocks and your violation being reported."))
-
-	var/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title, branch, grade)
-	if(outfit) . = outfit.equip(H, title, alt_title)
+	var/datum/job/jb = SSjobs.get_by_title(alt_title)
+	var/handled_outfit = FALSE
+	if(jb.species_outfit)
+		for (var/branchi in species_outfit)
+			if (branchi == branch.name)
+				var/s = species_outfit[branchi]
+				var/decl/hierarchy/outfit/O = s[H.species.name]
+				if(O)
+					O = outfit_by_type(O)
+					O.equip(H, jb.title, alt_title)
+					handled_outfit = TRUE
+
+	if(!handled_outfit)
+		var/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title, branch, grade)
+		if(outfit) . = outfit.equip(H, title, alt_title)
 
 /datum/job/proc/get_outfit(var/mob/living/carbon/human/H, var/alt_title, var/datum/mil_branch/branch, var/datum/mil_rank/grade)
 	if(alt_title && alt_titles)

code/game/machinery/suit_cycler.dm

@@ -43,7 +43,7 @@
 	)
 
 	//Species that the suits can be configured to fit.
-	var/list/species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
+	var/list/species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_RESOMI)
 
 	var/decl/item_modifier/target_modification
 	var/target_species
@@ -138,7 +138,7 @@
 			return
 		to_chat(user, "You fit \the [I] into the suit cycler.")
 		helmet = I
-		
+
 		updateUsrDialog()
 		return
 

code/game/machinery/suit_cycler_units.dm

@@ -3,7 +3,7 @@
 	model_text = "Engineering"
 	req_access = list(access_construction)
 	available_modifications = list(/decl/item_modifier/space_suit/engineering, /decl/item_modifier/space_suit/atmos)
-	species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI) //Add Unathi when sprites exist for their suits.
+	species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_RESOMI) //Add Unathi when sprites exist for their suits.
 
 /obj/machinery/suit_cycler/engineering/alt
 	available_modifications = list(
@@ -17,7 +17,7 @@
 	model_text = "Mining"
 	req_access = list(access_mining)
 	available_modifications = list(/decl/item_modifier/space_suit/mining)
-	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
+	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_RESOMI)
 
 
 /obj/machinery/suit_cycler/salvage
@@ -31,14 +31,14 @@
 	model_text = "Excavation"
 	req_access = list(access_xenoarch)
 	available_modifications = list(/decl/item_modifier/space_suit/science)
-	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
+	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_RESOMI)
 
 /obj/machinery/suit_cycler/security
 	name = "Security suit cycler"
 	model_text = "Security"
 	req_access = list(access_security)
 	available_modifications = list(/decl/item_modifier/space_suit/security, /decl/item_modifier/space_suit/security/alt)
-	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
+	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_RESOMI)
 
 /obj/machinery/suit_cycler/security/alt
 	available_modifications = list(/decl/item_modifier/space_suit/security/alt)
@@ -48,7 +48,7 @@
 	model_text = "Medical"
 	req_access = list(access_medical)
 	available_modifications = list(/decl/item_modifier/space_suit/medical)
-	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
+	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_RESOMI)
 
 /obj/machinery/suit_cycler/medical/alt
 	available_modifications = list(/decl/item_modifier/space_suit/medical/alt)
@@ -58,12 +58,12 @@
 	model_text = "Nonstandard"
 	req_access = list(access_syndicate)
 	available_modifications = list(/decl/item_modifier/space_suit/mercenary)
-	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
+	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_RESOMI)
 	can_repair = 1
 
 /obj/machinery/suit_cycler/pilot
 	name = "Pilot suit cycler"
 	model_text = "Pilot"
 	req_access = list(access_mining_office)
 	available_modifications = list(/decl/item_modifier/space_suit/pilot)
-	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI)
+	species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_RESOMI)

code/game/objects/items/devices/radio/headset.dm

@@ -18,6 +18,9 @@
 	//left for backward compatability
 	var/ks1type = /obj/item/device/encryptionkey
 	var/ks2type = null
+	sprite_sheets = list(
+		SPECIES_RESOMI = 'icons/mob/species/resomi/onmob_ears_resomi.dmi'
+		)
 
 /obj/item/device/radio/headset/Initialize()
 	. = ..()

code/game/objects/items/weapons/cards_ids.dm

@@ -18,6 +18,10 @@
 	w_class = ITEM_SIZE_TINY
 	slot_flags = SLOT_EARS
 
+	sprite_sheets = list(
+		SPECIES_RESOMI = 'icons/mob/species/resomi/onmob_id_resomi.dmi'
+		)
+
 /obj/item/card/union
 	name = "union card"
 	desc = "A card showing membership in the local worker's union."
@@ -130,7 +134,7 @@ var/const/NO_EMAG_ACT = -50
 /obj/item/card/emag/Initialize()
 	. = ..()
 	set_extension(src,/datum/extension/chameleon/emag)
-	
+
 /obj/item/card/emag/get_antag_info()
 	. = ..()
 	. += "You can use this cryptographic sequencer in order to subvert electronics or forcefully open doors you don't have access to. These actions are irreversible and the card only has a limited number of charges!"
@@ -337,7 +341,7 @@ var/const/NO_EMAG_ACT = -50
 				id.military_branch = new_branch
 				id.military_rank = null
 			return
-	
+
 	to_chat(client, SPAN_WARNING("Input, must be an existing branch - [var_value] is invalid"))
 
 /decl/vv_set_handler/id_card_military_rank
@@ -366,7 +370,7 @@ var/const/NO_EMAG_ACT = -50
 		if(new_rank)
 			id.military_rank = new_rank
 			return
-	
+
 	to_chat(client, SPAN_WARNING("Input must be an existing rank belonging to military_branch - [var_value] is invalid"))
 
 /obj/item/card/id/silver

code/game/objects/items/weapons/handcuffs.dm

@@ -18,6 +18,7 @@
 	var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
 	var/cuff_sound = 'sound/weapons/handcuffs.ogg'
 	var/cuff_type = "handcuffs"
+	sprite_sheets = list(SPECIES_RESOMI = 'icons/mob/species/resomi/onmob_misc_resomi.dmi')
 
 /obj/item/handcuffs/examine(mob/user)
 	. = ..()

code/game/objects/items/weapons/storage/backpack.dm

@@ -17,6 +17,9 @@
 		slot_l_hand_str = "backpack",
 		slot_r_hand_str = "backpack",
 		)
+	sprite_sheets = list(
+		SPECIES_RESOMI = 'icons/mob/species/resomi/onmob_back_resomi.dmi'
+		)
 	w_class = ITEM_SIZE_HUGE
 	slot_flags = SLOT_BACK
 	max_w_class = ITEM_SIZE_LARGE

code/game/objects/items/weapons/storage/belt.dm

@@ -13,6 +13,7 @@
 	slot_flags = SLOT_BELT
 	var/overlay_flags
 	attack_verb = list("whipped", "lashed", "disciplined")
+	sprite_sheets = list(SPECIES_RESOMI = 'icons/mob/species/resomi/onmob_belt_resomi.dmi')
 
 /obj/item/storage/belt/verb/toggle_layer()
 	set name = "Switch Belt Layer"

code/game/objects/items/weapons/tanks/tanks.dm

@@ -21,6 +21,8 @@ var/list/global/tank_gauge_cache = list()
 	throw_speed = 1
 	throw_range = 4
 
+	sprite_sheets = list(SPECIES_RESOMI = 'icons/mob/species/resomi/onmob_back_resomi.dmi')
+
 	var/datum/gas_mixture/air_contents = null
 	var/distribute_pressure = ONE_ATMOSPHERE
 	var/integrity = 20

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -35,7 +35,8 @@
 		/obj/item/clothing/gloves/insulated = 3,
 		/obj/item/storage/toolbox/electrical = 3,
 		/obj/item/module/power_control = 3,
-		/obj/item/device/multitool = 3
+		/obj/item/device/multitool = 3,
+		/obj/item/clothing/gloves/resomi/insulated = 2
 	)
 
 /obj/structure/closet/secure_closet/engineering_welding