From e46a8636eb235e627023cdd3d42428b34c134353 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 30 Nov 2024 13:52:34 -0500 Subject: [PATCH 01/24] Religious Headgear For Character Customization (#1297) # Description This PR adds a few articles of various kinds of religious headgear to loadouts, namely a Hijab, Turban, and Kippah. All 3 are whitescale items that are set as colorable, allowing players to make them whatever color is desired. Farida can finally have the pink Hijab she was always supposed to have.

Media

![image](https://github.com/user-attachments/assets/35fca330-98ba-439b-8e23-eec917b0d30c)

# Changelog :cl: - add: Added various articles of religious headgear to loadouts, such as Hijab, Kippah, and Turban. All of these are set to allow custom colors. --- .../CharacterItemGroups/Generic/headGroup.yml | 6 +++ .../Entities/Clothing/Head/religious.yml | 32 ++++++++++++++++ .../Prototypes/Loadouts/Generic/head.yml | 36 ++++++++++++++++++ .../hijab.rsi/equipped-HELMET.png | Bin 0 -> 798 bytes .../Head/ReligiousHeadgear/hijab.rsi/icon.png | Bin 0 -> 349 bytes .../ReligiousHeadgear/hijab.rsi/meta.json | 18 +++++++++ .../kippah.rsi/equipped-HELMET.png | Bin 0 -> 292 bytes .../ReligiousHeadgear/kippah.rsi/icon.png | Bin 0 -> 157 bytes .../ReligiousHeadgear/kippah.rsi/meta.json | 18 +++++++++ .../turban.rsi/equipped-HELMET.png | Bin 0 -> 725 bytes .../ReligiousHeadgear/turban.rsi/icon.png | Bin 0 -> 315 bytes .../ReligiousHeadgear/turban.rsi/meta.json | 18 +++++++++ 12 files changed, 128 insertions(+) create mode 100644 Resources/Prototypes/Entities/Clothing/Head/religious.yml create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/hijab.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/hijab.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/hijab.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/kippah.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/kippah.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/kippah.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/turban.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/turban.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/ReligiousHeadgear/turban.rsi/meta.json diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml index ee4485757b..d5ba07f580 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml @@ -117,3 +117,9 @@ id: LoadoutHeadCowboyGrey - type: loadout id: LoadoutHeadCowboyRed + - type: loadout + id: LoadoutHeadHijabColorable + - type: loadout + id: LoadoutHeadTurbanColorable + - type: loadout + id: LoadoutHeadKippahColorable diff --git a/Resources/Prototypes/Entities/Clothing/Head/religious.yml b/Resources/Prototypes/Entities/Clothing/Head/religious.yml new file mode 100644 index 0000000000..100af050f6 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Head/religious.yml @@ -0,0 +1,32 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHijabColorable + name: hijab + description: Encompassing cloth headwear worn by some human cultures and religions. + components: + - type: Sprite + sprite: Clothing/Head/ReligiousHeadgear/hijab.rsi + - type: Clothing + sprite: Clothing/Head/ReligiousHeadgear/hijab.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatTurbanColorable + name: turban + description: A sturdy cloth, worn around the head. + components: + - type: Sprite + sprite: Clothing/Head/ReligiousHeadgear/turban.rsi + - type: Clothing + sprite: Clothing/Head/ReligiousHeadgear/turban.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatKippahColorable + name: kippah + description: A head covering commonly worn by those of Jewish faith. + components: + - type: Sprite + sprite: Clothing/Head/ReligiousHeadgear/kippah.rsi + - type: Clothing + sprite: Clothing/Head/ReligiousHeadgear/kippah.rsi diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml index 24f1bdad71..b8d3c8c7ac 100644 --- a/Resources/Prototypes/Loadouts/Generic/head.yml +++ b/Resources/Prototypes/Loadouts/Generic/head.yml @@ -746,3 +746,39 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutHead + +- type: loadout + id: LoadoutHeadHijabColorable + category: Head + cost: 0 + exclusive: true + customColorTint: true + items: + - ClothingHeadHatHijabColorable + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHead + +- type: loadout + id: LoadoutHeadTurbanColorable + category: Head + cost: 0 + exclusive: true + customColorTint: true + items: + - ClothingHeadHatTurbanColorable + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHead + +- type: loadout + id: LoadoutHeadKippahColorable + category: Head + cost: 0 + exclusive: true + customColorTint: true + items: + - ClothingHeadHatKippahColorable + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHead diff --git a/Resources/Textures/Clothing/Head/ReligiousHeadgear/hijab.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/ReligiousHeadgear/hijab.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..8f0423febf6f2b2307471b2d0a46f7c6a8c3ce7b GIT binary patch literal 798 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V0q zPZ!6KiaBp*d3V2Z5NORV5L?vI^x)7`M%OztTNgaI7XLQv!d!2`Rt-Ccz>p)y-HM)@ zY)N^-WZK&h^uNxtX`Y zf+cw6mF+A7{fAkO7vA~&(`Tm7vz31+IW70;C zj^vn9wSR0PoVgBE>`Xoqhxc|QOLe<`7UQ0iT%<@sw^Eps4<<9%^z&|-= zi=7rKByAGD$SLvskkNzXj~L^;g%>?3+r3w$|Iqf^YdaF>oQ{6Wq_Hh(ZC8``QlYcY zi=*_Wr`+BKl;A$iaHej;M+1k2?S~n6_i5~l(Yst>6ZX%hj6KI}_VkGL*M)CSikYz} zWouODHTRDeNruywJMF&PS0+ATL4s!6^9;u``@Fb|8q~h*u__V_(UjZ3bKs5l_NQwW zSDdjq7BcyPg71OiOc#OJX^cTJyZS=qk5;eee5ByB_~!D4?O#)GpI%qtK4rUOz4oz- z{{jVGSUrgC{`M(M+$k`DM*$e76P`&hdldIDF0nkua7iYaA+yi0!Q{Av!>nYUfZE6Y z{{=1P`b|0gRO#=mHx)L!ZsvSbUH9wqo=J=zhki@7Dr?#ph)w0Z_h{*|av#^}xefJf zDN4-;8?v@ax$=H-TP$cg`)t12idpMxxGIhY)~vqT^+!4>zwmF}{i$ugcQ-QMW;kAW zVv|ncn(MEV%pPgn<2OlUvN||hc)G)GhB^PQvz%?rJ&?CuIPZVIg1O!)S%ql5zSj5V z3v_SCi*93_>-Rj_LZ&NM;7|nfuDk2HEsk=SEY$U#u(QzKeI;|wZ80YUrI|imDvwMU zqk7$(Mf%#$xVJiVF9?_L4D4ws-6(o%FGHGrpB_iF@|D>OE&Licn4Y<-faHJ7;CajY agE>BXMmN*cE!Thvp25@A&t;ucLK6T#Pi9PR6Nsq$zSS$tJ)}lj{djxO&Q+BePr=yj|s{$@!U|r9^q3{}I<3C4Ghyv&9l_ zZ`&)o{`IdHd(TZ_DE*NdX?Lz#a2d;v&6i@d`?Z?2j^;_pYs`9txSkCAswXc+QA$!7#htc={^ZdD$ y*&x`S|MgDvKBg1g44;@9_An>_U4(`Co^|e27uJupSwDb2WbkzLb6Mw<&;$S8%nqJ967f$U_nlQnMdGdJK!spnq+tAd&fQuY<~zr~ p`#G*)ch&j#+;_{`#-Kb!rn=TJ4+OaQNYe=nr@E z)VD_YvNbn;_*t~`O#0?X6V4;cAG|I5eSGW1j3?`Uduix49FAT)t$O`4&3`{@tOO4~ z3|MwKGe9UcLPxA}{dMO}DUoV({oGCDi!RF4JgzQfD4+SLQdQwe<-0eNkJRlicS>^1 zSx}MkB3+BgZ~5fwGncZ?IiLRB>%rA5)uUn0-_`tm_m54{FyQ2!zo(x*`V^qpk-z=6 zo0HEu5f9fbOOpvY$TBI?{5{IylMgqm|t9&jJViPqcMS zXJ8UBH|B_o>FKalxcd2|^KQN^+9!^NH%(`F*RV}i*MsSo&9OVYRjm;st1Mr9_dn6p z_Pt`x$~9gM@AcvWIcGJC$(PzYCgTe~DWM4fV=Fr+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/ReligiousHeadgear/turban.rsi/icon.png b/Resources/Textures/Clothing/Head/ReligiousHeadgear/turban.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bd8a670a8814cea792fe845bb87357a53bf0a8f5 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQXX z#WAE}&fBTJT+Idot=eDs^6pkQbj*wQ%$qp%f#Q)*EsY=3g{-GeJG93)>Cl<)hI*fB z{#d9bFagnj?FW0~Gwz%Cel%rdnx0x|ak(Q#?7@RotIW!O^ck*l*~FyzAq?of z9I@Q)RnTFQ$LAJc&C~3+;PtLW?|-wNHEi4*=#?-_;=zl>LJx#)Y|pK3xS(?Gz+;QF zhmnkv4rp~|9GuP?q$I-oBbU*$Wq#(OI$rz6drAf2J_lHQ9 Date: Sat, 30 Nov 2024 18:53:02 +0000 Subject: [PATCH 02/24] Automatic Changelog Update (#1297) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 142f3f3e99..3355783b28 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8284,3 +8284,12 @@ Entries: id: 6547 time: '2024-11-30T16:53:42.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1281 +- author: VMSolidus + changes: + - type: Add + message: >- + Added various articles of religious headgear to loadouts, such as Hijab, + Kippah, and Turban. All of these are set to allow custom colors. + id: 6548 + time: '2024-11-30T18:52:35.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1297 From f2871885b6dd13b418dfd7ff55ffe0559a4f7044 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Sat, 30 Nov 2024 13:47:59 -0800 Subject: [PATCH 03/24] Don't Require Running in Release to Test Mood (#1257) --- Content.Server/Mood/MoodSystem.cs | 60 ++++++++++++------------------- Content.Shared/CCVar/CCVars.cs | 4 +++ 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/Content.Server/Mood/MoodSystem.cs b/Content.Server/Mood/MoodSystem.cs index 41baf9f547..44a93217cf 100644 --- a/Content.Server/Mood/MoodSystem.cs +++ b/Content.Server/Mood/MoodSystem.cs @@ -32,15 +32,6 @@ public sealed class MoodSystem : EntitySystem [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly IConfigurationManager _config = default!; -#if RELEASE - // Disable Mood for tests, because of a stupid race condition where if it spawns an Urist McHarpy, - // the Harpy will choke during the test, creating a mood alert. - // And then cause a debug assert. - private bool _debugMode; -#else - private bool _debugMode = true; -#endif - public override void Initialize() { @@ -55,14 +46,12 @@ public override void Initialize() SubscribeLocalEvent(OnRemoveEffect); } - private void OnShutdown(EntityUid uid, MoodComponent component, ComponentShutdown args) - { + private void OnShutdown(EntityUid uid, MoodComponent component, ComponentShutdown args) => _alerts.ClearAlertCategory(uid, component.MoodCategory); - } private void OnRemoveEffect(EntityUid uid, MoodComponent component, MoodRemoveEffectEvent args) { - if (_debugMode) + if (!_config.GetCVar(CCVars.MoodEnabled)) return; if (component.UncategorisedEffects.TryGetValue(args.EffectId, out _)) @@ -78,7 +67,7 @@ private void OnRemoveEffect(EntityUid uid, MoodComponent component, MoodRemoveEf private void OnRefreshMoveSpeed(EntityUid uid, MoodComponent component, RefreshMovementSpeedModifiersEvent args) { - if (_debugMode + if (!_config.GetCVar(CCVars.MoodEnabled) || component.CurrentMoodThreshold is > MoodThreshold.Meh and < MoodThreshold.Good or MoodThreshold.Dead || _jetpack.IsUserFlying(uid)) return; @@ -101,7 +90,7 @@ private void OnRefreshMoveSpeed(EntityUid uid, MoodComponent component, RefreshM private void OnMoodEffect(EntityUid uid, MoodComponent component, MoodEffectEvent args) { - if (_debugMode + if (!_config.GetCVar(CCVars.MoodEnabled) || !_config.GetCVar(CCVars.MoodEnabled) || !_prototypeManager.TryIndex(args.EffectId, out var prototype) ) return; @@ -210,7 +199,7 @@ private void ReplaceMood(EntityUid uid, string prototypeId) private void OnMobStateChanged(EntityUid uid, MoodComponent component, MobStateChangedEvent args) { - if (_debugMode) + if (!_config.GetCVar(CCVars.MoodEnabled)) return; if (args.NewMobState == MobState.Dead && args.OldMobState != MobState.Dead) @@ -249,7 +238,7 @@ private void RefreshMood(EntityUid uid, MoodComponent component) private void OnInit(EntityUid uid, MoodComponent component, ComponentStartup args) { - if (_debugMode) + if (!_config.GetCVar(CCVars.MoodEnabled)) return; if (_config.GetCVar(CCVars.MoodModifiesThresholds) @@ -274,15 +263,14 @@ private void SetMood(EntityUid uid, float amount, MoodComponent? component = nul if (ev.Cancelled) return; - else - { - uid = ev.Receiver; - amount = ev.MoodChangedAmount; - } + + uid = ev.Receiver; + amount = ev.MoodChangedAmount; var newMoodLevel = amount + neutral; if (!force) - newMoodLevel = Math.Clamp(amount + neutral, + newMoodLevel = Math.Clamp( + amount + neutral, component.MoodThresholds[MoodThreshold.Dead], component.MoodThresholds[MoodThreshold.Perfect]); @@ -355,7 +343,7 @@ private void SetCritThreshold(EntityUid uid, MoodComponent component, int modifi { 1 => FixedPoint2.New(key.Value.Float() * component.IncreaseCritThreshold), -1 => FixedPoint2.New(key.Value.Float() * component.DecreaseCritThreshold), - _ => component.CritThresholdBeforeModify + _ => component.CritThresholdBeforeModify, }; component.CritThresholdBeforeModify = key.Value; @@ -378,15 +366,13 @@ private MoodThreshold GetMoodThreshold(MoodComponent component, float? moodLevel return result; } - private int GetMovementThreshold(MoodThreshold threshold) - { - return threshold switch + private int GetMovementThreshold(MoodThreshold threshold) => + threshold switch { >= MoodThreshold.Good => 1, <= MoodThreshold.Meh => -1, - _ => 0 + _ => 0, }; - } private void OnDamageChange(EntityUid uid, MoodComponent component, DamageChangedEvent args) { @@ -408,8 +394,7 @@ private void OnDamageChange(EntityUid uid, MoodComponent component, DamageChange } } -[UsedImplicitly] -[DataDefinition] +[UsedImplicitly, DataDefinition] public sealed partial class ShowMoodEffects : IAlertClick { public void AlertClicked(EntityUid uid) @@ -421,8 +406,7 @@ public void AlertClicked(EntityUid uid) if (!entityManager.TryGetComponent(uid, out var comp) || comp.CurrentMoodThreshold == MoodThreshold.Dead - || !playerManager.TryGetSessionByEntity(uid, out var session) - || session == null) + || !playerManager.TryGetSessionByEntity(uid, out var session)) return; var msgStart = Loc.GetString("mood-show-effects-start"); @@ -450,15 +434,17 @@ public void AlertClicked(EntityUid uid) private void SendDescToChat(MoodEffectPrototype proto, ICommonSession session) { - if (session == null) - return; - var chatManager = IoCManager.Resolve(); var color = (proto.MoodChange > 0) ? "#008000" : "#BA0000"; var msg = $"[font size=10][color={color}]{proto.Description}[/color][/font]"; - chatManager.ChatMessageToOne(ChatChannel.Emotes, msg, msg, EntityUid.Invalid, false, + chatManager.ChatMessageToOne( + ChatChannel.Emotes, + msg, + msg, + EntityUid.Invalid, + false, session.Channel); } } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index d597ca04f7..69c958fbc1 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2693,7 +2693,11 @@ public static readonly CVarDef #region Mood System public static readonly CVarDef MoodEnabled = + #if RELEASE CVarDef.Create("mood.enabled", true, CVar.SERVER); + #else + CVarDef.Create("mood.enabled", false, CVar.SERVER); + #endif public static readonly CVarDef MoodIncreasesSpeed = CVarDef.Create("mood.increases_speed", true, CVar.SERVER); From dfb12e53abf1ef5d767240a19b28ba12dd35ef9b Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 30 Nov 2024 17:28:28 -0500 Subject: [PATCH 04/24] Start of Lore Documents --- .../UI/LoadoutPreferenceSelector.xaml.cs | 8 +- .../Loadouts/Prototypes/LoadoutPrototype.cs | 6 +- .../Weapons/Guns/Battery/battery_guns.yml | 6 + .../Objects/Weapons/Guns/Pistols/pistols.yml | 8 ++ .../Weapons/Guns/Revolvers/revolvers.yml | 15 +++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 18 +++ .../Weapons/Guns/Revolvers/revolvers.yml | 15 +++ .../Guidebook/Loadouts/loadoutInfo.yml | 6 + .../Prototypes/Guidebook/Lore/settinglore.yml | 66 ++++++++++ Resources/Prototypes/Guidebook/ss14.yml | 1 + .../Loadouts/Jobs/Security/uncategorized.yml | 26 ++++ .../LoadoutInfo/Security/SecurityWeapons.xml | 54 ++++++++ .../Lore/Corporations/Corporations.xml | 3 + .../Lore/Corporations/EinsteinEngines.xml | 115 ++++++++++++++++++ .../Corporations/HephaestusIndustries.xml | 5 + .../Lore/Corporations/IdrisIncorporated.xml | 3 + .../Lore/Corporations/NanoTrasen.xml | 3 + .../PrivateMilitaryContractingGroup.xml | 3 + .../StellarCorporateConglomerate.xml | 3 + .../Corporations/ZavodskoiInterstellar.xml | 3 + .../Corporations/ZengHuPharmaceuticals.xml | 3 + .../ServerInfo/Guidebook/Lore/SettingLore.xml | 3 + 22 files changed, 366 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/Guidebook/Lore/settinglore.yml create mode 100644 Resources/ServerInfo/Guidebook/LoadoutInfo/Security/SecurityWeapons.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml create mode 100644 Resources/ServerInfo/Guidebook/Lore/SettingLore.xml diff --git a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs index 659fbbbfa3..eb472e7d95 100644 --- a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs +++ b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs @@ -148,21 +148,21 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob, // Manage the info button void UpdateGuidebook() => GuidebookButton.Visible = - prototypeManager.HasIndex(DefaultLoadoutInfoGuidebook + Loadout.ID); + prototypeManager.HasIndex(loadout.GuideEntry); UpdateGuidebook(); prototypeManager.PrototypesReloaded += _ => UpdateGuidebook(); GuidebookButton.OnPressed += _ => { - if (!prototypeManager.TryIndex(DefaultLoadoutInfoGuidebook, out var guideRoot)) + if (!prototypeManager.TryIndex(loadout.GuideEntry, out var guideRoot)) return; var guidebookController = UserInterfaceManager.GetUIController(); //TODO: Don't close the guidebook if its already open, just go to the correct page guidebookController.ToggleGuidebook( - new Dictionary { { DefaultLoadoutInfoGuidebook, guideRoot } }, + new Dictionary { { loadout.GuideEntry, guideRoot } }, includeChildren: true, - selected: DefaultLoadoutInfoGuidebook + Loadout.ID); + selected: loadout.GuideEntry); }; // Create a checkbox to get the loadout diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs index bebef3ae25..38a356b1e0 100644 --- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs +++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs @@ -1,8 +1,5 @@ -using Content.Shared.Clothing.Loadouts.Systems; using Content.Shared.Customization.Systems; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; namespace Content.Shared.Clothing.Loadouts.Prototypes; @@ -45,4 +42,7 @@ public sealed partial class LoadoutPrototype : IPrototype [DataField] public List Requirements = new(); + + [DataField] + public string GuideEntry { get; } = ""; } diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 8c8ce740a5..f3b41bdbfe 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -172,6 +172,9 @@ id: WeaponEnergyGunMiniSecurity description: A light version of the Energy gun with a smaller capacity. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: PDW-9 Energy Pistol @@ -236,6 +239,9 @@ id: WeaponEnergyGunPistolSecurity description: A military grade sidearm, used by many militia forces throughout the local sector. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: IK-60 laser carbine diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 405c321316..0bd56dfab6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -39,6 +39,9 @@ id: WeaponPistolViperWoodSecurity description: A small, low-power pistol with pleasant lacquered wooden grips. Uses .35 auto ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Pollock @@ -85,6 +88,9 @@ id: WeaponPistolPollockSecurity description: A compact and mass-produced combat pistol. Uses .35 auto ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Pollock @@ -110,6 +116,8 @@ whitelist: tags: - CartridgePistol + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: psi-breaker diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index d74949a80a..3a2600fd44 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -28,6 +28,9 @@ id: WeaponRevolverSnubSecurity description: An old and reliable revolver, modified to be more easily concealed. Uses .45 magnum ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: snubbed .45 @@ -43,6 +46,8 @@ capacity: 6 chambers: [ True, True, True, True, True, True ] ammoSlots: [ null, null, null, null, null, null ] + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: k-38 masterpiece @@ -75,6 +80,9 @@ id: WeaponRevolverK38MasterSecurity description: A classic, if not outdated, law enforcement firearm. Uses .38 special ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: k-38 masterpiece @@ -90,6 +98,8 @@ capacity: 6 chambers: [ True, True, True, True, True, True ] ammoSlots: [ null, null, null, null, null, null ] + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: fitz special @@ -122,6 +132,9 @@ id: WeaponRevolverFitzSecurity description: A compact and concealable self defence snub revolver. Uses .38 special ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: fitz special @@ -137,6 +150,8 @@ capacity: 6 chambers: [ True, True, True, True, True, True ] ammoSlots: [ null, null, null, null, null, null ] + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: lucky 37 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index c4b2082f38..73c2231b23 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -115,6 +115,9 @@ description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. Uses .35 auto ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. suffix: Security Loadouts + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity id: WeaponPistolViperNonLethal @@ -149,6 +152,9 @@ suffix: Non-lethal, SecurityLoadouts description: A small, easily concealable, but somewhat underpowered gun, produced by a bulk arms manufacturer now defunct for over a century. Uses .35 auto ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: cobra @@ -229,6 +235,9 @@ description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. suffix: Security Loadouts + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity id: WeaponPistolMk58Nonlethal @@ -262,6 +271,9 @@ suffix: Non-lethal, Security Loadouts description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: N1984 @@ -315,6 +327,9 @@ description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. The serial number on the handguard marks this gun as belonging to an NT Security Officer. suffix: Security Loadouts + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: N1984 @@ -350,3 +365,6 @@ description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. The serial number on the handguard marks this gun as belonging to an NT Security Officer. suffix: Security Loadouts + components: + - type: GuideHelp + guides: [ SecurityWeapons ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 6c59898741..734b6c4adc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -85,6 +85,9 @@ id: WeaponRevolverDeckardSecurity description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Deckard @@ -99,6 +102,8 @@ - CartridgeMagnum - SpeedLoaderMagnum proto: CartridgeMagnumRubber + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Inspector @@ -121,6 +126,9 @@ id: WeaponRevolverInspectorSecurity description: A detective's best friend. Uses .45 magnum ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Inspector @@ -135,6 +143,8 @@ - CartridgeMagnum - SpeedLoaderMagnum proto: CartridgeMagnumRubber + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Mateba @@ -178,6 +188,9 @@ id: WeaponRevolverPythonSecurity description: An iconic large-framed revolver of ancient Sol' design. It is commonly manufactured by many companies all over the colonies. Uses .45 magnum ammo. The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Python @@ -197,6 +210,8 @@ path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg soundInsert: path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg + - type: GuideHelp + guides: [ SecurityWeapons ] - type: entity name: Python diff --git a/Resources/Prototypes/Guidebook/Loadouts/loadoutInfo.yml b/Resources/Prototypes/Guidebook/Loadouts/loadoutInfo.yml index 2edc89d61f..8d9df2b8ea 100644 --- a/Resources/Prototypes/Guidebook/Loadouts/loadoutInfo.yml +++ b/Resources/Prototypes/Guidebook/Loadouts/loadoutInfo.yml @@ -4,8 +4,14 @@ text: "/ServerInfo/Guidebook/LoadoutInfo/LoadoutInfo.xml" children: - LoadoutInfoLoadoutEyesEyepatch + - SecurityWeapons - type: guideEntry id: LoadoutInfoLoadoutEyesEyepatch name: guide-entry-loadout-eyes-eyepatch text: "/ServerInfo/Guidebook/LoadoutInfo/Eyes/LoadoutInfoLoadoutEyesEyepatch.xml" + +- type: guideEntry + id: SecurityWeapons + name: guide-entry-loadout-info-security-weapons + text: "/ServerInfo/Guidebook/LoadoutInfo/Security/SecurityWeapons.xml" diff --git a/Resources/Prototypes/Guidebook/Lore/settinglore.yml b/Resources/Prototypes/Guidebook/Lore/settinglore.yml new file mode 100644 index 0000000000..ccf940bcd3 --- /dev/null +++ b/Resources/Prototypes/Guidebook/Lore/settinglore.yml @@ -0,0 +1,66 @@ +- type: guideEntry + id: SettingLore + name: guide-entry-setting-lore + text: "/ServerInfo/Guidebook/Lore/SettingLore.xml" + children: + - Corporations + +- type: guideEntry + id: Corporations + name: guide-entry-corporations + text: "/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml" + children: + - IdrisIncorporated + - EinsteinEngines + - StellarCorporateConglomerate + - NanoTrasen + - OrionExpress + - ZengHuPharmaceuticals + - HephaestusIndustries + - ZavodskoiInterstellar + - PrivateMilitaryContractingGroup + +- type: guideEntry + id: IdrisIncorporated + name: guide-entry-idris-incorporated + text: "/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml" + +- type: guideEntry + id: EinsteinEngines + name: guide-entry-einstein-engines + text: "/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml" + +- type: guideEntry + id: StellarCorporateConglomerate + name: guide-entry-stellar-corporate-conglomerate + text: "/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml" + +- type: guideEntry + id: NanoTrasen + name: guide-entry-nanotrasen + text: "/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml" + +- type: guideEntry + id: OrionExpress + name: guide-entry-orion-express + text: "/ServerInfo/Guidebook/Lore/Corporations/OrionExpress.xml" + +- type: guideEntry + id: ZengHuPharmaceuticals + name: guide-entry-zeng-hu-pharmaceuticals + text: "/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml" + +- type: guideEntry + id: HephaestusIndustries + name: guide-entry-hephaestus-industries + text: "/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml" + +- type: guideEntry + id: ZavodskoiInterstellar + name: guide-entry-zavodskoi-interstellar + text: "/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml" + +- type: guideEntry + id: PrivateMilitaryContractingGroup + name: guide-entry-private-military-contracting-group + text: "/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml" diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml index 7c27f42135..cb55cd9c0f 100644 --- a/Resources/Prototypes/Guidebook/ss14.yml +++ b/Resources/Prototypes/Guidebook/ss14.yml @@ -13,6 +13,7 @@ - Writing - Glossary - LoadoutInfo + - SettingLore - type: guideEntry id: Writing diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index 7cdf12330d..dbef5c35f7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -314,6 +314,7 @@ category: JobsSecurityAUncategorized cost: 0 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -328,6 +329,7 @@ category: JobsSecurityAUncategorized cost: 0 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -345,6 +347,7 @@ category: JobsSecurityAUncategorized cost: 0 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -359,6 +362,7 @@ category: JobsSecurityAUncategorized cost: 0 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -376,6 +380,7 @@ category: JobsSecurityAUncategorized cost: 0 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -390,6 +395,7 @@ category: JobsSecurityAUncategorized cost: 1 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -407,6 +413,7 @@ category: JobsSecurityAUncategorized cost: 1 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -421,6 +428,7 @@ category: JobsSecurityAUncategorized cost: 5 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -438,6 +446,7 @@ category: JobsSecurityAUncategorized cost: 5 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -452,6 +461,7 @@ category: JobsSecurityAUncategorized cost: 2 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -469,6 +479,7 @@ category: JobsSecurityAUncategorized cost: 2 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -483,6 +494,7 @@ category: JobsSecurityAUncategorized cost: 2 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -500,6 +512,7 @@ category: JobsSecurityAUncategorized cost: 3 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -520,6 +533,7 @@ category: JobsSecurityAUncategorized cost: 1 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -537,6 +551,7 @@ category: JobsSecurityAUncategorized cost: 2 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -554,6 +569,7 @@ category: JobsSecurityAUncategorized cost: 2 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -571,6 +587,7 @@ category: JobsSecurityAUncategorized cost: 1 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -588,6 +605,7 @@ category: JobsSecurityAUncategorized cost: 1 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -602,6 +620,7 @@ category: JobsSecurityAUncategorized cost: 3 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -619,6 +638,7 @@ category: JobsSecurityAUncategorized cost: 3 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -633,6 +653,7 @@ category: JobsSecurityAUncategorized cost: 1 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -650,6 +671,7 @@ category: JobsSecurityAUncategorized cost: 1 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -664,6 +686,7 @@ category: JobsSecurityAUncategorized cost: 2 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -681,6 +704,7 @@ category: JobsSecurityAUncategorized cost: 2 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons @@ -695,6 +719,7 @@ category: JobsSecurityAUncategorized cost: 5 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterDepartmentTimeRequirement department: Security @@ -712,6 +737,7 @@ category: JobsSecurityAUncategorized cost: 5 canBeHeirloom: true + guideEntry: SecurityWeapons requirements: - !type:CharacterItemGroupRequirement group: LoadoutSecurityWeapons diff --git a/Resources/ServerInfo/Guidebook/LoadoutInfo/Security/SecurityWeapons.xml b/Resources/ServerInfo/Guidebook/LoadoutInfo/Security/SecurityWeapons.xml new file mode 100644 index 0000000000..f52a7f14ca --- /dev/null +++ b/Resources/ServerInfo/Guidebook/LoadoutInfo/Security/SecurityWeapons.xml @@ -0,0 +1,54 @@ + + # Security Duty Weapons + + ## Foreword + While firearms of all varieties are incredibly common across known-space, the NanoTrasen Corporation does not permit + individuals without proper licenses to carry weapons onboard its stations. [color=#a40000]Carrying any weapon on NanoTrasen property + without proper authorization is a crime.[/color] The following job positions are assumed to be properly licensed and permitted to be armed: + + - [color=#a40000]All Security personnel[/color]: without any restrictions. + - [color=#4169e1]All NanoTrasen command staff[/color]: without any restrictions. + - [color=#228b22]Bartending personnel[/color]: Limited only to long-arms such as rifles and shotguns. Additionally, they may only be equipped with less-than-lethal ammunition. + - [color=#e2725b]Salvage personnel[/color]: Lethal weapons usage is permitted for those whom are expected to perform tasks that involve significant risk to life and + limb, such as ship breaking or planetary expeditions. + + ## What are Duty Weapons? + + + + + + + + Security characters are classified as Private Armed Security. As Private Armed Security, + they are entitled via special training and licensing to be equipped with lethal weaponry in their daily work. + Such weapons serve the purpose of protecting corporate assets, such as the Station or its Crew. + + This key piece of job equipment, typically a handgun of some variety, is called a "Duty Weapon" when used in the context of armed security work. + Duty Weapons are usually issued to the officer by their employer directly, but are not necessarily ones provided by the corporation. + In order to save money on equipping their station security, corporations typically allow security staff to buy appropriate firearms using their own paycheck. + + Any firearm that is listed without cost may be assumed to be provided by NanoTrasen directly. However for Duty Weapons that cost loadout points, + the assumption is different. These weapons are assumed to be owned by the security officer themself, and thus are a private possession of that + individual which was bought using their hard-earned paycheck. + + ## Why does this list include weapons typically used by Syndicate agents? + + + + + + + + Across known-space, there exist many corporations both large and small whom manufacture firearms for the consumer markets. A majority of all firearms + on the market are generic models that can be produced by anyone with the right equipment. As a result, the universe is full of weapons whose origin cannot + be readily traced to any one particular corporation. Companies like NanoTrasen will typically establish business deals with some manufacturers to supply their + security forces, but nothing compares to the cost savings that can be found by letting private security buy their own weapons. + + Firearms like the Mk58 are incredibly popular with corporations like NanoTrasen due to their astoundingly low cost. + Yet, the Mk58 is often reviled by security workers all across known-space. When given a choice, security workers will likely purchase + firearms that they actually like, or are more desirable to carry in their day-to-day work. Weapons such as the Viper may be used as a relatively + affordable option for officers looking to pack just a little bit more punch. Revolvers such as the Python are incredibly popular with security workers, + especially those that have a large and intimidating frame. + + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml new file mode 100644 index 0000000000..880139b55f --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml @@ -0,0 +1,115 @@ + + All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Einstein_Engines with some modifications. + + # Einstein Engines + + - [bold]Slogan:[/bold] [italic] Lead by our history, leading our future[/italic] + - [bold]Headquarters:[/bold] Harmony City, Luna, Sol + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Sol Common, Tradeband + - [bold]Official Colours:[/bold] [color=#777700]Olive Green (#777700)[/color], [color=#637C65]Sage Green (#637C65)[/color], [color=#DFE4ED]White (#DFE4ED)[/color], [color=#AB6F19]Orange (#AB6F19)[/color] + - [bold]Founded:[/bold] 2155 by the Standard Sol Calendar. + - [bold]Founder:[/bold] Zhong Hu + + Founded in Sol during the 2100s, Einstein Engines is a trans-stellar megacorporation that focuses on both warp travel technology and robotics, + and is said to have a monopoly on the former. Headed by the cutthroat Noelle Lopez-Zhang, Einstein Engines has found itself having been through + a combination of rigorous technological improvements in their warp drive designs that have found the megacorporation at an advantage due to the shortages of Phoron + across the Orion Spur, as well as careful expansion and dominance within the now collapsed Solarian Alliance. + Considered an antagonist to the goals of the Stellar Corporate Conglomerate, + Einstein Engines has managed on multiple occasions to outperform the corporations beneath its banner and continues to improve as each day passes. + + ## History + + Einstein Engines originated as a conglomerate of various aerospace companies who shared a joint research project for extrastellar travel. + As the project came into fruition, it was realized it would have immense consequences for the human race. + In the year 2130, a sustained, stable warp interface was formed. This development served to catapult the conglomerate to be a dominating economic + power across Sol. Their warp technology revolutionized space travel and led to the construction of micro-g orbital industrial stations around the equator. + This boom in industrial capabilities led to the great expansion of humanity across space. Warp-enabled probes traveled to nearby systems, + finding habitable worlds scattered across space. The power of Einstein Engines continued to grow throughout the following centuries, + eclipsing other interstellar corporations; however, this expansion was not to last. + + In 2417, a relatively young corporation, Nanotrasen, discovered a previously unknown material known as Phoron, + a substance with incredible energy density, far beyond that of conventional fusion or fission. + This energy source, along with the advent of the Skrell experimental, though superior, Bluespace drives burst the unending growth bubble of Einstein Engines. + As Nanotrasen grew into the present-day superpower it is, Einstein Engines fell inwards. Major restructuring was done to save the company, + leading to its modern form. + + Today, Einstein Engines still holds a significant power base despite the losses in the first half of the 25th century. + Continuing to serve its market, Einstein Engines produces many important spaceship components and continues to contend + with Nanotrasen over the efficiency of their different marques of Bluespace engine. The two giants awkwardly co-exist in human space, + with multiple copyright and trademark lawsuits bouncing between them on a monthly basis. + + As the phoron crisis began to worsen the conflict between Nanotrasen and Einstein Engines only began to heat up, + with EE managing to successfully defend itself against NT in a massive legal battle, as well as purchase the Biesel city of + Phoenixpoint from NT, with EE planning a massive restoration of the city. Due to their conflict with NT + Einstein Engines has elected not to support or join the SCC, being famously the only of the major megacorporations not to do so. + + To fight against the consolidation of power between the other major megacorporations with the establishment of the + SCC Einstein Engines has begun to seek trade partners in areas outside the influence the SCC, most notably the Nralakk Federation, + with EE managing to secure a contract to establish their Qerrbalak Branch. + + ## Influence + Einstein Engines wields considerable influence within the Sol Alliance, being founded more than three hundred years ago. + Its established reputation in the manufacturing of ship components and warp technology has solidified its place, + allowing it to survive as other corporations such as NanoTrasen continue to expand rapidly across the Spur. + Outside of the Sol Alliance, Einstein has made some progress in Tau Ceti with its recent acquisition of Phoenixport + and is currently revitalising the city as part of its plans for future operations within the system. + Einstein Engines has also made leeway with the Nralakk Federation and their Special Economic Zones, + winning the Qerrbalak contract over NanoTrasen and establishing a branch office there. + Despite its smaller operational scope compared to other megacorporations, + its marketing of warp technology as a safer and more cost-effective alternative to bluespace travel, + combined with its reputation as a reliable manufacturer, has allowed the company to have at least some influence across most of human space. + + The megacorporation also holds considerable sway in the field of artificial intelligence. + Although its competitors would never admit it, Einstein Engines consistently produces the most advanced positronic brains, + with many of their models surpassing and eclipsing that of other companies. + Furthermore, they remain the second-largest producer of positronic brains in the Spur, + providing for customers in the Sol Alliance as well as the Coalition. + The company also has lucrative defence contracts with the Sol Alliance, not only providing AI and engines for the Sol Navy but IPCs as well, + serving in both combat and non-combat roles. With relations between the Conglomerate and the Alliance at a record low, + Einsteins hold over the market can only grow. + + ## Internal Reputation + + Despite the common beliefs in the Republic of Biesel, the megacorporation is deemed as a fair employer with plenty of benefits, such as a full health plan, including dental care, and up to two weeks of vacation per year. Company cars are a common benefit amongst most members above a certain rank, and a healthy fraternal work environment is promoted. Those individuals that have worked with Nanotrasen before their employment in Einstein Engines will often quote these benefits as their main reason to change companies. + + While some may say that these features are due to the progressive work laws in the Sol Alliance, the standard was set by Einstein Engines shortly after a bonanza period, following the discovery of the warp engine. For Einstein Engines, their employees require to have their necessities covered so they can be happier and more productive. + + In the 25th century, the megacorporation has seen some setbacks due to the new phoron travel. As a consequence, the salaries remain more or less on par with those of their competitors, despite traditionally being higher. Nevertheless, the opportunity to grow inside the company and multiple bonuses offered per month, if a job is done right, still make up for these losses. + + ## Positronics and Einstein Engines + + Einstein Engines is one of the largest manufacturers of positronics within the Spur through their subsidiary Terraneus Diagnostics, the original creators of the positronic brain complex and shell IPC frame who maintains a large market share of both with a focus on the higher end of quality. + + Einstein Engines makes extensive use of synthetics within its corporate structure, however, synthetics are barred from holding leadership roles, be it that of managers in corporate facilities or commanders onboard corporate ships. Instead, synthetics are largely seen as tools to be used by organic employees. This attitude stems from Einstein Engines' heavy involvement with the Sol Alliance, as their view on synthetics is identical to that of the Alliance government. The company makes use of their own high end shell frames and cheaper, more available baseline frames primarily, though others are occasionally bought from other megacorporations. + + Synthetics owned by Einstein Engines are normally worked to the limit within their assigned position and are expected to greatly outperform organic employees due to their cost, and punishments such as memory wipes, retooling or scrapping are always on the table. That being said, Einstein Engines pursues a “quality over quantity” philosophy with their IPC, only using harsher methods such as memory wipes for repeat offenders. The company views the experience an older IPC might gain as having a value of its own. + + Freedom is only offered to synthetics in areas that require it to be an option, such as Biesel or Konyang, otherwise, they will be offered no legal chance at achieving it by the company and scrapping is often used to retire synthetics rather than selling them, although special treatment is given to its close partners and employees, who are often approached with an offer first. Attempts of synthetics to escape to freedom are not unheard of within the corporation, and those caught are immediately scrapped as punishment. + + It is expected for Shells owned by Einstein Engines to use simple one or two syllable first names such as “Joe” or “Robert” whilst other frames used by the company use the name format “EES-(Name/Designation)” where “EES” stands for Einstein Engines Synthetic. + + # Relations to Other Corporations + + ## Hephaestus Industries + Einstein is a major competitor for Hephaestus in the field of IPC manufacturing - in spite of this, however, the two megacorporations have long had a close working relationship, particularly in the Solarian shipbuilding industry. Many Hephaestus-manufactured civilian and military vessels in Sol are equipped with Einstein-made warp drives, especially after the refitting of the Solarian Navy to the Suzuki-Zhang Hammer Drive. If Hephaestus's membership in the Stellar Corporate Conglomerate has been a source of tension between the two megacorporations, little sign of this has been shown openly, with the industrial giant continuing to work with Einstein on many of its Solarian assets. Rumors of Einstein providing ships and weaponry to groups such as the Exclusionists in the region around Burzsia - or of Hephaestus-backed privateers targeting Einstein vessels in the former Human Wildlands - remain only rumors, and have had little impact on the two companies' shared business. + + ## Idris Incorporated + Idris and Einstein have a generally positive relationship, with little need for competition. The vast majority of Idris-owned Shell IPCs are manufactured by Einstein, and their robotics division has allegedly developed several enhanced combat modifications for higher-end Idris Reclamation Units. Idris vessels tend to favor Einstein-produced warp drives over NanoTrasen-produced bluespace drives, with the exception of some of their higher-end security vessels and luxury yachts which advertise speed of travel as a major bonus. Following Solarian nationalization efforts, Idris and Einstein are the two most influential corporations in the Alliance, with Idris having paid high fees to avoid nationalization of its assets. This has given the two corporations a mutual goal - maintaining their own prominence in Solarian affairs, and ensuring that future anti-corporate legislation remains directed at their rivals. Einstein and Idris have both heavily invested in their own PR within the Alliance, remaining invested in Sol's future development. + + ## NanoTrasen + NanoTrasen and Einstein have been rivals for decades, since the discovery of phoron in 2417 and the subsequent invention of the bluespace drive. As bluespace largely superseded warp as a means of faster-than-light travel, NanoTrasen's power rose as Einstein's waned. Since then, the two companies have been fierce competitors, contending in court constantly over various trademarks, patents, and other legal issues. The phoron scarcity beginning in 2462 has led to a reversal of fortunes, with Einstein rising massively in prominence as NanoTrasen's power fades - leading NanoTrasen to spearhead the formation of the Stellar Corporate Conglomerate to attempt to combat their old rivals. The two corporations continue to clash to this day, with Einstein having found a foothold in the city of Phoenixport, Biesel - setting up shop in the heart of NanoTrasen's power. Though Einstein holds the clear advantage for now, NanoTrasen has worked tirelessly to try and slow the meteoric growth of their rival corporation - so far, to little effect, as phoron prices continue to rise and NanoTrasen stock prices continue to fall. + + ## Orion Express + Einstein Engines and Orion have had little in the way of a working relationship, with the shipping corporation being formed largely from assets of their rivals at NanoTrasen. Einstein has reportedly advocated extensively for subjecting Orion to the same nationalization as faced by the other SCC corporations in the Sol Alliance - though so far to little effect, as Orion continues to operate freely within Solarian space. Outside of Sol, however, Einstein makes frequent use of Orion's shipping services, particularly within the Republic of Biesel and the Nralakk Federation - two nations where Orion is able to transport goods far more freely than Einstein. + + ## Zavodskoi Interstellar + Einstein Engines and Zavodskoi have a fairly neutral relationship - though the two do compete in the robotics sector, Zavodskoi has purchased many Einstein-made warp drives for its vessels over the years, and the two have both had generous supply contracts with the Solarian military in the past. In the modern day, Zavodskoi has lost a great deal of these contracts, while Einstein continues to hold many highly valuable government and military contracts - a factor which contributed to Zavodskoi's withdrawal of much of its Solarian business. In spite of this, it continues to purchase warp drives from Einstein frequently, due to the rising cost of phoron fuel and the easy availability of helium-3 from Zavodskoi's new home in the Empire of Dominia. + + ## Zeng-Hu Pharmaceuticals + The relationship between Zeng-Hu and Einstein is a generally positive one, with the two corporations cooperating extensively in several areas of mutual interest - their operations on the planet Konyang and mutual desire for expansion within the Nralakk Federation being the most noteworthy among these. Though Zeng-Hu's membership in the Stellar Corporate Conglomerate and Einstein's growing power within the Sol Alliance has led to a level of distrust between the two, their relationship has remained largely solid since the beginning of the phoron shortage. In 2466, Einstein and Zeng-Hu were both called upon by the government of Konyang to deal with the rampancy crisis, with Zeng-Hu's involvement leading to the wider Conglomerate working to address the problem. + + ## Spinward Fringe Syndicate + Despite sharing a common enemy in NanoTrasen, there is no love lost between Einstein Engines and the Syndicate. The Syndicate perceives Einstein Engines to be + not significantly different from NanoTrasen. The Syndicate believes that were Einstein Engines to gain a significant advantage over NanoTrasen, fate has it + that Einstein Engines would be the Syndicate's primary target instead. Einstein in turn views the Syndicate as a force fundamentally incompatible with their business dealings. + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml new file mode 100644 index 0000000000..4e3e3fed3e --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml @@ -0,0 +1,5 @@ + + All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Hephaestus_Industries with some modifications. + + # Hephaestus Heavy Industries + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + diff --git a/Resources/ServerInfo/Guidebook/Lore/SettingLore.xml b/Resources/ServerInfo/Guidebook/Lore/SettingLore.xml new file mode 100644 index 0000000000..1da8edc187 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/SettingLore.xml @@ -0,0 +1,3 @@ + +Temporary Document, to be filled with information + From 2a8bf58dfc61f24796a55940e4a7ab6be3ced3ec Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 30 Nov 2024 19:32:08 -0500 Subject: [PATCH 05/24] Finally Done --- Resources/Locale/en-US/guidebook/lore.ftl | 13 +++++ .../Clothing/OuterClothing/hardsuits.yml | 22 +++++++ .../Clothing/OuterClothing/wintercoats.yml | 8 +++ .../Loadouts/Generic/outerClothing.yml | 4 ++ .../Lore/Corporations/Corporations.xml | 2 +- .../Lore/Corporations/EinsteinEngines.xml | 1 + .../Corporations/HephaestusIndustries.xml | 51 ++++++++++++++++ .../Lore/Corporations/IdrisIncorporated.xml | 58 ++++++++++++++++++- .../Lore/Corporations/NanoTrasen.xml | 53 ++++++++++++++++- .../Lore/Corporations/OrionExpress.xml | 54 +++++++++++++++++ .../PrivateMilitaryContractingGroup.xml | 38 +++++++++++- .../StellarCorporateConglomerate.xml | 44 +++++++++++++- .../Corporations/ZavodskoiInterstellar.xml | 50 +++++++++++++++- .../Corporations/ZengHuPharmaceuticals.xml | 47 ++++++++++++++- 14 files changed, 438 insertions(+), 7 deletions(-) create mode 100644 Resources/Locale/en-US/guidebook/lore.ftl create mode 100644 Resources/ServerInfo/Guidebook/Lore/Corporations/OrionExpress.xml diff --git a/Resources/Locale/en-US/guidebook/lore.ftl b/Resources/Locale/en-US/guidebook/lore.ftl new file mode 100644 index 0000000000..596dceaf19 --- /dev/null +++ b/Resources/Locale/en-US/guidebook/lore.ftl @@ -0,0 +1,13 @@ +guide-entry-setting-lore = Setting Lore +guide-entry-corporations = Corporations +guide-entry-einstein-engines = Einstein Engines +guide-entry-hephaestus-industries = Hephaestus Industries +guide-entry-idris-incorporated = Idris Incorporated +guide-entry-nanotrasen = NanoTrasen +guide-entry-orion-express = Orion Express +guide-entry-private-military-contracting-group = Private Military Contracting Group +guide-entry-stellar-corporate-conglomerate = Stellar Corporate Conglomerate +guide-entry-zavodskoi-interstellar = Zavodskoi Interstellar +guide-entry-zeng-hu-pharmaceuticals = Zeng-Hu Pharmaceuticals + +guide-entry-loadout-info-security-weapons = Security Weapons diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index bb4aedcb5d..d197632990 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -60,6 +60,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitAtmos + - type: GuideHelp + guides: [ HephaestusIndustries ] #Engineering Hardsuit - type: entity @@ -94,6 +96,8 @@ clothingPrototype: ClothingHeadHelmetHardsuitEngineering - type: StaminaDamageResistance coefficient: 0.75 # 25% + - type: GuideHelp + guides: [ HephaestusIndustries ] #Spationaut Hardsuit - type: entity @@ -123,6 +127,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSpatio + - type: GuideHelp + guides: [ HephaestusIndustries ] #Salvage Hardsuit - type: entity @@ -154,6 +160,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSalvage + - type: GuideHelp + guides: [ HephaestusIndustries ] #Paramedic Voidsuit - type: entity @@ -185,6 +193,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitVoidParamed + - type: GuideHelp + guides: [ ZengHuPharmaceuticals ] - type: entity @@ -217,6 +227,8 @@ coefficient: 0.001 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMaxim + - type: GuideHelp + guides: [ HephaestusIndustries ] #Security Hardsuit - type: entity @@ -344,6 +356,8 @@ clothingPrototype: ClothingHeadHelmetHardsuitCap - type: StaminaDamageResistance coefficient: 0.5 # 50% + - type: GuideHelp + guides: [ NanoTrasen ] #Chief Engineer's Hardsuit - type: entity @@ -381,6 +395,8 @@ - type: SupermatterImmune - type: StaminaDamageResistance coefficient: 0.65 # 35% + - type: GuideHelp + guides: [ HephaestusIndustries ] #Chief Medical Officer's Hardsuit - type: entity @@ -406,6 +422,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitMedical + - type: GuideHelp + guides: [ ZengHuPharmaceuticals ] #Research Director's Hardsuit - type: entity @@ -452,6 +470,8 @@ stealGroup: ClothingOuterHardsuitRd - type: StaminaDamageResistance coefficient: 0.75 # 25% as in "shock resistance" :trollface: + - type: GuideHelp + guides: [ NanoTrasen ] #Head of Security's Hardsuit - type: entity @@ -516,6 +536,8 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitLuxury + - type: GuideHelp + guides: [ HephaestusIndustries ] #ANTAG HARDSUITS #Blood-red Hardsuit diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 9ae3d3b7d5..c9ba05fcff 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -584,6 +584,8 @@ sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_einstein_engines.rsi + - type: GuideHelp + guides: [ EinsteinEngines ] - type: entity parent: ClothingOuterWinterCoat @@ -595,6 +597,8 @@ sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_hephestus_industries.rsi + - type: GuideHelp + guides: [ HephaestusIndustries ] - type: entity parent: ClothingOuterWinterCoat @@ -628,6 +632,8 @@ sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_bishop_cybernetics.rsi + - type: GuideHelp + guides: [ ZengHuPharmaceuticals ] - type: entity parent: ClothingOuterWinterCoat @@ -672,3 +678,5 @@ sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/corpo_jacket_zeng_hu_pharma.rsi + - type: GuideHelp + guides: [ ZengHuPharmaceuticals ] diff --git a/Resources/Prototypes/Loadouts/Generic/outerClothing.yml b/Resources/Prototypes/Loadouts/Generic/outerClothing.yml index 48e350422e..57f8b35132 100644 --- a/Resources/Prototypes/Loadouts/Generic/outerClothing.yml +++ b/Resources/Prototypes/Loadouts/Generic/outerClothing.yml @@ -151,6 +151,7 @@ id: LoadoutOuterCorporateJacket category: Outer cost: 0 + guideEntry: NanoTrasen items: - ClothingOuterCorporateJacket requirements: @@ -171,6 +172,7 @@ id: LoadoutOuterEeCorporateJacket category: Outer cost: 0 + guideEntry: EinsteinEngines items: - ClothingOuterEeCorporateJacket requirements: @@ -181,6 +183,7 @@ id: LoadoutOuterHiCorporateJacket category: Outer cost: 0 + guideEntry: HephaestusIndustries items: - ClothingOuterHiCorporateJacket requirements: @@ -251,6 +254,7 @@ id: LoadoutOuterZhCorporateJacket category: Outer cost: 0 + guideEntry: ZengHuPharmaceuticals items: - ClothingOuterZhCorporateJacket requirements: diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml index 1da8edc187..92cbf48ac1 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/Corporations.xml @@ -1,3 +1,3 @@ -Temporary Document, to be filled with information + These are just a few of the corporations operating between the Sol Alliance, and the Fringes of Known-Space. diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml index 880139b55f..15d2edea40 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/EinsteinEngines.xml @@ -9,6 +9,7 @@ - [bold]Official Colours:[/bold] [color=#777700]Olive Green (#777700)[/color], [color=#637C65]Sage Green (#637C65)[/color], [color=#DFE4ED]White (#DFE4ED)[/color], [color=#AB6F19]Orange (#AB6F19)[/color] - [bold]Founded:[/bold] 2155 by the Standard Sol Calendar. - [bold]Founder:[/bold] Zhong Hu + - [bold]Notable Branches:[/bold] Taipei Engineering Industrial, Terraneus Diagnostics Founded in Sol during the 2100s, Einstein Engines is a trans-stellar megacorporation that focuses on both warp travel technology and robotics, and is said to have a monopoly on the former. Headed by the cutthroat Noelle Lopez-Zhang, Einstein Engines has found itself having been through diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml index 4e3e3fed3e..44d1e7a7d3 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/HephaestusIndustries.xml @@ -2,4 +2,55 @@ All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Hephaestus_Industries with some modifications. # Hephaestus Heavy Industries + + - [bold]Slogan:[/bold] [italic]The anvil on which the world is shaped[/italic] + - [bold]Headquarters:[/bold] Cua Song, New Hai Phong, Sol Alliance + - [bold]Official Languages:[/bold] Freespeak, Tau-Cetic Basic, Sol Common, Sinta'Unathi + - [bold]Official Colours:[/bold] [color=#ab6f19]Orange (#ab6f19)[/color], [color=#263e23]Green (#263e23)[/color] + - [bold]Founded:[/bold] 2137 by the Standard Sol Calendar. + - [bold]Founder:[/bold] Robert Claremont + - [bold]Notable Branches:[/bold] Xion Manufacturing Group, notable alliances with the Izweski Hegemony. + + Hephaestus Industries is one of the most prominent megacorporations within the Orion Spur. They are responsible for a large majority of the trans-stellar factions manufacturing capabilities, having facilities in the Coalition of Colonies, Republic of Biesel, Izweski Nation, and several other frontier colonies. They have managed to secure themselves a stable foundation, continually growing even in the face of the Solarian Collapse, Phoron Scarcity, and the supposed inevitable economic recession that stares the Orion Spur in the face. They make considerable contributions to the field of robotics, as well as starship research and development. + + ## History + + Originally founded in the year 2137, seven years after the advent of Warp technology, Hephaestus Aeronautics was formed out of a conglomeration of several failing aerospace companies. They combined their assets and expertise in an attempt to retain a niche in the FTL market. With humanity in a growing state of expansion and exploration, Hephaestus profits by designing and selling warp drives, with heavy competition between themselves and Einstein Engines. + + When the Second Great Depression struck in 2260, Hephaestus had no other option than to file for many massive bailouts. Barely saving their company from the pit of bankruptcy, they shifted their focus from warp travel to industrialization. As the years passed, they secured more and more industrial centres from many other small producers, both land-based and orbital. Recognizing Hephaestus’s presence along with the growing unrest in the frontier at the time, the Sol Alliance promised them commissions for providing them with machines of war; starships, arms, and armour. Hephaestus gladly obliged. Every handful of years, another smaller production company, and their assets are seized by Hephaestus. By 2400, Hephaestus Industries had become the number one producer in all of the inner colonies, owning almost one hundred percent of the heavy industry. Owning two gargantuan orbital factories in the Sol system, and another under construction in Tau Ceti, it was clear who the industrial powerhouse of Humanity was. Nanotrasen was quick to step up to the plate, however, and when they claimed the rights to the Romanovich cloud and discovered the pivotal resource Phoron, Hephaestus was forced to find another avenue of profit once again. + + After the discovery of the Skrell, and the introduction of artificial intelligence, Hephaestus began shifting its research focus from mineral processing and engine design to robotics. Dedicating several research stations to this project resulted in their facilities, mainly their factories, being overhauled to remove unnecessary systems and make way for streamlined central intelligence cores, as well as dedicating several lines of production to the creation of commercialized workforce robots. + + After the discovery of the Unathi, and the ascension of the Izweski Nation to the galactic stage, NanoTrasen as a corporation withdrew from the fledgling nation state, focusing instead on matters closer to humanity. Hephaestus filled this vacuum left by NanoTrasen, becoming the only Megacorporation to have a Hegemonic Guild Charter, which allowed them to operate within the nation. After years of floundering attempting to adapt to an antiquated feudal system of guilds used by the Hegemony, Hephaestus eventually stabalized, having adapted to the Guild system with the help of Yukal T’zakal, who was at the time sector administrator for the Hegemony. Slowly but surely the corporation worked its way into influencing the nation, until in 2465, in the midst of the phoron scarcity, it played its winning hand. Bailing out the rest of the Hegemonic Guilds in exchange for them becoming subsidiaries of Hephaestus Industries, the megacorporation gained a monopoly over the economy of the small nation, all while still in the name of helping it. + + The unveiling of the Stellar Corporate Conglomerate saw Hephaestus Industries as one of its prominent members, being the backbone of the colossal interstellar corporation’s heavy industry and adding to its fleets through Hephaestus Industries’ massive industrial division - however, the lack of cooperation with Einstein Engines has reduced productivity and forced the megacorporation to work with NanoTrasen and Zavodskoi Interstellar to recreate sub-light, warp drives and bluespace drives with diminished efficiency. + + Today, Hephaestus Industries is the largest provider of heavy industry for the Orion Spur, led by the charismatic and firm CEO Titanius Aeson. From New Hai Phong to Burzia, and now all the way to Tret, their factories ceaselessly work, constantly producing anything and almost everything used in the modern day. They are also supported by an advanced robotics division that produces new technology for artificial intelligence and commercialized robots for the working and military world. Recently, Hephaestus Industries has pledged to bring forth another wave of colonization of the frontier and promises support for struggling colonies. This isn’t coming from the bottoms of their hearts, of course. These colonies would be bound to provide resources to Hephaestus in trade for the company’s support. + + ## Influence + + Hephaestus Industries is the largest blanket commodity manufacturer in the known universe. Its reach extends across the Orion Spur and virtually all modern, and often antique, utilities owe their creation to it. It is the most sought-after fabricator of heavy-duty industrial equipment and starships. + + The sheer power of Hephaestus’s Influence can be seen most clearly in the Izweski Nation where Hephaestus has a stranglehold monopoly over the nation's economy, being the only legal exporter and importer, as well as holding all the Izweski Nation’s production in it’s fist. Everything that requires more than feudal peasants to produce, maintain, or construct is operated by Hephaestus Industries and its subsidiary companies. + + With Aeson's rise to the forefront, Hephaestus Industries as a workforce is the embodiment of the common worker, the family man, and loyalty to the company like a second family. As such, they are inclusive to every species, welcoming anyone willing to join the family, while "rewarding" hard and gritty work typically delegated to species besides humans and Skrell: these species are usually put in supervisory and logistics roles. Despite this, the intense loyalty of Unathi as a species and their strong sense of honor and family have made them quick favourites among the company, lending them to a rise of their own. Regardless of where you work, expect a generous benefits package in return: paid vacation time, sick leave, company insurance for on- and off-site protection, and a myriad of more localized items. + + The corporate structure works to the benefit of employees as well. Those that buy stock in the company and work from within, regardless of position, not only should expect the typical dividends that come with it, but also increased benefits that come on top of existing ones. Hephaestus is almost seen as a marvel when it comes to this. Supervisors often play up the worth of these shares and actively talk about them in more casual settings, authorizing an atmosphere of encouraging workers to buy into the company. The result is a single stock being worth much more than it probably is— and being unobtainable for most people on the bottom rung of the corporate ladder. + + Hephaestus is not without its flaws, however. Their generosity is often weaponized against its workers, claiming that disloyalty to the company is its biggest enemy. Supervisors actively encourage people to rat out others trying to unionize or otherwise undermine the company to encourage loyalty on the foreman's floor. Similarly, those found talking about the "Himeo" or "New Hai Phong Problems" typically find themselves summarily fired with a meagre severance package. Despite this, or perhaps because of all of this, they remain one of the largest and influential corporations in the Orion Spur. + + Additionally, Hephaestus has begun to score a nasty reputation as being the most destructive corporation for planet ecosystems. Himeo being perhaps the most egregious example, this megacorporation is willing to go to whatever ends it requires in order to keep the rust belt rolling. Other planets that find themselves catching up to this state of affairs include New Hai Phong, Eridani I, Burzsia, and more recently, Ouerea. Yet many more are finding their way towards being a new smog-covered member of this factory family. To make matters worse, Hephaestus gives little regard to the people of the planet in these positions outside of the company; Eridani I's denizens have to buy their own filtered air and masks when traversing the surface, and New Hai Phongers typically claustrophobia and asthma from the overcrowded and terrible air conditions on the planet. + + To put things simply, Hephaestus Industries is a unique case among corporations where respect and loyalty play a major role in climbing the ranks. One must earn their ties by ratting out others, investing in the company, or otherwise proving their loyalty to make any sort of drastic leap, making it a very linear corporate ladder. The higher ranking an individual is, the older they ought to be, with major executives either being the eldest among them. In this sense, Hephaestus is seen as the sturdiest foundation civilization has ever constructed with so much in the way of trust and age-old wisdom, their simple pursuit of corporate greed has, at least publicly, been long reformed into one of peace and prosperity. + + ## Positronics and Hephaestus Industries + Hephaestus Industries exercises vast authority over the second-hand production of almost all Integrated Positronic Chassis across the galaxy. Its titanic space factories are capable of printing full Positronic frames, although the installation of positronic brains is withheld to dedicated robotics labs. Almost every frame of any design can be contracted to Hephaestus Industries for its construction. Hephaestus Industries can dip its fingers into a huge portion of the IPC population’s lives by merit of financial involvement - Biesellite or otherwise. + + IPCs are present in every level of Hephaestus, from the simple mining unit on Burzsia, to the command decks onboard the Sidirourgeío. IPCs are in a unique position in the company due to their status as their largest producer, their tightly-knit corporate culture, and the large amount of Unathi employed by Hephaestus. Treatment of IPCs varies heavily depending on the local circumstances; for instance, in Biesel, a synthetic can achieve freedom after a long period of service, in accordance with that system’s law. On the other hand, a synthetic stuck in Burzsia may be constantly reset and owned until it eventually gets destroyed. The most common similarities are that IPCs are made to work very hard, expected to surpass their organic counterparts due to their natural advantages. + + In terms of assignment, they are often placed in one field and perform the associated jobs and tasks until they are sold, become free, or get destroyed. Reassignment may occur, typically when an urgent position needs to be filled. IPCs that gain their freedom are often offered their old jobs if the company deemed their performance while owned satisfactory, enticing them with maintenance and other such benefits. Renter Max and other Hephaestus IPCs are shining examples of IPCs who have overcome the challenge of survival. Positronics that rise to essential or high-ranking positions in the company are often treated with more equality by their organic counterparts. This can be owed to Hephaestus’ competitive, free-for-all environment and corporate ladder. + + Positronics working for Hephaestus Industries and their subsidiaries typically have Manufacturer Agents. A manufacturer agent is a designated business affiliate who monitors the IPCs in question and submits maintenance requests under a lifetime warranty which comes with all multi-million credit IPC purchases. Owned IPCs frequently benefit from this warranty, especially productive ones - seeing the swift response and mechanical assistance for breakdowns. Most Manufacturer Agents are known personally by these positronics and are often synthetics themselves. Although the lifetime warranty is theoretically available for all IPCs, limited resources mean executives are often forced to pick and choose who receives maintenance. Whereas some less notable IPC would receive the deathly response time of weeks to their warranty reports, some noteworthy or more productive one is likely to receive it instantly. Although bias in the system exists, an effective IPC reflects well on its manufacturer agent, accordingly, they are less likely to request urgent repairs or repairs that they feel are unearned. This system results in an easy way to weed out the less accomplished, and even those engaging in nepotism. After all, these warranties do not cover total reconstruction - and a disabled, unproductive IPC is one less to repair. + + Previously restricted to owned units, this system has been extended to free IPCs working for Hephaestus Industries itself, with positronics working for the Stellar Corporate Conglomerate having the option to apply for a lifetime warranty. Although maintenance is almost guaranteed, the wait times are ruinous, with free IPCs expected to work even harder than their counterparts to receive similar treatment. They are also required to handle the paperwork themselves, showing up in person at Hephaestus facilities for a chance at receiving repairs. diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml index 1da8edc187..5c2392b924 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/IdrisIncorporated.xml @@ -1,3 +1,59 @@ -Temporary Document, to be filled with information +All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Idris_Incorporated with some modifications + + # Idris Incorporated + + - [bold]Slogan:[/bold] [italic] Astronomical Figures. Unlimited Power[/italic] + - [bold]Headquarters:[/bold] Abidjan, Ivory Coast, West African Union, Earth, Sol Alliance + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Tradeband + - [bold]Official Colours:[/bold] [color=#3A6F6F]Teal (#3A6F6F)[/color], [color=#00d1d4]Cyan (#00d1d4)[/color], Black (#1e2221), [color=#E0F0F0]White (#E0F0F0)[/color] + - [bold]Founded:[/bold] 2152 by the Standard Sol Calendar. + - [bold]Founder:[/bold] William Idris + - [bold]Notable Branches:[/bold] Celestial Cruises, Caishen Jewellers, Le Soleil Royal + + Idris Incorporated is an interstellar corporate bank headquartered in the Sol Alliance, though after the Solarian Collapse its branch in the Republic of Biesel has grown to become its most prominent base of operations. Representing the largest banking institution in the Orion Spur, they hold a practical monopoly over banking and financial services throughout human space. Idris financial advice is regarded by millions of businesses as something short of divine guidance, the bank able to predict, influence and even control the flow of stock markets in Sol and beyond, power frequently used to bend situations and create favourable openings. Since providing secure credit storage for individuals, corporations and governments alike require a robust security presence, Idris fields one of the largest private security forces spread throughout its vast number of facilities, vaults, banks and commercial establishments. To that end, a sizable synthetic division has been developed to reinforce and partake in various activities, most notably debt reclamation. + + Furthermore, the company manages a number of luxury product chains, hotels and high-class entertainment centres in a multitude of worlds across the Spur, expanding their clientele and becoming the go-to provider for powerful and influential elites of all calibres and tastes. + + ## History + Idris Incorporated was founded in the Ivory Coast by the American-Ivorian investor William Idris in 2152, as pressure grew for a secure way to store credits and have them transferable across solar systems. Idris Trust was, at the time, one of the few banking institutions that offered interstellar services based in Sol, making them one of the most experimental, yet immensely convenient choices for business firms. Idris Trust was one of the first corporations to expand its base of operations to the extra-Solar colony of the Eridani Federation, contributing to a gradually-expanding trans-stellar range. + + Biesel's growing urbanization in the 2190s and beyond led to an increase in the personal wealth of its population. Many of these wealthy citizens were climate refugees from Earth, or high-ranking executives looking to carve out a piece of the newly-settled planet for themselves. NanoTrasen, Zeng-Hu Pharmaceuticals, and Necropolis Industries had cornered the markets on research and development, while Hephaestus Industries was a giant in the field of shipbuilding. But the migration of the wealthy elite and the relative lack of markets that catered to them led the Idris family to branch into luxury goods and customer service, purchasing several ship manufacturing contracts from Einstein Engines to create a fleet of luxury cruisers and yachts, and prepare their other vessels for shipping other products all over the known galaxy. + + Idris Trust rebranded to Idris Incorporated, meanwhile buying out or absorbing several smaller luxury brands into itself. Its new focuses made it a giant on Luna and Biesel. Through the power of branding, it quickly developed a reputation for legendarily thorough service courses that produced some of the finest chefs and mixologists in human space. All the while, every buyer was encouraged to use Idris banking, which spread across the Spur like wildfire and gave the megacorporation the title of the biggest bank in the known galaxy. + + Prior to the discovery of the positronic brain, Idris was one of the few corporations that eschewed simple robots to assist in service work. The company had managed to secure the loyalty (and fear) of many of its employees by luxurious paychecks or predatory loan contracts, and a point of its advertisement was that it relied on purely human service and no automation. But in the wake of the discovery of the positronic brain in 2407, Idris was one of the first megacorporations to adopt a line of "branded" IPCs, for security, service, and piloting. Still, the company is famed for its top-of-the-line human staff in the service sector, with many acclaimed chefs and mixologists to accompany the high brass on their business trips. + + In the modern day, Idris Incorporated is under the stewardship of the mysterious newcomer Alex Mason, acting as a member of the Stellar Corporate Conglomerate. While Mason seems to hold the reins, the Idris family still hangs behind the scenes, directing the company at their inscrutable and often nonsensical whims. + + The bank has begun offering hiring bonuses to those who work for other major interstellar corporations to draw people away from their competitors. However, they are still in a struggle with NanoTrasen due to its large employee base mainly using the company's bank as their method of storing funds, preventing Idris from having a large number of members. This has strained relationships between NanoTrasen and Idris Incorporated, though the relationship between Alex Mason and Miranda Trasen is allegedly as sunny as ever. + + ## Influence and Reputation + Idris Incorporated exercises authority over seven million major banks spread across human space and beyond, and has come to find itself in virtually every major power's pocket in some form or fashion. While not openly contesting NanoTrasen's net worth, Idris and its services can be found to extend as far as its looming superior can see. + + Idris possesses the financial information of nearly every human in the galaxy, and a significant amount of aliens as well. Because of this, it is an incredibly secretive corporation, and much of the information of its inner operations is behind NDAs given to every prospective employee. Idris employees are forbidden from even discussing their training, and there are rumours the company threatens or bribes those who speak negatively of the company's inner workings or management to keep the corporate image as spotless as possible. Employees who have proven themselves are often well-paid, and all Idris employees are well-trained. + + Behind the glossy, classy exterior, an "Idris loan" is almost universally understood to be a contract which it is incredibly difficult to break out of. Complex legal jargon and long terms of agreement are usually targeted at young, desperate, unfortunate, or all three; the few whispers of Idris' training programs point to them being harsh and exacting, with severe fines if one drops out early. This is to say nothing of the repute of Idris Security and Reclamation Units, who have stories floating around of causing broken bones and severe bruises to debtors. + + Any accusations of dubious conduct tends to fall apart or be settled out of court for ludicrous amounts of money. All the same, Idris' reputation preceeds it, meaning few would have the courage to stand against one of the most powerful megacorporations in the world... if they could find any evidence of it. + + ## Positronics and Idris Incorporated + While Idris rarely permits free IPCs with exemplary histories to be recruited to their service department, the most common positronic presence in the corporate are the "brands" of owned synthetics that operate within the various departments of the company. + + Idris synthetics are usually dressed in the teal and black of the company uniform, and if Shells, are usually distinguishable as non-human by stylized "seams" in the synthetic skin on their face and decorative antennae. On some occasions, they are designed to physically fit in with the populace of the planet they are manufactured on or assigned to. Idris shells usually wear teal makeup, such as facepaint, lipstick, and eyeliner. The chassis colour of non-shell units ranges from cream, to teal, to black. Most commonly, they are programmed with high-class Lunan or Silversun expatriate accents. Organic Idris Incorporated employees in the same field as an Idris unit (for example, a guard to an IRU, or a cruise director to an IAU) are always considered as possessing seniority to the IPC, and are expected to obey the orders of organic personnel except when it directly conflicts with their self-preservation drive, or if it may cause undue loss to the company. + + Idris Incorporated security synthetics are perhaps the most notorious aspect of the corporation; they act as loan sharks and cold, uncompromising asset protection and reclamation units. There are two types of synthetic; Idris Reclamation Units and Idris Security Units. Both kinds are maintained by human handlers, who will often coordinate "departments" of security units. Hierarchy between reclamation and security units is often determined on a case by case basis by the units’ handlers. This ensures orderly and efficient management in environments where IPCs may be without the immediate oversight of their human superiors, such as if the units are shipped to another facility for a contract. + + Both reclamation and security units are carefully monitored by their human handlers and undergo regular check-ins. Uniformity and obedience is expected, where behavior outside the norm often results in loss of any autonomy they may have, or even wiping. Idris Security and Reclamation units are expected to wear the “Idris Unit coat” found in the Loadout under the Xenowear - IPC tab. + + Idris Reclamation Units are Shell frames constructed and programmed to investigate, interrogate, and reclaim securities or assets from a client in arrears. They are also employed for corporate investigative work and can carry out information-gathering on "problematic" or "at-risk" employees. In the interest of carrying out their various directives, Reclamation Units are granted authorization for the usage of "reasonable force" against clients, "reasonable" meaning never trending towards irreparable injury or death. They typically operate in teams of two units, who may have themed names and appearances. Reclamation units are designated by the prefix IRU-[Name]. + + When security is needed for a VIP event or a vessel travelling into dangerous space, Idris Security Units are deployed. Security units are usually baseline or Hephaestus G2 models, though Shells and G1 models exist. These teams are accompanied by a human asset protection manager (who rarely engages directly with a threat), who will command the operation and make note of any lost assets or damages. IPC security teams consist of between 2-6 IPCs per human handler. Security units are designated by the prefix ISU-[Name]. + + Given the sensitive nature of their field, security synthetics are barred from purchasing their freedom, and have their positronic brain wiped when they are sold. Many IRUs and ISUs are sold second hand or loaned out to various corporations who usually utilize them for security or investigation work. + + Almost all service sector Idris IPCs are Shell frames, though some baselines and Bishop frames exist as backline chefs or pilots. They fill a wide variety of roles within Idris' company sector, from acting as bank tellers, to piloting cruise ships and tourism vessels, to serving customers as chefs and bartenders. Idris service units are designated by the prefix IAU-[Name] if a pilot, and ICSU-[Name] if otherwise. + + While it is in theory possible for an Idris service unit to purchase their own freedom, depending on their current stationing, this is incredibly rare and difficult. IPCs stationed in places where their freedom may be purchased are closely watched, and will usually be cycled out at a regular pace or have their contract adjusted to prevent their own purchase with gathered funds. + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml index 1da8edc187..3e29437b47 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/NanoTrasen.xml @@ -1,3 +1,54 @@ -Temporary Document, to be filled with information +All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=NanoTrasen_Corporation with some modifications + + # NanoTrasen Incorporated + + - [bold]Slogan:[/bold] [italic] The leader in all things phoron![/italic] + - [bold]Headquarters:[/bold] Mendell City, Biesel, Republic of Biesel + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Sol Common, Tradeband + - [bold]Official Colours:[/bold] [color=#3d4f66]Navy blue (#3d4f66)[/color], Black (#282828), [color=#dfe4ed]White (#dfe4ed)[/color] + - [bold]Founded:[/bold] 2366 by the Standard Sol Calendar. + - [bold]Founder:[/bold] Xavier Trasen + - [bold]Notable Branches:[/bold] Getmore Corporation, Hazel Electromotive, Ingi Usang Entertainment, Nexus Corporate Security, Five Points Armory. + + Considered the largest megacorporation within the Orion Spur, many will find themselves doing the biddings of NanoTrasen -- be it direct or indirect. Initially a biotechnical research company, it rapidly grew in size after the discovery of Phoron. The corporations monopoly on the resource catapulted it into the limelight, where it has remained for the last forty-odd years. Its acceleration into the spotlight has prompted many prying eyes to uncover evidence of rather questionable actions, with rumours perpetuating that they’ve instigated wars on both Adhomai and Moghes in an attempt to exploit the species for a profit. + + NanoTrasens power has since begun to waver as their ability to supply Phoron dwindled -- resulting in their profit margins diminishing considerably. Whilst the corporation has attempted its best to hide its waning influence, the facade has begun to crumble with scrutinizing individuals being able to see its vulnerability. + + Despite the effects of the Phoron Scarcity on the megacorporation, NanoTrasen has managed to secure itself as a crucial member of the newly-founded Stellar Corporate Conglomerate (SCC) with Miranda Trasen serving as the Acting Director of Operations -- which has managed to bolster the company and secure themselves as the dominant corporate presence within the Orion Spur. + + ## History + Initially founded in 2366, the yet-to-be distinguished NanoTrasen was a small company revolving around genetic research and development on Mars. Xavier Trasen, Chief Executor of Operations for NanoTrasen (as well as its founder) managed to propel the fledgling corporation through the ranks after aggressively utilizing business tactics and effective patenting methods to buyout or destroy the local competition. By the end of the century, NanoTrasen had acquired enough capital to begin their operations on Biesel, even managing to secure mining rights in Tau Ceti. + + It wasnt until the discovery of Phoron in 2417 that NanoTrasen became a household name. The unearthing of the rosy crystals in the Romanovich Cloud, and the subsequent realization of its energy-producing potential, swiftly allowed for NanoTrasen to become a trans-stellar entity. Aggressively exploiting the new resources, as well as continued hostile business tactics, bolstered NanoTrasen’s position within Tau Ceti. Phoron’s capabilities made almost all other forms of travel obsolete, with the unveiling of the Bluespace Drive proving Warp to be slow, useless, and unprofitable in the face of this discovery. + + NanoTrasens newfound wealth was speedily employed to bankrupt, absorb or bribe their way to the top. NanoTrasens power and scope grew exponentially, with all types of assets (stations, facilities, ships) cropping up across the Orion Spur. Within the decade, NanoTrasen had managed to secure themselves as the most powerful megacorporation, with their influence felt almost anywhere. + + The declaration of independence by Biesel in 2452 has had a large impact on NanoTrasen, for the better that is. No longer under the purview or management of the Solarian Alliance, NanoTrasen capitalized on the planet’s vulnerability, successfully inserting themselves into the administration and its governance of the emerging republic. Whilst in recent times NanoTrasen has seen its influence wane slightly, they continue to reign supreme through tactical decisions and positionings. An example of such is its placement of their CEO Miranda Trasen as Acting Director of Operations for the Stellar Corporate Conglomerate. + + ## Influence + NanoTrasen has managed to intrude on all aspects of life, with its apparatus and employees being found in almost every nation-state across the Orion Spur -- be it their manufacturing, research, or orbital facilities. It is almost impossible to not know what, or who, NanoTrasen is in this day and age. Its monopoly on the supply of Phoron within the greater Orion Spur has resulted in controversial behaviour, with NanoTrasen managing to successfully scheme and insert themselves within positions of power, through either bribery or direct buying-out of politicians that hold authority. The Republic of Biesel is a good example of these measures, where it is all but said that NanoTrasen controls the administration of the Republic. + + ## Internal Reputation + NanoTrasen has managed to secure a variety of different work benefits for its employees, a common reason among many of the reasons for their employment with the megacorporation. These benefits go above and beyond the regular salary or wages and include insurance, flexible work schedules and other things. NanoTrasen further solidifies its increased work benefits through further education and training courses offered by the NanoTrasen Academy, with the only clause being to continue being employed at the megacorporation. Additionally, NanoTrasen also offers subsidised dental care. + + # Corporate Relations + + ## Einstein Engines + NanoTrasen and Einstein have been rivals for decades, since the discovery of phoron in 2417 and the subsequent invention of the bluespace drive. As bluespace largely superseded warp as a means of faster-than-light travel, NanoTrasen's power rose as Einstein's waned. Since then, the two companies have been fierce competitors, contending in court constantly over various trademarks, patents, and other legal issues. The phoron scarcity beginning in 2462 has led to a reversal of fortunes, with Einstein rising massively in prominence as NanoTrasen's power fades - leading NanoTrasen to spearhead the formation of the Stellar Corporate Conglomerate to attempt to combat their old rivals. The two corporations continue to clash to this day, with Einstein having found a foothold in the city of Phoenixport, Biesel - setting up shop in the heart of NanoTrasen's power. Though Einstein holds the clear advantage for now, NanoTrasen has worked tirelessly to try and slow the meteoric growth of their rival corporation - so far, to little effect, as phoron prices continue to rise and NanoTrasen stock prices continue to fall. + + ## Hephaestus Industries + NanoTrasen and Hephaestus Industries have never been particularly fierce competitors, with the phoron giant purchasing much of its equipment, vessels and IPC workers from Hephaestus factories. However, as the phoron scarcity continues and NanoTrasen's power wanes, Hephaestus has taken full advantage of their decline. Since the formation of the Stellar Corporate Conglomerate, Hephaestus has greatly expanded its presence in the Republic of Biesel, taking near-complete control of shipping on the moon of Valkyrie and moving its central headquarters to Mendell City. Hephaestus's expansion in the Izweski Hegemony - seizing a near-total monopoly of the kind NanoTrasen once held in Biesel - has allegedly been a source of great concern to NanoTrasen, who are rumored to be funding anti-Hegemony political movements on the planet Ouerea in order to weaken Hephaestus's position within the nation. + + ## Idris Incorporated + NanoTrasen and Idris have never been fierce rivals, though Idris's continued prominence in Sol and its expansion into Biesel has led to tension between the two megacorporations. As Idris expanded its banking operations into NanoTrasen's center of power, NanoTrasen attempted to hold onto their banking business in Tau Ceti, incentivizing its employees to only make use of NanoTrasen banking instead - despite the many advantages that Idris held as a competitor. So far, Idris has been gradually expanding its presence in the Republic's financial sector, with many NanoTrasen employees switching to the use of Idris banks despite their employer's wishes. Idris has begun offering hiring bonuses to NanoTrasen employees in an effort to further weaken their power over Biesel's financial sector, as well as establishing branches in many of the former Solarian worlds of the Corporate Reconstruction Zone, where NanoTrasen holds much less direct influence. Though NanoTrasen has issued little official response to this, Idris transport vessels seem to commonly come under attack by pirates in the Reconstruction Zone, with many speculating the phoron giant is attempting to undermine confidence in Idris's renowned security. + + ## Orion Express + NanoTrasen contributed the most resources to Orion Express's formation, and many of its executives are former NanoTrasen staff. As such, the relationship between the two companies has remained warm, with Orion taking over many NanoTrasen-held supply contracts across the Spur. Orion's continued operation in the Sol Alliance, and the fact that they continue to deal with Einstein Engines, has been a source of tension between the two megacorporations in recent years - but in spite of this, NanoTrasen and Orion continue to work together extensively across the Orion Spur. Though Orion's service industry has become a competitor to NanoTrasen's, this remains a small enough portion of both companies' business that it has not been a source of stress on the close relationship the two megacorporations share. + + ## Zavodskoi Interstellar + Zavodskoi and NanoTrasen maintain a decent relationship, with little open conflict between the two corporations. Since the beginning of the phoron scarcity, however, Zavodskoi has taken full advantage of NanoTrasen's waning power in the Republic of Biesel, expanding its arms industry into the Republic. Since the formation of the Tau Ceti Armed Forces and the negotiation of several new supply contracts with Biesel's government, Zavodskoi has managed to take a great deal of business from NanoTrasen - seizing NT's position as the Republic's main weapons supplier. Though NanoTrasen still holds onto their original contract for the Tau Ceti Foreign Legion, the Minutemen and Republican Fleet are both almost entirely outfitted with Zavodskoi-made weapons, armor, and voidsuits. NanoTrasen has attempted to counteract this influence through the recent appointment of Nathan Trasen as Secretary of Defense - but even with a Trasen in such a prestigious position, Zavodskoi has still managed to secure a solid grasp on the Republic's military industry. NanoTrasen has increased funding to Nexus Corporate Security several times in an effort to use their newly-formed PMC to undermine Zavodskoi's security business in the Corporate Reconstruction Zone, with some measure of success. + + ## Zeng-Hu Pharmaceuticals + Although NanoTrasen and Zeng-Hu work closely together, the two megacorporations have a rocky history. When NanoTrasen began, it was mainly operating in the biomedical field, which Zeng-Hu has historically been the frontrunner in - leading to NanoTrasen being outcompeted at seemingly every turn by the pharmaceutical giant. The discovery of phoron led to a rapid pivot in NanoTrasen's direction, and its many medicinal uses led to Zeng-Hu purchasing large quantities of phoron from NanoTrasen mining operations in the Romanovich Cloud. Despite this, Zeng-Hu CEO Liqin Hsiao-Li is rumored to still hold a grudge against NanoTrasen for their attempts to push into Zeng-Hu's sphere of influence decades ago, even as Zeng-Hu attempts to do the same in Biesel. Though NanoTrasen maintains its grasp on Tau Ceti's healthcare system, having blocked Zeng-Hu's expansions in the Republic's courts, Zeng-Hu has been increasingly expanding their operations in the wider Corporate Reconstruction Zone - having managed to seize the majority of the market share in the medical and pharmaceutical industries outside of Tau Ceti itself. Due to the many medical and pharmaceutical uses of phoron, Zeng-Hu remains one of NanoTrasen's largest purchasers of the increasingly rare element, and is reportedly one of NanoTrasen's closest allies within the Stellar Corporate Conglomerate. diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/OrionExpress.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/OrionExpress.xml new file mode 100644 index 0000000000..7d2da78a6b --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/OrionExpress.xml @@ -0,0 +1,54 @@ + +All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Orion_Express with some modification + + # Orion Express + + - [bold]Slogan:[/bold] [italic]Faster than light.[/italic] + - [bold]Headquarters:[/bold] Mendell City, Biesel, Republic of Biesel + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Tradeband + - [bold]Official Colours:[/bold] Black (#414446), [color=#7a6347]Brown (#7a6347)[/color], [color=#c3c49e]Silver (#c3c49e)[/color] + - [bold]Founded:[/bold] 2464 by the Standard Sol Calendar. + - [bold]Founder:[/bold] Chin-hae Hong + - [bold]Notable Branches:[/bold] Zephyr Shipping Company, Meng Logistics Incorporated, Quick-E-Burger + + Founded in 2464, Orion Express is a manufactured megacorporation designed to handle logistics for the Stellar Corporate Conglomerate in the wake of the phoron scarcity, and the sudden entangling of supply lines that left the Conglomerate struggling for more resources. Its main branch is dedicated to cargo services and transport, but also features a fledgling robotics division mainly focused on industrial synthetics to aid in its logistics missions. The Orion Express is expected to become an integral part of the Stellar Corporate Conglomerate’s future through delivering supplies and merchandise throughout the Orion Spur. + + ## History + The creation of the Stellar Corporate Conglomerate suddenly brought several stations, offices, and installations under the control of a single group. While the megacorporation's supply channels were enough on their own, they were quickly overwhelmed by the sheer space they had to cover. Missing shipments, long delivery times, and overall chaos plagued the transport of goods between the different members of the Stellar Corporate Conglomerate. To solve this glaring issue, the corporations (with NanoTrasen contributing the most resources and manpower) united a portion of their cargo departments into a sole entity in 2464; Orion Express. + + Alongside handling the internal supply lines of the Stellar Corporate Conglomerate, the Orion Express also acquired the duty of delivering corporate goods to its buyers. The megacorporation Extranet shops were merged into one domain; the Orion Express Market. Thanks to this, anyone planning to purchase anything from the Stellar Corporate Conglomerate must go through a supplier who eliminates competition to guarantee maximum profit. Countless workers now toil in multiple warehouses, hangars and ships to deliver the orders in time. No region is too remote for the Orion Express' couriers. + + ## Influence + In spite of its recent unveiling, the Orion Express already wields considerable influence within the Orion Spur. Its fleets are a common sight within the Republic of Biesel, and its Corporate Reconstruction Zone, as well as anywhere with any SCC presence. Outside of these aforementioned zones, its influence is diminished, but has been growing substantially as time passes, the corporation taking steps to worm its way into shipping markets not already dominated by other corporations; mainly been small scale shipping, and shipping to more remote areas of the spur. + + It does this by using Orion Express Automated Stations, common sights all around the Spur; especially in the outer edges of the Coalition and the Frontier, where Orion Express services depends on ordinary people and ships picking up and delivering packages for each other, with Orion Express only delivering to the automated stations and other distribution points. Stations tend to be of the smaller variety, with very few facilities for crew. These stations have caused some friction between Orion and many frontier planets, as the corporation offers its services for vastly inflated prices, as it slowly builds a monopoly over transport of goods to isolated systems. + + ## Internal Reputation + Orion Express is known to employ many unskilled workers in its warehouses, cargo depots, and shipping vessels. The corporation advertises itself to potential employees as a "jumping off point" for those interested in the shipping industry, but lack the qualifications required for higher-level positions or even lower-level positions at other megacorporations in the Spur. + + While Orion Express does not pay as well as the other megacorporations or offer benefits such as overtime pay, employees are compensated by other means; flexible hours and TOIL (Time Off In Lieu) are common benefits provided to all workers. Those in more skilled fields such as machinists or pilots still receive competitive pay, but miss out on some of the benefits working for corporations such as Hephaestus or Zavodskoi provide. Despite this lack of pay and benefits compared to other megacorporations, Orion’s rock bottom hiring standards and recent founding attract people from across the spur who may not have been able to find work with a megacorporation or work at a megacorporation that did not have skeletons in the closet until Orion came along. Many employees have used their positions within Orion to secure livelihoods for themselves they’d be otherwise unable to, and praise the company for it despite its drawbacks, of which it has many, beyond the poor pay and benefits. + + As a result of its tumultuous birth within the SCC, Orion has quickly established a reputation within the Spur for its rapid-fire style of inner management and cohesion. Positions, orders and even salaries can change by the day, all serving to maximize delivery times and costs. To a low-ranking employee, this means a rapidly shifting work environment - to top officials, it means orchestrating a neverending seesaw of “controlled chaos”. Pilots, miners and service workers are given a surprising amount of autonomy to deliver on their orders as fast as possible, which they must, lest they risk being replaced by the countless eager applicants who may have drive and imagination where they lack credentials. Most of the time this is due to heavy demands from the other members of the SCC, who expect quick turnarounds on their orders, and are not afraid to threaten higher-ranking officials within the company. In the end, the leaders of Orion Express are just as fearful of being replaced as their workers are. + + Orion Express tries to promote a work environment that is internally competitive rather than externally, encouraging employees to beat quotas and set personal goals while discouraging interpersonal conflict while working in mixed facilities such as the SCCV Horizon. Since it owes its existence to the rest of the Chainlink, Orion Express’ bottom line is nearly always to support the Stellar Corporate Conglomerate, resulting in an atmosphere that constantly pushes its workers to improve and evolve, at all levels. Orion's policy is to expand into areas that the other megacorporations have little to no presence while avoiding direct competition in places where other corporations have a stranglehold. In the event they have to enter a market dominated by another SCC corporation, such as mining, Orion has a policy of cornering systems/areas that have proven too troublesome for other companies to take. On the surface, most operations seem to be operating at a loss - but in truth, millions of small, independently-led and created projects are what keep Orion Express’ earnings in the green. + + # Corporate Relations + + ## Einstein Engines + Einstein Engines and Orion have had little in the way of a working relationship, with the shipping corporation being formed largely from assets of their rivals at NanoTrasen. Einstein has reportedly advocated extensively for subjecting Orion to the same nationalization as faced by the other SCC corporations in the Sol Alliance - though so far to little effect, as Orion continues to operate freely within Solarian space. Outside of Sol, however, Einstein makes frequent use of Orion's shipping services, particularly within the Republic of Biesel and the Nralakk Federation - two nations where Orion is able to transport goods far more freely than Einstein. + + ## Hephaestus Industries + Despite competition in the mining industry, Hephaestus and Orion have little animosity between them. The two corporations cooperate frequently in the robotics field, as Orion's fledgling robotics division is not believed to be a serious threat to Hephaestus's investment in the same area. Since the formation of Orion Express, the two megacorporations have cooperated frequently in the Republic of Biesel, building several joint factories in orbit of the planet Reade in order to augment production there. Orion mining, however, has cut into Hephaestus's business, though so far this has remained a small detriment to the industrial titan. Prior to the Izweski Hegemony's economic collapse and Hephaestus's subsequent expansion, Orion worked closely with the Unathi Miners' Guild, with many of the Guild's leaders seeing involvement with Orion as a way to remain competitive with Hephaestus within the Hegemony. This arrangement came to an end with Hephaestus's acquisition of the Guild, however, with only those former guildsmen who refused to join Hephaestus still holding positions with Orion - for substantially less pay than before. + + ## Idris Incorporated + Orion and Idris have little in the way of competition - though Orion has expanded into the service sector, they have targeted a very different clientele than Idris aims for. Idris relied on Meng Logistics Incorporated for several deliveries to Silversun prior to the formation of Orion Express, and reportedly advocated for the Stellar Corporate Conglomerate's purchase of the small shipping company in 2463. Orion avoided the wave of Solarian nationalization by formed after the creation of the Solarian Corporate Authority, but Idris has wielded its remaining influence in Sol against the voices pushing for Orion to be subject to the same harsh penalties of the rest of the SCC - ensuring that, at least for now, Orion remains able to operate freely in Alliance space. + + ## NanoTrasen + NanoTrasen contributed the most resources to Orion Express's formation, and many of its executives are former NanoTrasen staff. As such, the relationship between the two companies has remained warm, with Orion taking over many NanoTrasen-held supply contracts across the Spur. Orion's continued operation in the Sol Alliance, and the fact that they continue to deal with Einstein Engines, has been a source of tension between the two megacorporations in recent years - but in spite of this, NanoTrasen and Orion continue to work together extensively across the Orion Spur. Though Orion's service industry has become a competitor to NanoTrasen's, this remains a small enough portion of both companies' business that it has not been a source of stress on the close relationship the two megacorporations share. + + ## Zavodskoi Interstellar + Zavodskoi contributed large portions of its logistics division to Orion Express, and has maintained a decent relationship with the logistics corporation. Though their Solarian business has been scaled back substantially, Zavodskoi still relies on Orion vessels for transport of its goods in the Alliance, and Orion has been known to favor Zavodskoi security when outside force is required for particularly troublesome work. Orion's ties to Hephaestus are the largest source of tension between the two corporations, and Zavodskoi is rumored to have attempted to seed several of its own agents within Orion-Hephaestus joint operations in order to gather intelligence on their rival. + + ## Zeng-Hu Pharmaceuticals + Since the formation of Orion Express, Zeng-Hu has made extensive use of the company's shipping services - Orion's operations within the Sol Alliance and Nralakk Federation proving highly beneficial to the keiretsu. Though Orion does operate in the robotics industry, its robotics division is viewed as insignificant and not posing any real threat to Zeng-Hu's own developments in the field. Many Zeng-Hu products are carried to destinations across the Orion Spur by Orion vessels, and the two megacorporations maintain a strong working relationship across the Spur. + diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml index 1da8edc187..e91fd18996 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/PrivateMilitaryContractingGroup.xml @@ -1,3 +1,39 @@ -Temporary Document, to be filled with information +All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Private_Military_Contracting_Group with some modifications + + # Private Military Contracting Group + + - [bold]Slogan:[/bold] [italic]Always on guard, always on watch.[/italic] + - [bold]Headquarters:[/bold] Eridani III, Epsilon Eridani, Eridani Corporate Federation + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Sol Common, Tradeband + - [bold]Official Colours:[/bold] [color=#b9bdcd]White (#b9bdcd)[/color], [color=#99ccff]Blue (#99ccff)[/color], [color=#3355ff]Dark Blue (#3355ff)[/color], Black (#363c43), [color=#c4a56e]Gold (#c4a56e)[/color] + - [bold]Founded:[/bold] 2463 by the Standard Sol Calendar. + - [bold]Founder:[/bold] Kubra Mobolaji + - [bold]Notable Branches:[/bold] None: PMCG contracts for all members of the Stellar Corporate Conglomerate. + + A coalition of security and medical contractors in service of the Stellar Corporate Conglomerate, the Private Military Contracting Group is one of the elements born from the necessity of protecting an ever-growing corporate empire. Gathering mercenaries from all across the spur, the Private Military Contracting Group deploys a diverse force to anywhere they are needed; from mere office buildings to outposts in the Corporate Reconstruction Zone. As the megacorporations expand, these contractors follow to secure their holdings. + + Unlike the other members of the Stellar Corporate Conglomerate, the Private Military Contracting Group has few employees of its own. Only some liaisons and bureaucrats work behind the scenes to hire and manage the contractors. The rest of its members are in fact part of several organizations contracted to supply the Private Military Contracting Group. + + ## History + Eridanian military contractors as a whole originate in the early 2200s, during the takeover of the Epsilon Eridani by its economic council. As residents of Eridani I (then known as Kamfulu) rioted and unionised against dangerous working conditions, low pay, and environmental destruction that was occurring on the planet, the Eridani Economic Council formed two loose coalitions of those willing to "restore order"; citizen militias wishing to earn a paycheck in an unstable climate, and ex-Solarian military personnel who were used to pacifying an unhappy populace. These coalitions were deployed en-masse against protestors; they broke strikes, disappeared the loudest dissenters, and restored iron-fisted order to Kamfulu. + + After the majority of social unrest was quelled, these militias and private military contractors were gradually adopted into the new Eridani Corporate Federation. The experienced ex-military personnel were established as Ringspire, marketed as highly-paid, highly-deadly mercenaries capable of being deployed in conflict zones just about everywhere. Meanwhile, those who had started out with security contracting in the riots were organised into the less-formal Eagle Corp., who were eager to hire just about anyone and became a final option for the desperate all over Solarian space. These corporations would eventually fall under the umbrella of control for the Eridani Federation's chief of system security, essentially the commander-in-chief for any of Eridani's military forces. + + During the Interstellar War, these "EPMCs" grew to great renown as they were deployed alongside Solarian soldiers in ground forces and as strike teams alongside aerospace vessels. The news of their brutality was feared and loathed by the frontiersmen and Solarian allies alike. The Interstellar War also heralded the creation of Sekhmet Intergalactic in 2294, a medical contracting group; while Ringspire and Eagle Corp. had their own medical response divisions, Sekhmet's creation involved the recruitment of medical specialists, multi-pronged responses for both the groups, and an unscrupulous yet skilled and professional trauma response team to be sent out across the galaxy. + + N4NL Incorporated was the fourth corporation to join the official umbrella of Eridani contractors in 2307, as the group branched into data security, electronic warfare, and digital asset protection. While Eridani's mass surveillance and data collection algorithms had always been vast, N4NL perfected it, creating the intricate network behind the ECF's employment records, banking, and punishing Extranet surveillance. Shortly after its official addition, the collective of Ringspire, Eagle Corp., Sekhmet, and N4NL became known as the Golden Fist for their incredible reputation for quality results across the Spur. + + The corporation that would become the "thumb" of the Golden Fist was founded in 2450 by Farhad al-Sharif, a former N4NL executive and "positronic enthusiast" who had the unusual reputation of purchasing IPCs only to allow them to operate relatively uninhibited. Index Security Solutions was al-Sharif's plan to make better use of what he viewed as the fascinating capabilities of IPCs, and so became the only EPMC that recruited self-owned IPCs in large quantity. + + The Golden Fist's reputation was such that in 2463, in the face of the growing instability brought on by the phoron scarcity and the Solarian Collapse, the executive board of the Stellar Corporate Conglomerate approached the Board of Five, Eridani's heads of government. The insurgency in the Corporate Reconstruction Zone had the Conglomerate envisioning an agency responsible for reinforcing the corporate security and medical ranks with hired contractors, in a similar fashion to how the Golden Fist was currently operated. It was proposed that Kubra Mobolaji, the chief of system security for the ECF, would be chief executive officer of this conglomerate within the conglomerate, and permit private contracting firms around the Spur to join the initiative. + + Thus, the Private Military Contracting Group was born, becoming an umbrella organization to coordinate several distinct contractor elements within the Conglomerate's structure. Its subsidiaries are tasked with providing adequate manpower, while the Private Military Contracting Group deploys them where it is necessary. While some may question the loyalty of the Group's employees, the credits fuelled into their contracts have been enough to secure their allegiance. + + The PMCG is currently tasked with supplementing the security and medical staff in SCC facilities, and was formerly tasked with supplementing the Tau Ceti Armed Forces during the Peacekeeper Mandate of Mictlan. When the megacorporation's lines become too thin due to the expansion of the conglomerate, the contractors from the Private Military Contracting Group are called to patch these holes. Despite their diverse backgrounds, all employees of the Group receive the necessary training to work in SCC facilities. + + ## Influence + The PMCG has managed to carve out a niche for itself within the greater Stellar Corporate Conglomerate framework. Previously unknown or latent PMC groups are suddenly filling the holes that exist in the intricate networks of the Stellar Corporate Conglomerate while drawing ire from some who may not wish to see the underworld of contractor work in their professional setting. It is not uncommon to see highly trained Eridani mercenaries flank loutish Frontier bounty hunters, or Unathite noble physicians among Tajaran pharmacists who have retired from biological warfare. + + Nevertheless, the Group's wide-ranging talents and Kubra Mobolaji's tight management, as well as being carried by the massively profitable Golden Fist, ensure its permanence as long as the PMCG's methods remain effective. They also hold power as an independent organization, always holding at least some influence in any war-torn region of space, including the Sparring Sea or the Solarian Wildlands, as they have grown quite popular among those who quickly need an expendable force to do their bidding. diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml index 1da8edc187..accd1849b9 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/StellarCorporateConglomerate.xml @@ -1,3 +1,45 @@ -Temporary Document, to be filled with information +All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Stellar_Corporate_Conglomerate with some modifications. + + # Stellar Corporate Conglomerate + - [bold]Slogan:[/bold] [italic]The unbreakable chainlink, holding the Spur together[/italic] + - [bold]Headquarters:[/bold]Top of the World, Biesel, Republic of Biesel + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Sol Common, Tradeband + - [bold]Official Colours:[/bold] [color=#336699]Navy blue (#336699)[/color], [color=#81d9ee]Cyan (#81d9ee)[/color], [color=#f1b61c]Gold (#f1b61c)[/color] + - [bold]Founded:[/bold] 2462 by the Standard Sol Calendar. + - [bold]Founder:[/bold] NanoTrasen, Idris Incorporated, Hephaestus Industries, Zavodskoi Interstellar, Zeng-Hu Pharmaceuticals, Eridani Private Military Contractors. + + Formed at the height of corporate power in the galaxy, the Stellar Corporate Conglomerate — colloquially known as the “Chainlink” — is a group of seven megacorporations exercising undisputed economic dominance over the Orion Spur. The Chainlink was founded to secure corporate-owned assets within Tau Ceti during the invasion of the Republic of Biesel by Grand Admiral Raymond Özdemir, who commanded the 35th Fleet of the Solarian Navy during its siege of Tau Ceti. + + The Chainlink has essentially forced the largest economic influences into a shell corporation, which the Trasen family holds an unsteady authority over. Though cooperation has been deemed “essential” at this point in time, behind the shaky peace lies unsteady alliances, corporate espionage, and cut-throat tactics as each corporation battles for dominance. Their unlikely alliance comes as a result of Einstein Engines’ threat to their economic prowess, as Einstein's warp drives and prominence within the Nralakk Federation and Sol Alliance have given them a new edge in a galaxy affected by a phoron scarcity. + + [bold]Notable Members: [/bold] + - Titanius Aeson, CEO of Hephaestus Industries + - Alex Mason, CEO of Idris Incorporated + - Liqin Hsiao-Li, CEO of Zeng-Hu Pharmaceuticals + - Lyudmila Zavodskoi, CEO of Zavodskoi Interstellar + - Kubra Mobolaji, CEO of the Private Military Contracting Group + - Chin-hae Hong, CEO of Orion Express + + ## History + Though once shrouded in secrecy, the Stellar Corporate Conglomerate has become a staple of the Orion Spur, acting as the masters of the interstellar economy. With the earliest dated supply shipments being traced to 2458, it appears that the constituent megacorporations within the Stellar Corporate Conglomerate have sought to cooperate with one another to ensure their economic dominance since the First Solarian Invasion of the Republic of Biesel, though within the shadows. Almost every element of the Stellar Corporate Conglomerate had been hidden and concealed from the public, with even the deepest scrutiny only managing to uncover the "chainlink" insignia on supply shipments. + + However, following the Second Solarian Invasion of the Republic of Biesel in 2462, the cooperative of the Stellar Corporate Conglomerate revealed themselves to the interstellar community, proclaiming their goal was to protect the financial livelihood of all their corporate clients and assets, and to ensure megacorporate facilities across the Republic of Biesel would not be diminished as a result of “rogue actors”. + + Since its reveal, the Chainlink has gone on to ensure its dominance through several masterful techniques – mostly centring around the Corporate Reconstruction Zone or the annexed Solarian territories by the Republic of Biesel. Pouring countless resources into stabilizing the region so as to further exploit it, the Chainlink has all but managed to prop the annexation as a legal undertaking of colonies abandoned by the Sol Alliance during the Collapse. Their efforts have not gone without resistance; in particular, the Republic of Mictlan proved ungrateful for the Chainlink’s efforts to uplift them. Sponsoring the Peacekeeper Mandate, a Biesellite military operation aiming to enforce the annexation, the Chainlink briefly managed to quell the uprising from various dissident groups. But the guerilla war on the planet has ended up in a less-than-ideal conclusion for the corporations, with Mictlan eventually securing both the surrender of its insurgents and the power to limit the megacorporations' influence. + + Meanwhile, one of the Chainlink's primary assets, the SCCV Horizon, has undertaken several humanitarian missions across the Spur in an attempt to bolster its reputation. Hephaestus Industries has helped provide the electronic "vaccine" for the Rampancy Crisis of early 2466, and at it and Zeng-Hu Pharmaceuticals' behest the Horizon has been assisting the Izweski Hegemony and the Nralakk Federation with humanitarian aid for the planet of Moghes. + + Elsewhere, the cold war and occasional skirmishes between the Republic of Elyra and the Empire of Dominia remain an excellent source of funding for both Zavodskoi Interstellar and the Private Military Contracting Group. The PMCG helps bankroll the Elyran military contractors of Jackal Incorporated, while Zavodskoi continues to manufacture and equip much of the Imperial Fleet. Yet both megacorporations do not directly rival each other, and both have goals of expanding into each other's home turf – it benefits both Zavodskoi and the PMCG to have as wide a client base as possible. + + Miranda Trasen maintains her dominance of the Orion Spur through her manoeuvring into the Director of the Stellar Corporate Conglomerate, using her position to push NanoTrasen interests, to the annoyance of the other constituent megacorporations. Whether or not NanoTrasen can remain on top in the face of dwindling phoron resources and the refinement of Einstein Engines' warp drives remains to be seen. + + ## Influence and Reputation + The sheer size of the co-operating corporations' influence is enough to sway many of the powers on the interstellar stage. While some of the larger political entities retain some measure of independence, they still ultimately rely on the constituent members of the Stellar Corporate Conglomerate for their respective niches within the interstellar economy. + + Because of these galaxy-spanning ties, the SCC has promoted itself as a "peacekeeper" for the Orion Spur. Through the Conglomerate, nations and peoples that would have reason to make outright war with each other have settled on an uneasy peace – or, more cynically, a cold war instead of a hot one. The Stellar Corporate Conglomerate has leveraged the Republic of Biesel's independence from the Sol Alliance, and the corporate auxiliary forces of the Tau Ceti Armed Forces are a considerable contributor to the Biesellite military's staying power. Even the absence of a member-corporation from a nation-state is more space for the rest of the Conglomerate to form trade ties; the Republic of Elyra, despite expelling NanoTrasen from its borders, continues to trade with Biesel through Orion Express, Zeng-Hu Pharmaceuticals, and Idris Incorporated most prominently. + + From banks to manufacturers, only a sliver of economic productivity in the Spur is controlled by independents. The main threat to the Stellar Corporate Conglomerate is Einstein Engines; despite the combined power of the Chainlink, Einstein has managed to compete against them through tight ties with the Sol Alliance and Nralakk Federation, both the largest economies to exploit. But even despite this alleged rivalry, most of the member-corporations of the SCC have little trouble making dealings or working alongside Einstein Engines. Zeng-Hu and Idris are the most notable trade partners of Einstein, frequently purchasing their warp drives, their Shell frames, and commissioning them for ship designs, which causes the corporate echelons of NanoTrasen no end of grief. + + As the alliance grows older, it becomes more and more evident that the constituents are operating on their own agendas, with the Conglomerate an alliance of convenience. Conducting themselves in a manner to not directly oppose NanoTrasen, the other megacorporations have begun leveraging their economic influence on nations, as seen with Hephaestus Industries’ planned expansion across Moghes, Idris Incorporated’s leveraging credit provided to NanoTrasen during its attempt to recapture control of Phoenixport, and the Private Military Contracting Group purchasing the Grupo Amapola, made up of former corporate opponents. diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml index 1da8edc187..4a44499162 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZavodskoiInterstellar.xml @@ -1,3 +1,51 @@ -Temporary Document, to be filled with information +All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Zavodskoi_Interstellar with some modifications. + + # Zavodskoi Interstellar + - [bold]Slogan:[/bold] [italic]Even one matters on the battlefield.[/italic] + - [bold]Headquarters:[/bold]Nova Luxembourg, Moroz, Empire of Dominia + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Sol Common, Tradeband + - [bold]Official Colours:[/bold]Black (#363c43), [color=#637C65]Sage Green (#637C65)[/color], [color=#920a0a]Red (#920a0a)[/color], [color=#7a6347]Brown (#7a6347)[/color] + - [bold]Founded:[/bold] 2259 (As Necropolis Industries), 2462 (As Zavodskoi Interstellar) + - [bold]Founder:[/bold] Yefin Dementyev, Lyudmila Zavodskoi + - [bold]Notable Branches:[/bold] Kumar Arms, Confiance Technologies, Ingkom, Falerio Security Services. + + Zavodskoi Interstellar, formerly Necropolis Industries, is a weapons and aerospace manufacturing and development conglomerate founded in 2259. Zavodskoi distributes everything from light to heavy arms, space vessel weapons, ship-building, aircraft, ground vehicles, combat spacesuits, and military software. They also produce the Z.I. line of positronics, used for private security and military contracting. As Necropolis Industries, it primarily focused on genetic research and the biosciences; though Zavodskoi continues to have a genetics division, it is vastly outstripped by its competitor Zeng-Hu Pharmaceuticals. + + Since the beginning of the phoron scarcity, Zavodskoi Interstellar has seen a rise in its relevance and profits, as civil unrest grows around the Orion Spur. Its focus on the research and development of weaponry has made it vital to the continued “stability” of the Stellar Corporate Conglomerate, as well as any other clients that have either purchased or hired their arms. Notably, its continued relationship with the Empire of Dominia has provided the Empire an opportunity for cooperative and profitable business relations with the rest of humanity. + + ## History + Necropolis Industries was founded in 2259 by Yefim Dementyev, a former aerospace engineer with the Soviet Union. With the Alliance's outer territories beginning to show signs of unrest, the concerns of pan-galactic war were seen as an inevitability. With this in mind, Necropolis' making-a-splash invention was the combat-capable voidsuit. Lighter than a typical space suit and equipped with specialised atmospheric shielding that allowed a soldier to quickly slip in and out of it, the "Dracula" combat voidsuit was nevertheless heavy, cumbersome, and expensive. But the design showed promise, and the Sol Alliance's need for military expansion pushed demand for newer, sleeker versions, which skyrocketed with the outbreak of the Interstellar War. + + The years of the Interstellar War saw Dementyev oversee Necropolis branching into weapons and ship armaments, which were often purchased by the similarly-young and upcoming Eridani private military contractors. When the Treaty of Xansan was finally settled, Necropolis had secured a contract with the Solarian military, leading to it supplying the Alliance with guns and its now-iconic "Gargoyle" combat voidsuit. + + As relative peace followed the largest-scale conflict in human history, the board of directors turned their gaze to a yet-untouched (by them) field; biological experimentation. Though Zeng-Hu Pharmaceuticals was unambiguously more adept and well-established than their competitor, Necropolis' focus on gene therapy, xenobiology, and biological limb replacements led them to brief interest from the wider galactic community. While official correspondence pointed to a desire to broaden their sphere of influence and move away from solely weapons manufacturing, insiders at the company would later recount that Yefim Dementyev had begun to feel the creeping fear of his own mortality. Rumours would tell that he was obsessed with preserving himself and his legacy, and would use his own resources at any cost to achieve this preservation. + + However, Dementyev's pursuit was halted by his abrupt death from a septic infection in 2317. His son, Yevgeniy Dementyev, took hold of the company's reigns, and steered it into the twenty-fourth century. During this time, he would bear witness to the contact with the Empire of Dominia by the Alliance. Dementyev the younger quickly took advantage of the nascent Empire's newness to the galactic stage, and established relations with the Great Houses and Emperor Godwin Keeser himself. From then on, Necropolis and the Empire's intimate ties meant that Necropolis boosted the efforts of not just Dominia's conquest, but the efforts of its genetic modification. + + In 2389, Yevgeniy Dementyev passed down the mantle of chief executive officer to his son, Kasimir Boytsov. While Boytsov was not just a dabbler in genetics and had a keen mind like his father and grandfather, he was reputed for his impulsiveness and stubbornness, refusing to admit when the tides were turning against him. While Necropolis' developments in weapons manufacturing and genetics were profitable, they were being easily outstripped in the manner of shipbuilding by Hephaestus Industries, and left in the dust by Zeng-Hu Pharmaceuticals. By 2450 Necropolis had become the neglected runner-up of the megacorporations, the stocks of the other major corporate entities far outstripping them. But it was during this time that an information security operative at the company, Tikhon Zavodskoi, quietly recommended his cousin Lyudmila for a position as a weapons researcher. "The woman from Pluto", as she was known, quickly worked her way up the ranks of the company to become the assistant to the chief security officer, bringing in her own cohorts of associates from Dominia and Sol alike. + + 2462 was when change would overwhelm Necropolis. Kasimir Boytsov was accused by the Alliance government of corruption, insider trading, bribery, and supplying the black market with weapons. He denied the accusations, but before a proper case could be brought against him, he collapsed at a press conference, and fell into a coma. The company was sent into turmoil; Boytsov had never named a proper successor, despite his rapidly-advancing age. Lyudmila Zavodskoi had become a surprise contender; her new group of executives, including her cousin Tikhon and the Imperial countess Kamilla Strelitz, pushed out the old heads and helped turn Necropolis into rebranded, rebuilt Zavodskoi Interstellar. + + Rather than pursue further genetics work, Zavodskoi Interstellar opted to pursue what it knew how to do better than any other megacorporation in the Orion Spur: military equipment. Three main pillars continue to drive Zavodskoi Interstellar. The largest is its classical military-industrial complex, and a massive amount of humanity's military equipment, ranging from infantry small arms to combat hardsuits to vehicles and much more, are today produced by it or one of its subsidiaries. Confiance Technologies, a recent subsidiary of Zavodskoi Interstellar, is one part of the military-industrial pillar that has even branched out into robotics. Its second pillar, as a result of Ingkom, is its robust engineering wing - Zavodskoi engineering staff are a common sight throughout the Orion Spur, though their usage within the Solarian Alliance has faltered following the Solarian Collapse of late 2462. + + A third, less public, pillar of Zavodskoi Interstellar is its private security force. These officers go wherever Zavodskoi employees go and are known throughout the Orion Spur for their professionalism. According to company representatives, Zavodskoi's security wing is one of the most competitive in the Orion Spur and is trained longer than any other megacorporation's security force. A recent turnover in the highest ranks of the security forces following the rebranding of Necropolis to Zavodskoi has caused some suspicion among third-party observers, but no information has been released on this by Zavodskoi representatives. + + ## Influence and Reputation + As a hiring practice, Zavodski Interstellar finds itself poaching highly skilled workers from the other megacorporations. Workers with Zavodskoi usually flocked to the company to exploit its high pay - the dissolution of several underperforming departments and subsidiaries in more contested markets means that the company can focus and attract industry experts to work on weapons research. Although perfecting weapons of war is a task that will never truly be finished, the company is recognized as the uncontested leader in their development. As such, it holds a great deal of sway in almost every corner of the Spur. + + Clients ranging from small colonial militias to interstellar governments trust and rely on the megacorporation for their expertise. In this day and age, Zavodskoi pioneers where others do not by developing and manufacturing the highest-quality niche-function firearms, or just the biggest and baddest weapons they can muster. The extent of this research dominates every echelon of the corporation leading to the unified pursuit of maximizing the efficiency of its stock, rather than trying to cover the widest range possible. + + Zavodskoi Interstellar rarely works alongside Zeng-Hu contractors - intentionally so. The two corporations frequently butt heads after Zeng-Hu Pharmaceuticals left Zavodskoi genetics research in the dust, with the relation between the two sour at best. Although this attitude has lessened with the formation of the SCC, rivalry still occurs. This echoes down to the lowest ranks, as even the common worker can find themselves cheering onto outclassing the opposition. This isn’t an excuse to get fired for trashing your coworker. + + ## Positronics and Zavodskoi Interstellar + In the aftermath of Necropolis Industries' rebranding into Zavodskoi Interstellar, synthetics and positronics have become more of a common sight in company facilities outside of the Empire of Dominia. These Zavodskoi IPCs are however banned from command and leadership positions within Zavodskoi Interstellar due to the corporation's internal policy, which views positronics as a workforce rather than a management force. This ban includes Zavodskoi Interstellar corporate liaisons. + + Newly implemented and with some in the company opposed to their presence, Zavodskoi positronics face systemic fragility within the company. In an effort to employ and contract out the best representation for the company, Zavodskoi will routinely memory wipe, retool, or outright scrap and sell their IPCs for workplace accidents, failure to execute an order, or underperformance. This process has been largely seen as a lighter version of the Burzian Method. This authority does not extend to Zavodskoi Interstellar corporate liaisons although they are encouraged to check in with their positronic contractor personnel from time to time. Therefore, Zavodskoi positronic contractors are often those struggling to maintain a positive evaluation or saved from the scrapyard all together. + + In an effort to bolster company morale, organic personnel are able to lease out Zavodskoi asset IPCs, should they so choose. This allows personnel to ‘own’ a positronic for the home without the burden of maintenance fees. For the IPCs affected, this can work to their benefit or their demise. As more lax personnel may feel less inclined to report aberrancy, whereas other synthetics would find themselves under greater scrutiny. + + Z.I. units are most commonly Shell frames and baseline units. Zeng-Hu Mobility and Bishop frames are uncommon, due to the rivalry between Zeng-Hu and Zavodskoi. Meanwhile, Hephaestus Industrial and Xion frames have some prominence within Ingkom and Kumar Arms, helping to engineer ships and weapons of war. + + [bold]It is expected for Zavodskoi Interstellar IPCs to adopt the prefix Z.I. followed by their designation. An example of this formatting is Z.I. Name.[/bold] diff --git a/Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml index 1da8edc187..cd700a9ae2 100644 --- a/Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml +++ b/Resources/ServerInfo/Guidebook/Lore/Corporations/ZengHuPharmaceuticals.xml @@ -1,3 +1,48 @@ -Temporary Document, to be filled with information +All Information included in this document is licensed under CC BY-SA 4.0, and is taken from https://wiki.aurorastation.org/index.php?title=Zeng-Hu_Pharmaceuticals with some modifications. + + # Zeng-Hu Pharmaceuticals + - [bold]Slogan:[/bold] [italic]Building a brighter future.[/italic] + - [bold]Headquarters:[/bold] Shanghai, China, Earth, Sol Alliance + - [bold]Official Languages:[/bold] Tau-Ceti Basic, Sol Common, Tradeband, Terran Mandarin + - [bold]Official Colours:[/bold] [color=#a86bd8]Purple (#a86bd8)[/color], [color=#dfe4ed]White (#dfe4ed)[/color], [color=#b08fc8]Pink (#b08fc8)[/color] + - [bold]Founded:[/bold] 2132 + - [bold]Founder:[/bold] Xihua Zhong + - [bold]Notable Branches:[/bold] Bishop Cybernetics, Jeonshi Biotech Incorporated, Yomi Genetics Innovation and Research + + Zeng-Hu Pharmaceuticals is a trans-stellar medical research and pharmaceutical conglomerate with origins on 21st century Earth. They are responsible for the invention of modern cloning techniques, and have a hand in almost every form of medicine throughout the Orion Spur. Zeng-Hu has a unique internal structure referred to as the keiretsu by its employees: while officially known as a megacorporation Zeng-Hu is in reality made up of dozens of specialized medical corporations which build off of their mutual success, creating a structure most similar to a cartel. + + ## History + The organization that would go on to become Zeng-Hu Pharmaceuticals in 2132 was born from the merging of nearly a dozen companies on Earth in the year 2032, creating a complete stranglehold over the medical field while avoiding traditional anti-trust laws. The keiretsu pioneered the way in the field of cryonics and cryogenics, manufacturing the first truly viable "cryopod" designed to safely house a human being during long-distance space travel. This proved instrumental during the colonization efforts of Mars and Luna, and would be used during further colonization efforts in the Solar System prior to the advent of widely-available warp travel. However, the success and profits the keiretsu derived from colonization was relatively short-lived, as the economic hardships of the mid-22nd century combined with the advent of proper warp travel -- which greatly reduced the need for their cryogenic storage units -- in 2130 hit the conglomerate hard. The hardships of the 2130s would shortly result in the formal founding of Zeng-Hu Pharmaceuticals in 2132, in an effort to stay profitable and keep component companies from being bankrupted and bought out by competitors. While never completely disappearing, it was overshadowed by the rise of other corporations edging in on the field of biotechnology and pharmaceuticals. Zeng-Hu stayed in the background for years, though their continual innovations and unique internal structure allowed them to stay competitive if mostly out of the eye of the public. + + It wasn't until the year 2332, when the Skrell were first encountered, that it was well and truly thrust back into the limelight. As with many other companies jockeying for positions from which they could benefit from the advanced technology of the Skrell, Zeng-Hu sent representatives to try and convince Skrellian scientists to establish joint cooperative research teams with their own scientists. However, unlike with the other corporations, whom most of the scientific community of the Skrell perceived as simply greedy, they were truly impressed by the vision and drive shown by the CEO Vanas Peng and his board of directors. After three years of cooperative research, the first viable example of limb cloning technology was created. + + Zeng-Hu was quick to patent the techniques and equipment and continued to advance in the newly created field of organ and limb cloning. While cloning technology was highly controversial when first introduced, it has since become an accepted and even promoted part of Human and Skrellian society. Attempts to bring it beyond the borders of these two species have not yet been widely pursued, with few in the keiretsu viewing such efforts as likely to be profitable or successful. + + Due to its collaboration with the Skrell and success in the biotechnical field of limb cloning, Zeng-Hu Pharmaceuticals is now among the most powerful trans-stellar corporations present in the galaxy in the modern-day despite its unusual structure. As its main competitor in the medical field, the NanoTrasen Corporation, continues to bleed profits due to the phoron shortage, Zeng-Hu has risen to fill much of what NanoTrasen left behind in the medical field. But despite the profits -- and influence -- it has gained from filling the market holes left by NanoTrasen the keiretsu has not ceased working alongside NanoTrasen, and many of their mutually beneficial research and commerce agreements have remained intact. Thus it did not surprise many economists to see that the keiretsu had opted to join with NanoTrasen in the Stellar Corporate Conglomerate, though some believe that the keiretsu is more interested with their own bottom lines than with whatever mission the ever-mysterious "Chainlink" may be dedicated to. + + ## Influence + As the foremost medical service in the galaxy, overshadowing the former monopoly NanoTrasen once had over the speciality, Zeng-Hu's influence is immense. Their responsibility extends to the health and well-being of almost all citizens of the major galactic powers, with its constituent corporations delving into the pedantic of healthcare across the Orion Spur. + + Zeng-Hu Pharmaceuticals, and the majority of its minor subsidiaries, are professional science at its core. The public-facing sections of the megacorporation operate one of the larger public relations departments in the galaxy, a necessity for something as controversial as the primary healthcare provider. This reflects on employees as their workforce is encouraged to be plotting and outright secretive. In addition, the openly declared pursuit of Zeng-Hu has been the perfection of the sentient form and rapidly progressing what could be construed as the "expected evolution" of Humanity. The details of the future of this expectation are unfortunately classified, and guesses as to what the corporation plans are varied — from grounded to completely ridiculous conspiracies. + + Commercial contracting with Zeng-Hu is a cut-throat, careless business where decisions from completely untraceable elements within the corporation drift down to the lower ranks, usually deciding the course of lives. Workers take pride in their own capability to dodge the unknowable forces above, inadvertently, and the ideology has ended up fostering one of two things; either fear for one’s superiors or a dangerous lack of care. The latter in this environment rarely ends well. + + Zeng-Hu Pharmaceuticals rarely works alongside Zavodskoi contractors, and intentionally so. The two corporations frequently butt heads after Zeng-Hu Pharmaceuticals left Zavodskoi genetics research in the dust, with the relation between the two sours at best. This echoes down to the lowest ranks, as even the common worker can find themselves cheered on to beat the opposition. This isn’t an excuse to get fired by trashing your coworker. + + ## Culture of Augmentation + Driven by a mad desire to reach perfection, the genetic and prosthetic modification of Zeng-Hu employees is prolific. High-ranking executives often loan prosthetics, augmentation and direct tickets to genemodding down to skilled subordinates, who in turn employ similar practices to their own. All the way down to the very field medics of Zeng-Hu echo a similar sentiment ; progressing in the company further perfects one’s form. Veterans can receive higher-end, more vast augmentation that broadly encompasses the body, though there are countless who opt to avoid these options. + + Augments to enhance one’s work are the most common choices here, providing a unique edge to an extremely competitive medical scene. Genetic modification, due to its expensive nature, remains uncommon, but many find themselves allured to the opportunities Zeng-Hu Pharmaceuticals has to gamble for this. + + These cases obviously have their downside where more expensive prosthesis, modding and whatnot are concerned. In these implements there are typically forms of tracking devices, ingrained serial numbers, limited licenses or some other binding force that marks it as property of Zeng-Hu Pharmaceuticals. Exclusive prosthetics utilized by the company’s employees very commonly have these. + + The reality of these measures result in heavily regulated augments - the more grim ones capable of being remotely controlled or even disabled by company officials freely. The exclusivity of these items are amplified further by Zeng-Hu’s ability to retract their loan - and ultimately reclaim possession of them for any reason. Authentic Zeng-Hu prostheses do have their benefits, as one is able to pursue various options that disability or plain Human inefficiency would never permit. From amplifying surgical precision to enhancing one’s endurance, there is a case for anything here. + + ## Positronics and Zeng-Hu Pharmaceuticals + As the foremost company in the medical robotics and pharmaceutical industry, Zeng-hu Pharmaceuticals manufactures and employs a larger than average synthetic workforce. Aside from employing the machines in crucial and labor-saving roles, the corporation enjoys flaunting its latest models to the public, in effect using them as show dogs. IPCs which draw the eye of company managers and executives tend to be plucked from the ranks and elevated to positions of greater responsibility or authority. + + The company's treatment of IPCs is comparatively more egalitarian and less brutal. An overwhelming emphasis on perfection and unwavering quality is placed on the machines. + + Zeng-hu company projects often vary and as a result their dedicated synthetic workforce do not possess a standardized naming convention. From 9ef825252a0dc0054b1ba9626e7283d296150f3b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 18:08:32 -0800 Subject: [PATCH 06/24] Update Credits (#1300) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 98c07e83a3..7438cefeca 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Aerocrux, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, Aidenkrz, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, AlmondFlour, ALMv1, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, areitpog, Arendian, arimah, Arkanic, armoks, Arteben, ArthurMousatov, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, astriloqua, avghdev, AzzyIsNotHere, BananaFlambe, BasedPugilist, BasedUser, beck-thompson, benev0, BGare, bhespiritu, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, bloodrizer, Bloody2372, blueDev2, BlueHNT, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, BYONDFuckery, c0rigin, c4llv07e, CaasGit, CakeQ, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, CilliePaint, civilCornball, clorl, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, d4kii, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DeltaV-Bot, DerbyX, derek, dersheppard, dexlerxd, dffdff2423, dge21, digitalic, DinoWattz, DJB1gYAPPA, DjfjdfofdjfjD, DocNITE, DoctorBeard, DogZeroX, dolgovmi, dontbetank, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, drakewill-CRL, Drayff, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, enumerate0, eoineoineoin, eris, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, Evgencheg, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, Fansana, Feluk6174, fenndragon, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, FluffiestFloof, FluffMe, FluidRock, flybik, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, FoxxoTrystan, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, ghost581x, Git-Nivrak, gituhabu, GlassEclipse, gluesniffler, GNF54, Golinth, GoodWheatley, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, h3half, Haltell, Hanzdegloker, Hardly3D, harikattar, Hebi, Henry, HerCoyote23, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, icekot8, icesickleone, Ichaie, iczero, iglov, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Itzbenz, Jackal298, Jackrost, jacksonzck, Jackw2As, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jjtParadox, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justin, justintether, JustinTrotter, justtne, k3yw, Kadeo64, KaiShibaa, kalane15, kalanosh, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, komunre, koteq, Krunklehorn, Kukutis96513, Kupie, kxvvv, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, Leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, Lomcastar, LordCarve, LordEclipse, LovelyLophi, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, Mervill, metalgearsloth, mhamsterr, michaelcu, micheel665, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, MLGTASTICa, Mnemotechnician, moderatelyaware, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, namespace-Memory, Nannek, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, not-gavnaed, notafet, notquitehadouken, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OCOtheOmega, OctoRocket, OldDanceJacket, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Pireax, pissdemon, PixelTheKermit, PJB3005, Plasmaguy, PlasmaRaptor, plinyvic, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, Rinkashikachi, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, router, RumiTiger, S1ss3l, Saakra, Salex08, sam, Samsterious, SaphireLattice, SapphicOverload, SaveliyM360, sBasalto, ScalyChimp, scrato, Scribbles0, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, siyengar04, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, sleepyyapril, Slyfox333, snebl, sniperchance, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, Spatison, SpeltIncorrectyl, sphirai, SplinterGP, spoogemonster, sporekto, Squishy77, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, suraru, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, takemysoult, TaralGit, Taran, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, theOperand, TherapyGoth, TheShuEd, thevinter, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, tin-man-tim, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, Tornado-Technology, tosatur, TotallyLemon, truepaintgit, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, unusualcrow, Uriende, UristMcDorf, user424242420, v0idRift, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, volotomite, volundr-, Voomra, Vordenburg, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zymem, zzylex +0x6273, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Aerocrux, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, Aidenkrz, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, AlmondFlour, ALMv1, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, areitpog, Arendian, arimah, Arkanic, armoks, Arteben, ArthurMousatov, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, astriloqua, avghdev, AzzyIsNotHere, BananaFlambe, BasedPugilist, BasedUser, beck-thompson, benev0, BGare, bhespiritu, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, bloodrizer, Bloody2372, blueDev2, BlueHNT, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, BYONDFuckery, c0rigin, c4llv07e, CaasGit, CakeQ, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, CilliePaint, civilCornball, clorl, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, CormosLemming, CrafterKolyan, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, d4kii, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DeltaV-Bot, DerbyX, derek, dersheppard, dexlerxd, dffdff2423, dge21, digitalic, DinoWattz, DJB1gYAPPA, DjfjdfofdjfjD, DocNITE, DoctorBeard, DogZeroX, dolgovmi, dontbetank, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, drakewill-CRL, Drayff, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, enumerate0, eoineoineoin, eris, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, Evgencheg, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, Fansana, Feluk6174, fenndragon, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, FluffiestFloof, FluffMe, FluidRock, flybik, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, FoxxoTrystan, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, ghost581x, Git-Nivrak, gituhabu, GlassEclipse, gluesniffler, GNF54, Golinth, GoodWheatley, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, h3half, Haltell, Hanzdegloker, Hardly3D, harikattar, Hebi, Henry, HerCoyote23, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, icekot8, icesickleone, Ichaie, iczero, iglov, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Itzbenz, Jackal298, Jackrost, jacksonzck, Jackw2As, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jjtParadox, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justin, justintether, JustinTrotter, justtne, k3yw, Kadeo64, KaiShibaa, kalane15, kalanosh, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, komunre, koteq, Krunklehorn, Kukutis96513, Kupie, kxvvv, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, Leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, Lomcastar, LordCarve, LordEclipse, LovelyLophi, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, Mervill, metalgearsloth, mhamsterr, michaelcu, micheel665, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, MLGTASTICa, Mnemotechnician, moderatelyaware, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, namespace-Memory, Nannek, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, not-gavnaed, notafet, notquitehadouken, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OCOtheOmega, OctoRocket, OldDanceJacket, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Pireax, pissdemon, PixelTheKermit, PJB3005, Plasmaguy, PlasmaRaptor, plinyvic, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, Rinkashikachi, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, router, RumiTiger, S1ss3l, Saakra, Salex08, sam, Samsterious, SaphireLattice, SapphicOverload, SaveliyM360, sBasalto, ScalyChimp, scrato, Scribbles0, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, siyengar04, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, sleepyyapril, Slyfox333, snebl, sniperchance, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, SpaceManiac, SpaceRox1244, SpaceyLady, spartak, SpartanKadence, Spatison, SpeltIncorrectyl, sphirai, SplinterGP, spoogemonster, sporekto, Squishy77, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, suraru, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, takemysoult, TaralGit, Taran, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, theOperand, TherapyGoth, TheShuEd, thevinter, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, tin-man-tim, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, Tornado-Technology, tosatur, TotallyLemon, truepaintgit, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, unusualcrow, Uriende, UristMcDorf, user424242420, v0idRift, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, volotomite, volundr-, Voomra, Vordenburg, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xkreksx, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zymem, zzylex From 8a368bbdce5dd05adae998ec55f15fd5ff04b52f Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sun, 1 Dec 2024 03:27:39 +0000 Subject: [PATCH 07/24] Automatic Changelog Update (#1298) --- Resources/Changelog/Changelog.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3355783b28..ad6bed9907 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8293,3 +8293,16 @@ Entries: id: 6548 time: '2024-11-30T18:52:35.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1297 +- author: VMSolidus + changes: + - type: Add + message: Added a guidebook entry on Security Duty Weapons + - type: Add + message: >- + Added guidebook entries on various Corporations in lore, such as + Einstein Engines, Hephaestus Heavy Industries, etc. + - type: Add + message: Loadouts can now link to a specific guidebook entry via prototype ID. + id: 6549 + time: '2024-12-01T03:27:05.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1298 From 932f9e31eab9b2c11c4429b7c9c36effc327e733 Mon Sep 17 00:00:00 2001 From: Skubman Date: Sun, 1 Dec 2024 18:41:50 +0800 Subject: [PATCH 08/24] Fashion Update: Earrings & Makeup (#1299) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Description Adds **38** new earrings, **31** new face markings, and **16** bracelet/watch markings, based from Aurorastation cosmetics. Each earring, bracelet, and watch marking is applied to just one side of the body, allowing for greater customizability and mixing-and-matching markings. Most notably, the new face markings unlock **full customization of every pixel** in the 5x4 pixel space of the face. Examples of this are shown below. Arachne now have access to **more than a hundred** markings above the leg, after not having any markings in their 2 years of existence. ## Media ### Pauline **Head (Side):** Drop Earrings (Left), Drop Earrings (Right) **Left Hand:** Left Bracelet ### Red and Blue **Head:** Cheek Spot (Left), Eye Corner (Left), Cheek Spot (Right), Eye Corner (Right) **Head (Side):** Double Gemstone Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Watch (Colorable) **Left Arm:** Left Arm Bracelet **Right Hand:** Right Watch (Colorable) **Right Arm:** Right Arm Bracelet ### Pink **Head (Side):** Hoop Earrings (Left), Double Gemstone Earrings (Right) **Left Hand:** Left Bracelet **Left Arm:** Left Arm Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Psychic **Head:** Bindi, Full Blush **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Hand:** Left Bracelet **Right Hand:** Right Bracelet **Right Arm:** Right Arm Bracelet ### Cyclops **Head [Eyes]:** Bindi, Glabella, Nose Tape **Head [Cover for mouth area]:** Lip Corner (Left), Lip Corner (Right), Cheek Spot (Left), Cheek Spot (Right), Lips **Head (Side):** Cross Earrings (Left), Cross Earrings (Right) ### 😂 ### Arachne ![image](https://github.com/user-attachments/assets/b9935347-8977-4424-9b9b-b08aecb458b2) **Head:** Left Arachne Eye, Right Arachne Eye, Lips, Neck Cover (Slim Thick) **Head (Side):** Long Crystal Earrings (Left), Long Crystal Earrings (Right) **Left Arm:** Left Robotic Arm from Hesphiastos Industries **Left Hand:** Left Robotic Arm from Bishop Cybernetics **Right Arm:** Right Arm Bracelet **Right Hand:** Right Watch (Colorable), Right Nail Polish ## Technical Details I did a quick fix in [MarkingsSet.cs](https://github.com/Simple-Station/Einstein-Engines/compare/master...angelofallars:Einstein-Engines:fashion-update-markings?expand=1#diff-54373833c74b35579f9b3293d5bb0c17eda0d214c11f27dcb40c334ef8c6b513) to handle a list index out of bounds error where the number of default markings was lower than the maximum allowed markings, like with Onis who have a default horn but can wear 2 earrings. # Changelog :cl: Skubman - add: 80+ new markings have arrived, including earrings, makeup, bracelets, and watches. Sashay over to Character Setup to personalize your character like never before! - add: The Arachne species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, gauze, and more! - tweak: The available points for Head (Side), Left Hand, and Right Hand markings have been increased for most species to support the new markings. - tweak: The Nail Polish markings have been moved from the Overlay category to the Left Hand and Right Hand categories. --- .../Humanoid/Markings/MarkingsSet.cs | 5 +- Resources/Locale/en-US/markings/earrings.ftl | 133 ++++ Resources/Locale/en-US/markings/face.ftl | 92 +++ Resources/Locale/en-US/markings/makeup.ftl | 8 +- Resources/Locale/en-US/markings/tattoos.ftl | 6 + Resources/Locale/en-US/markings/wrist.ftl | 49 ++ .../Prototypes/DeltaV/Species/vulpkanin.yml | 10 +- .../Mobs/Customization/Markings/earrings.yml | 571 ++++++++++++++++++ .../Mobs/Customization/Markings/face.yml | 420 +++++++++++++ .../Mobs/Customization/Markings/gauze.yml | 22 +- .../Customization/Markings/human_noses.yml | 10 +- .../Mobs/Customization/Markings/makeup.yml | 12 +- .../Mobs/Customization/Markings/scars.yml | 10 +- .../Mobs/Customization/Markings/tattoos.yml | 36 +- .../Mobs/Customization/Markings/wrist.yml | 228 +++++++ .../Mobs/Customization/cyberlimbs/bishop.yml | 10 +- .../Customization/cyberlimbs/hesphiastos.yml | 10 +- .../Entities/Mobs/Species/arachne.yml | 4 + .../Prototypes/Nyanotrasen/Species/Oni.yml | 8 +- .../Nyanotrasen/Species/felinid.yml | 4 +- Resources/Prototypes/Species/arachne.yml | 9 +- Resources/Prototypes/Species/arachnid.yml | 6 +- Resources/Prototypes/Species/diona.yml | 2 +- Resources/Prototypes/Species/harpy.yml | 3 + Resources/Prototypes/Species/human.yml | 7 +- Resources/Prototypes/Species/reptilian.yml | 6 +- Resources/Prototypes/Species/slime.yml | 4 + .../Customization/earrings.rsi/bangle_l.png | Bin 0 -> 174 bytes .../Customization/earrings.rsi/bangle_r.png | Bin 0 -> 178 bytes .../Customization/earrings.rsi/crescent_l.png | Bin 0 -> 130 bytes .../Customization/earrings.rsi/crescent_r.png | Bin 0 -> 130 bytes .../Customization/earrings.rsi/cross_l.png | Bin 0 -> 156 bytes .../Customization/earrings.rsi/cross_r.png | Bin 0 -> 156 bytes .../earrings.rsi/cross_saint_peter_l.png | Bin 0 -> 152 bytes .../earrings.rsi/cross_saint_peter_r.png | Bin 0 -> 153 bytes .../earrings.rsi/crystal_long_tone_1_l.png | Bin 0 -> 117 bytes .../earrings.rsi/crystal_long_tone_1_r.png | Bin 0 -> 117 bytes .../earrings.rsi/crystal_long_tone_2_l.png | Bin 0 -> 141 bytes .../earrings.rsi/crystal_long_tone_2_r.png | Bin 0 -> 141 bytes .../earrings.rsi/crystal_tone_1_l.png | Bin 0 -> 108 bytes .../earrings.rsi/crystal_tone_1_r.png | Bin 0 -> 108 bytes .../earrings.rsi/crystal_tone_2_l.png | Bin 0 -> 140 bytes .../earrings.rsi/crystal_tone_2_r.png | Bin 0 -> 143 bytes .../earrings.rsi/dangle_long_tone_1_l.png | Bin 0 -> 142 bytes .../earrings.rsi/dangle_long_tone_1_r.png | Bin 0 -> 142 bytes .../earrings.rsi/dangle_long_tone_2_l.png | Bin 0 -> 107 bytes .../earrings.rsi/dangle_long_tone_2_r.png | Bin 0 -> 107 bytes .../earrings.rsi/dangle_tone_1_l.png | Bin 0 -> 133 bytes .../earrings.rsi/dangle_tone_1_r.png | Bin 0 -> 137 bytes .../earrings.rsi/dangle_tone_2_l.png | Bin 0 -> 109 bytes .../earrings.rsi/dangle_tone_2_r.png | Bin 0 -> 106 bytes .../earrings.rsi/drop_colored_tone_1_l.png | Bin 0 -> 108 bytes .../earrings.rsi/drop_colored_tone_1_r.png | Bin 0 -> 108 bytes .../earrings.rsi/drop_colored_tone_2_l.png | Bin 0 -> 112 bytes .../earrings.rsi/drop_colored_tone_2_r.png | Bin 0 -> 108 bytes .../Customization/earrings.rsi/drop_l.png | Bin 0 -> 133 bytes .../earrings.rsi/drop_long_tone_1_l.png | Bin 0 -> 108 bytes .../earrings.rsi/drop_long_tone_1_r.png | Bin 0 -> 108 bytes .../earrings.rsi/drop_long_tone_2_l.png | Bin 0 -> 129 bytes .../earrings.rsi/drop_long_tone_2_r.png | Bin 0 -> 130 bytes .../Customization/earrings.rsi/drop_r.png | Bin 0 -> 135 bytes .../Customization/earrings.rsi/eight_l.png | Bin 0 -> 142 bytes .../Customization/earrings.rsi/eight_r.png | Bin 0 -> 139 bytes .../earrings.rsi/gemstone_double_tone_1_l.png | Bin 0 -> 145 bytes .../earrings.rsi/gemstone_double_tone_1_r.png | Bin 0 -> 143 bytes .../earrings.rsi/gemstone_double_tone_2_l.png | Bin 0 -> 108 bytes .../earrings.rsi/gemstone_double_tone_2_r.png | Bin 0 -> 108 bytes .../earrings.rsi/gemstone_double_tone_3_l.png | Bin 0 -> 109 bytes .../earrings.rsi/gemstone_double_tone_3_r.png | Bin 0 -> 108 bytes .../earrings.rsi/gemstone_long_tone_1_l.png | Bin 0 -> 150 bytes .../earrings.rsi/gemstone_long_tone_1_r.png | Bin 0 -> 150 bytes .../earrings.rsi/gemstone_long_tone_2_l.png | Bin 0 -> 126 bytes .../earrings.rsi/gemstone_long_tone_2_r.png | Bin 0 -> 124 bytes .../earrings.rsi/gemstone_tone_1_l.png | Bin 0 -> 119 bytes .../earrings.rsi/gemstone_tone_1_r.png | Bin 0 -> 120 bytes .../earrings.rsi/gemstone_tone_2_l.png | Bin 0 -> 107 bytes .../earrings.rsi/gemstone_tone_2_r.png | Bin 0 -> 107 bytes .../Customization/earrings.rsi/heavy_l.png | Bin 0 -> 156 bytes .../Customization/earrings.rsi/heavy_r.png | Bin 0 -> 157 bytes .../Customization/earrings.rsi/hoop_l.png | Bin 0 -> 161 bytes .../earrings.rsi/hoop_mini_l.png | Bin 0 -> 127 bytes .../earrings.rsi/hoop_mini_r.png | Bin 0 -> 124 bytes .../Customization/earrings.rsi/hoop_r.png | Bin 0 -> 161 bytes .../Mobs/Customization/earrings.rsi/meta.json | 243 ++++++++ .../Customization/earrings.rsi/stud_l.png | Bin 0 -> 108 bytes .../Customization/earrings.rsi/stud_r.png | Bin 0 -> 108 bytes .../Mobs/Customization/face.rsi/bindi.png | Bin 0 -> 109 bytes .../Customization/face.rsi/cheekspot_l.png | Bin 0 -> 106 bytes .../Customization/face.rsi/cheekspot_r.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/chesire_l.png | Bin 0 -> 106 bytes .../Mobs/Customization/face.rsi/chesire_r.png | Bin 0 -> 109 bytes .../Mobs/Customization/face.rsi/crow_l.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/crow_r.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/ear_l.png | Bin 0 -> 114 bytes .../Mobs/Customization/face.rsi/ear_r.png | Bin 0 -> 115 bytes .../Mobs/Customization/face.rsi/eyebrow_l.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/eyebrow_r.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/eyebrows.png | Bin 0 -> 111 bytes .../Customization/face.rsi/eyecorner_l.png | Bin 0 -> 107 bytes .../Customization/face.rsi/eyecorner_r.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/eyelash_l.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/eyelash_r.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/eyestripe.png | Bin 0 -> 112 bytes .../Mobs/Customization/face.rsi/fullblush.png | Bin 0 -> 178 bytes .../Mobs/Customization/face.rsi/glabella.png | Bin 0 -> 109 bytes .../Customization/face.rsi/lipcorner_l.png | Bin 0 -> 106 bytes .../Customization/face.rsi/lipcorner_r.png | Bin 0 -> 107 bytes .../Customization/face.rsi/lowercheek_l.png | Bin 0 -> 107 bytes .../Customization/face.rsi/lowercheek_r.png | Bin 0 -> 107 bytes .../Mobs/Customization/face.rsi/meta.json | 135 +++++ .../Mobs/Customization/face.rsi/neck_f.png | Bin 0 -> 118 bytes .../Mobs/Customization/face.rsi/neck_m.png | Bin 0 -> 127 bytes .../Customization/face.rsi/neck_thick_f.png | Bin 0 -> 152 bytes .../Customization/face.rsi/neck_thick_m.png | Bin 0 -> 189 bytes .../Customization/face.rsi/nosestripe.png | Bin 0 -> 123 bytes .../Mobs/Customization/face.rsi/nosetape.png | Bin 0 -> 109 bytes .../Mobs/Customization/face.rsi/nosetip.png | Bin 0 -> 109 bytes .../Mobs/Customization/face.rsi/unibrow.png | Bin 0 -> 127 bytes .../Mobs/Customization/tattoos.rsi/meta.json | 10 +- .../tattoos.rsi/tattoo_eye_arachne_l.png | Bin 0 -> 111 bytes .../tattoos.rsi/tattoo_eye_arachne_r.png | Bin 0 -> 112 bytes .../wrist.rsi/bracelet_arm_l.png | Bin 0 -> 129 bytes .../wrist.rsi/bracelet_arm_r.png | Bin 0 -> 129 bytes .../Customization/wrist.rsi/bracelet_l.png | Bin 0 -> 259 bytes .../Customization/wrist.rsi/bracelet_r.png | Bin 0 -> 258 bytes .../Mobs/Customization/wrist.rsi/meta.json | 143 +++++ .../wrist.rsi/watch_colorable_l_tone_1.png | Bin 0 -> 132 bytes .../wrist.rsi/watch_colorable_l_tone_2.png | Bin 0 -> 107 bytes .../wrist.rsi/watch_colorable_r_tone_1.png | Bin 0 -> 129 bytes .../wrist.rsi/watch_colorable_r_tone_2.png | Bin 0 -> 107 bytes .../Customization/wrist.rsi/watch_gold_l.png | Bin 0 -> 320 bytes .../Customization/wrist.rsi/watch_gold_r.png | Bin 0 -> 312 bytes .../Customization/wrist.rsi/watch_holo_l.png | Bin 0 -> 769 bytes .../Customization/wrist.rsi/watch_holo_r.png | Bin 0 -> 780 bytes .../Mobs/Customization/wrist.rsi/watch_l.png | Bin 0 -> 294 bytes .../wrist.rsi/watch_leather_l.png | Bin 0 -> 316 bytes .../wrist.rsi/watch_leather_r.png | Bin 0 -> 308 bytes .../Mobs/Customization/wrist.rsi/watch_r.png | Bin 0 -> 292 bytes .../wrist.rsi/watch_silver_l.png | Bin 0 -> 291 bytes .../wrist.rsi/watch_silver_r.png | Bin 0 -> 290 bytes 140 files changed, 2146 insertions(+), 70 deletions(-) create mode 100644 Resources/Locale/en-US/markings/earrings.ftl create mode 100644 Resources/Locale/en-US/markings/face.ftl create mode 100644 Resources/Locale/en-US/markings/wrist.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/bangle_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/bangle_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crescent_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crescent_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/cross_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/cross_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/cross_saint_peter_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/cross_saint_peter_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/crystal_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/drop_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/eight_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/eight_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_3_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_3_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_1_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_1_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_2_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_2_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/heavy_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/heavy_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/hoop_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/hoop_mini_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/hoop_mini_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/hoop_r.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/stud_l.png create mode 100644 Resources/Textures/Mobs/Customization/earrings.rsi/stud_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/bindi.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/cheekspot_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/cheekspot_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/chesire_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/chesire_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/crow_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/crow_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/ear_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/ear_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyebrow_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyebrow_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyebrows.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyecorner_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyecorner_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyelash_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyelash_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/eyestripe.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/fullblush.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/glabella.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/lipcorner_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/lipcorner_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/lowercheek_l.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/lowercheek_r.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/neck_f.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/neck_m.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/neck_thick_f.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/neck_thick_m.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/nosestripe.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/nosetape.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/nosetip.png create mode 100644 Resources/Textures/Mobs/Customization/face.rsi/unibrow.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_arachne_l.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_arachne_r.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/bracelet_arm_l.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/bracelet_arm_r.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/bracelet_l.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/bracelet_r.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_l_tone_1.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_l_tone_2.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_r_tone_1.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_r_tone_2.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_gold_l.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_gold_r.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_holo_l.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_holo_r.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_l.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_leather_l.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_leather_r.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_r.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_silver_l.png create mode 100644 Resources/Textures/Mobs/Customization/wrist.rsi/watch_silver_r.png diff --git a/Content.Shared/Humanoid/Markings/MarkingsSet.cs b/Content.Shared/Humanoid/Markings/MarkingsSet.cs index d389e19415..689b93bfd7 100644 --- a/Content.Shared/Humanoid/Markings/MarkingsSet.cs +++ b/Content.Shared/Humanoid/Markings/MarkingsSet.cs @@ -283,8 +283,9 @@ public void EnsureDefault(Color? skinColor = null, Color? eyeColor = null, Marki continue; } - var index = 0; - while (points.Points > 0 || index < points.DefaultMarkings.Count) + var index = Markings.TryGetValue(category, out var markings) ? markings.Count : 0; + + while (points.Points > 0 && index < points.DefaultMarkings.Count) { if (markingManager.Markings.TryGetValue(points.DefaultMarkings[index], out var prototype)) { diff --git a/Resources/Locale/en-US/markings/earrings.ftl b/Resources/Locale/en-US/markings/earrings.ftl new file mode 100644 index 0000000000..f4b9095fa5 --- /dev/null +++ b/Resources/Locale/en-US/markings/earrings.ftl @@ -0,0 +1,133 @@ +marking-EarringsStudLeft = Stud Earrings (Left) +marking-EarringsStudLeft-stud_l = Stud Earrings (Left) + +marking-EarringsStudRight = Stud Earrings (Right) +marking-EarringsStudRight-stud_r = Stud Earrings (Right) + +marking-EarringsHeavyLeft = Heavy Earrings (Left) +marking-EarringsHeavyLeft-heavy_l = Heavy Earrings (Left) + +marking-EarringsHeavyRight = Heavy Earrings (Right) +marking-EarringsHeavyRight-heavy_r = Heavy Earrings (Right) + +marking-EarringsDropBasicLeft = Drop Earrings (Left) +marking-EarringsDropBasicLeft-drop_l = Drop Earrings (Left) + +marking-EarringsDropBasicRight = Drop Earrings (Right) +marking-EarringsDropBasicRight-drop_r = Drop Earrings (Right) + +marking-EarringsDropColoredLeft = Colored Drop Earrings (Left) +marking-EarringsDropColoredLeft-drop_colored_tone_1_l = Material +marking-EarringsDropColoredLeft-drop_colored_tone_2_l = Ornament + +marking-EarringsDropColoredRight = Colored Drop Earrings (Right) +marking-EarringsDropColoredRight-drop_colored_tone_1_r = Material +marking-EarringsDropColoredRight-drop_colored_tone_2_r = Ornament + +marking-EarringsDropLongLeft = Long Drop Earrings (Left) +marking-EarringsDropLongLeft-drop_long_tone_1_l = Material +marking-EarringsDropLongLeft-drop_long_tone_2_l = Ornament + +marking-EarringsDropLongRight = Long Drop Earrings (Right) +marking-EarringsDropLongRight-drop_long_tone_1_r = Material +marking-EarringsDropLongRight-drop_long_tone_2_r = Ornament + +marking-EarringsCrescentLeft = Crescent Earrings (Left) +marking-EarringsCrescentLeft-crescent_l = Crescent Earrings (Left) + +marking-EarringsCrescentRight = Crescent Earrings (Right) +marking-EarringsCrescentRight-crescent_r = Crescent Earrings (Right) + +marking-EarringsBangleLeft = Bangle Earrings (Left) +marking-EarringsBangleLeft-bangle_l = Bangle Earrings (Left) + +marking-EarringsBangleRight = Bangle Earrings (Right) +marking-EarringsBangleRight-bangle_r = Bangle Earrings (Right) + +marking-EarringsHoopBasicLeft = Hoop Earrings (Left) +marking-EarringsHoopBasicLeft-hoop_l = Hoop Earrings (Left) + +marking-EarringsHoopBasicRight = Hoop Earrings (Right) +marking-EarringsHoopBasicRight-hoop_r = Hoop Earrings (Right) + +marking-EarringsHoopMiniLeft = Mini Hoop Earrings (Left) +marking-EarringsHoopMiniLeft-hoop_mini_l = Mini Hoop Earrings (Left) + +marking-EarringsHoopMiniRight = Mini Hoop Earrings (Right) +marking-EarringsHoopMiniRight-hoop_mini_r = Mini Hoop Earrings (Right) + +marking-EarringsCrossBasicLeft = Cross Earrings (Left) +marking-EarringsCrossBasicLeft-cross_l = Cross Earrings (Left) + +marking-EarringsCrossBasicRight = Cross Earrings (Right) +marking-EarringsCrossBasicRight-cross_r = Cross Earrings (Right) + +marking-EarringsCrossSaintPeterLeft = St. Peter Cross Earrings (Left) +marking-EarringsCrossSaintPeterLeft-cross_saint_peter_l = St. Peter Cross Earrings (Left) + +marking-EarringsCrossSaintPeterRight = St. Peter Cross Earrings (Right) +marking-EarringsCrossSaintPeterRight-cross_saint_peter_r = St. Peter Cross Earrings (Right) + +marking-EarringsGemstoneBasicLeft = Gemstone Earrings (Left) +marking-EarringsGemstoneBasicLeft-gemstone_tone_1_l = Material +marking-EarringsGemstoneBasicLeft-gemstone_tone_2_l = Ornament + +marking-EarringsGemstoneBasicRight = Gemstone Earrings (Right) +marking-EarringsGemstoneBasicRight-gemstone_tone_1_r = Material +marking-EarringsGemstoneBasicRight-gemstone_tone_2_r = Ornament + +marking-EarringsGemstoneLongLeft = Long Gemstone Earrings (Left) +marking-EarringsGemstoneLongLeft-gemstone_long_tone_1_l = Material +marking-EarringsGemstoneLongLeft-gemstone_long_tone_2_l = Ornament + +marking-EarringsGemstoneLongRight = Long Gemstone Earrings (Right) +marking-EarringsGemstoneLongRight-gemstone_long_tone_1_r = Material +marking-EarringsGemstoneLongRight-gemstone_long_tone_2_r = Ornament + +marking-EarringsGemstoneDoubleLeft = Double Gemstone Earrings (Left) +marking-EarringsGemstoneDoubleLeft-gemstone_double_tone_1_l = Material +marking-EarringsGemstoneDoubleLeft-gemstone_double_tone_2_l = Upper Ornament +marking-EarringsGemstoneDoubleLeft-gemstone_double_tone_3_l = Lower Ornament + +marking-EarringsGemstoneDoubleRight = Double Gemstone Earrings (Right) +marking-EarringsGemstoneDoubleRight-gemstone_double_tone_1_r = Material +marking-EarringsGemstoneDoubleRight-gemstone_double_tone_2_r = Upper Ornament +marking-EarringsGemstoneDoubleRight-gemstone_double_tone_3_r = Lower Ornament + +marking-EarringsDangleBasicLeft = Dangle Earrings (Left) +marking-EarringsDangleBasicLeft-dangle_tone_1_l = Material +marking-EarringsDangleBasicLeft-dangle_tone_2_l = Ornament + +marking-EarringsDangleBasicRight = Dangle Earrings (Right) +marking-EarringsDangleBasicRight-dangle_tone_1_r = Material +marking-EarringsDangleBasicRight-dangle_tone_2_r = Ornament + +marking-EarringsDangleLongLeft = Long Dangle Earrings (Left) +marking-EarringsDangleLongLeft-dangle_long_tone_1_l = Material +marking-EarringsDangleLongLeft-dangle_long_tone_2_l = Ornament + +marking-EarringsDangleLongRight = Long Dangle Earrings (Right) +marking-EarringsDangleLongRight-dangle_long_tone_1_r = Material +marking-EarringsDangleLongRight-dangle_long_tone_2_r = Ornament + +marking-EarringsEightLeft = Eight Earrings (Left) +marking-EarringsEightLeft-eight_l = Eight Earrings (Left) + +marking-EarringsEightRight = Eight Earrings (Right) +marking-EarringsEightRight-eight_r = Eight Earrings (Right) + +marking-EarringsCrystalBasicLeft = Crystal Earrings (Left) +marking-EarringsCrystalBasicLeft-crystal_tone_1_l = Material +marking-EarringsCrystalBasicLeft-crystal_tone_2_l = Ornament + +marking-EarringsCrystalBasicRight = Crystal Earrings (Right) +marking-EarringsCrystalBasicRight-crystal_tone_1_r = Material +marking-EarringsCrystalBasicRight-crystal_tone_2_r = Ornament + +marking-EarringsCrystalLongLeft = Long Crystal Earrings (Left) +marking-EarringsCrystalLongLeft-crystal_long_tone_1_l = Material +marking-EarringsCrystalLongLeft-crystal_long_tone_2_l = Ornament + +marking-EarringsCrystalLongRight = Long Crystal Earrings (Right) +marking-EarringsCrystalLongRight-crystal_long_tone_1_r = Material +marking-EarringsCrystalLongRight-crystal_long_tone_2_r = Ornament diff --git a/Resources/Locale/en-US/markings/face.ftl b/Resources/Locale/en-US/markings/face.ftl new file mode 100644 index 0000000000..50fb935bef --- /dev/null +++ b/Resources/Locale/en-US/markings/face.ftl @@ -0,0 +1,92 @@ +marking-FaceBindi = Bindi +marking-FaceBindi-bindi = Bindi + +marking-FaceFullblush = Full Blush +marking-FaceFullblush-fullblush = Full Blush + +marking-FaceCheekspotRight = Cheek Spot (Right) +marking-FaceCheekspotRight-cheekspot_r = Cheek Spot (Right) + +marking-FaceCheekspotLeft = Cheek Spot (Left) +marking-FaceCheekspotLeft-cheekspot_l = Cheek Spot (Left) + +marking-FaceChesireRight = Chesire Grin (Right) +marking-FaceChesireRight-chesire_r = Chesire Grin (Right) + +marking-FaceChesireLeft = Chesire Grin (Left) +marking-FaceChesireLeft-chesire_l = Chesire Grin (Left) + +marking-FaceCrowRight = Crow's Feet (Right) +marking-FaceCrowRight-crow_r = Crow's Feet (Right) + +marking-FaceCrowLeft = Crow's Feet (Left) +marking-FaceCrowLeft-crow_l = Crow's Feet (Left) + +marking-FaceEarRight = Ear Cover (Right) +marking-FaceEarRight-ear_r = Ear Cover (Right) + +marking-FaceEarLeft = Ear Cover (Left) +marking-FaceEarLeft-ear_l = Ear Cover (Left) + +marking-FaceEyebrowRight = Eyebrow (Right) +marking-FaceEyebrowRight-eyebrow_r = Eyebrow (Right) + +marking-FaceEyebrowLeft = Eyebrow (Left) +marking-FaceEyebrowLeft-eyebrow_l = Eyebrow (Left) + +marking-FaceEyebrows = Eyebrows +marking-FaceEyebrows-eyebrows = Eyebrows + +marking-FaceEyecornerRight = Eye Corner (Right) +marking-FaceEyecornerRight-eyecorner_r = Eye Corner (Right) + +marking-FaceEyecornerLeft = Eye Corner (Left) +marking-FaceEyecornerLeft-eyecorner_l = Eye Corner (Left) + +marking-FaceEyelashRight = Eyelash (Right) +marking-FaceEyelashRight-eyelash_r = Eyelash (Right) + +marking-FaceEyelashLeft = Eyelash (Left) +marking-FaceEyelashLeft-eyelash_l = Eyelash (Left) + +marking-FaceEyestripe = Eye Stripe +marking-FaceEyestripe-eyestripe = Eye Stripe + +marking-FaceLipcornerRight = Lip Corner (Right) +marking-FaceLipcornerRight-lipcorner_r = Lip Corner (Right) + +marking-FaceLipcornerLeft = Lip Corner (Left) +marking-FaceLipcornerLeft-lipcorner_l = Lip Corner (Left) + +marking-FaceGlabella = Glabella +marking-FaceGlabella-blabella = Glabella + +marking-FaceLowercheekRight = Lower Cheek (Right) +marking-FaceLowercheekRight-lowercheek_r = Lower Cheek (Right) + +marking-FaceLowercheekLeft = Lower Cheek (Left) +marking-FaceLowercheekLeft-lowercheek_l = Lower Cheek (Left) + +marking-FaceNosetape = Nose Tape +marking-FaceNosetape-nosetape = Nose Tape + +marking-FaceNosetip = Nose Tip +marking-FaceNosetip-nosetip = Nose Tip + +marking-FaceNosestripe = Nose Stripe +marking-FaceNosestripe-nosestripe = Nose Stripe + +marking-FaceUnibrow = Unibrow +marking-FaceUnibrow-unibrow = Unibrow + +marking-FaceNeckSlim = Neck Cover (Slim) +marking-FaceNeckSlim-neck_f = Neck Cover (Slim) + +marking-FaceNeckWide = Neck Cover (Wide) +marking-FaceNeckWide-neck_m = Neck Cover (Wide) + +marking-FaceNeckSlimThick = Neck Cover (Slim Thick) +marking-FaceNeckSlimThick-neck_thick_f = Neck Cover (Slim Thick) + +marking-FaceNeckWideThick = Neck Cover (Wide Thick) +marking-FaceNeckWideThick-neck_thick_m = Neck Cover (Wide Thick) diff --git a/Resources/Locale/en-US/markings/makeup.ftl b/Resources/Locale/en-US/markings/makeup.ftl index 24ca3a10b7..d01f590866 100644 --- a/Resources/Locale/en-US/markings/makeup.ftl +++ b/Resources/Locale/en-US/markings/makeup.ftl @@ -4,11 +4,11 @@ marking-MakeupLips = Lips marking-MakeupBlush-blush = Blush marking-MakeupBlush = Blush -marking-MakeupNailPolishLeft-nail_polish_l = Nail Polish (Left) -marking-MakeupNailPolishLeft = Nail Polish (Left) +marking-MakeupNailPolishLeft-nail_polish_l = Left Nail Polish +marking-MakeupNailPolishLeft = Left Nail Polish -marking-MakeupNailPolishRight-nail_polish_r = Nail Polish (Right) -marking-MakeupNailPolishRight = Nail Polish (Right) +marking-MakeupNailPolishRight-nail_polish_r = Right Nail Polish +marking-MakeupNailPolishRight = Right Nail Polish marking-MakeupMothBlush-moth_blush = Moth Blush marking-MakeupMothBlush = Moth Blush diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index a3d1d1ef68..078b6fd7ca 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -27,3 +27,9 @@ marking-TattooEyeRight = Right Eye marking-TattooEyeLeft-tattoo_eye_l = Left Eye marking-TattooEyeLeft = Left Eye + +marking-TattooEyeArachneRight-tattoo_eye_arachne_r = Right Arachne Eye +marking-TattooEyeArachneRight = Right Arachne Eye + +marking-TattooEyeArachneLeft-tattoo_eye_arachne_l = Left Arachne Eye +marking-TattooEyeArachneLeft = Left Arachne Eye diff --git a/Resources/Locale/en-US/markings/wrist.ftl b/Resources/Locale/en-US/markings/wrist.ftl new file mode 100644 index 0000000000..52ee3bac4d --- /dev/null +++ b/Resources/Locale/en-US/markings/wrist.ftl @@ -0,0 +1,49 @@ +marking-WristBraceletRight = Right Bracelet +marking-WristBraceletRight-bracelet_r = Right Bracelet + +marking-WristBraceletLeft = Left Bracelet +marking-WristBraceletLeft-bracelet_l = Left Bracelet + +marking-WristBraceletArmRight = Right Arm Bracelet +marking-WristBraceletArmRight-bracelet_arm_r = Right Arm Bracelet + +marking-WristBraceletArmLeft = Left Arm Bracelet +marking-WristBraceletArmLeft-bracelet_arm_l = Left Arm Bracelet + +marking-WristWatchRight = Right Watch +marking-WristWatchRight-watch_r = Right Watch + +marking-WristWatchLeft = Left Watch +marking-WristWatchLeft-watch_l = Left Watch + +marking-WristWatchSilverRight = Right Silver Watch +marking-WristWatchSilverRight-watch_silver_r = Right Silver Watch + +marking-WristWatchSilverLeft = Left Silver Watch +marking-WristWatchSilverLeft-watch_silver_l = Left Silver Watch + +marking-WristWatchGoldRight = Right Gold Watch +marking-WristWatchGoldRight-watch_gold_r = Right Gold Watch + +marking-WristWatchGoldLeft = Left Gold Watch +marking-WristWatchGoldLeft-watch_gold_l = Left Gold Watch + +marking-WristWatchHoloRight = Right Holographic Watch +marking-WristWatchHoloRight-watch_holo_r = Right Holographic Watch + +marking-WristWatchHoloLeft = Left Holographic Watch +marking-WristWatchHoloLeft-watch_holo_l = Left Holographic Watch + +marking-WristWatchLeatherRight = Right Leather Watch +marking-WristWatchLeatherRight-watch_leather_r = Right Leather Watch + +marking-WristWatchLeatherLeft = Left Leather Watch +marking-WristWatchLeatherLeft-watch_leather_l = Left Leather Watch + +marking-WristWatchColorableRight = Right Watch (Colorable) +marking-WristWatchColorableRight-watch_colorable_r_tone_1 = Strap +marking-WristWatchColorableRight-watch_colorable_r_tone_2 = Watch Face + +marking-WristWatchColorableLeft = Left Watch (Colorable) +marking-WristWatchColorableLeft-watch_colorable_l_tone_1 = Strap +marking-WristWatchColorableLeft-watch_colorable_l_tone_2 = Watch Face diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml index 47c8e37b56..71e3e41be1 100644 --- a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Species/vulpkanin.yml @@ -46,9 +46,6 @@ points: 1 required: true defaultMarkings: [ VulpTail ] - Head: - points: 1 - required: false RightLeg: points: 2 required: false @@ -65,13 +62,13 @@ points: 2 required: false RightHand: - points: 2 + points: 3 required: false LeftArm: points: 2 required: false LeftHand: - points: 2 + points: 3 required: false Snout: points: 1 @@ -80,6 +77,9 @@ points: 1 required: true defaultMarkings: [ VulpEar ] + HeadSide: + points: 2 + required: false - type: humanoidBaseSprite id: MobVulpkaninHead diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml new file mode 100644 index 0000000000..cf98e96cff --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/earrings.yml @@ -0,0 +1,571 @@ +- type: marking + id: EarringsStudLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#303030" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: stud_l + +- type: marking + id: EarringsStudRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#303030" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: stud_r + +- type: marking + id: EarringsHeavyLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: heavy_l + +- type: marking + id: EarringsHeavyRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: heavy_r + +- type: marking + id: EarringsDropBasicLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: drop_l + +- type: marking + id: EarringsDropBasicRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: drop_r + +- type: marking + id: EarringsDropColoredLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: drop_colored_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: drop_colored_tone_2_l + +- type: marking + id: EarringsDropColoredRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: drop_colored_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: drop_colored_tone_2_r + +- type: marking + id: EarringsDropLongLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: drop_long_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: drop_long_tone_2_l + +- type: marking + id: EarringsDropLongRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: drop_long_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: drop_long_tone_2_r + +- type: marking + id: EarringsCrescentLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f4f4f4" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: crescent_l + +- type: marking + id: EarringsCrescentRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f4f4f4" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: crescent_r + +- type: marking + id: EarringsBangleLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: bangle_l + +- type: marking + id: EarringsBangleRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: bangle_r + +- type: marking + id: EarringsHoopBasicLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: hoop_l + +- type: marking + id: EarringsHoopBasicRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: hoop_r + +- type: marking + id: EarringsHoopMiniLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: hoop_mini_l + +- type: marking + id: EarringsHoopMiniRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: hoop_mini_r + +- type: marking + id: EarringsCrossBasicLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: cross_l + +- type: marking + id: EarringsCrossBasicRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: cross_r + +- type: marking + id: EarringsCrossSaintPeterLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: cross_saint_peter_l + +- type: marking + id: EarringsCrossSaintPeterRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: cross_saint_peter_r + +- type: marking + id: EarringsGemstoneBasicLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_tone_2_l + +- type: marking + id: EarringsGemstoneBasicRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_tone_2_r + +- type: marking + id: EarringsGemstoneLongLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_long_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_long_tone_2_l + +- type: marking + id: EarringsGemstoneLongRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_long_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_long_tone_2_r + +- type: marking + id: EarringsGemstoneDoubleLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_double_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_double_tone_2_l + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_double_tone_3_l + +- type: marking + id: EarringsGemstoneDoubleRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_double_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_double_tone_2_r + - sprite: Mobs/Customization/earrings.rsi + state: gemstone_double_tone_3_r + +- type: marking + id: EarringsDangleBasicLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: dangle_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: dangle_tone_2_l + +- type: marking + id: EarringsDangleBasicRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: dangle_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: dangle_tone_2_r + +- type: marking + id: EarringsDangleLongLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: dangle_long_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: dangle_long_tone_2_l + +- type: marking + id: EarringsDangleLongRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f3d052" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: dangle_long_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: dangle_long_tone_2_r + +- type: marking + id: EarringsEightLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f4f4f4" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: eight_l + +- type: marking + id: EarringsEightRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#f4f4f4" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: eight_r + +- type: marking + id: EarringsCrystalBasicLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: crystal_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: crystal_tone_2_l + +- type: marking + id: EarringsCrystalBasicRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: crystal_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: crystal_tone_2_r + +- type: marking + id: EarringsCrystalLongLeft + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: crystal_long_tone_1_l + - sprite: Mobs/Customization/earrings.rsi + state: crystal_long_tone_2_l + +- type: marking + id: EarringsCrystalLongRight + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Dwarf, Human, SlimePerson, Arachnid, Reptilian, Diona, Oni, Felinid, Vulpkanin, Harpy, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#9df4fa" + sprites: + - sprite: Mobs/Customization/earrings.rsi + state: crystal_long_tone_1_r + - sprite: Mobs/Customization/earrings.rsi + state: crystal_long_tone_2_r diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml new file mode 100644 index 0000000000..4fab3f06ae --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/face.yml @@ -0,0 +1,420 @@ +- type: marking + id: FaceBindi + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#a12222" + sprites: + - sprite: Mobs/Customization/face.rsi + state: bindi + +- type: marking + id: FaceFullblush + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#e07e7e" + sprites: + - sprite: Mobs/Customization/face.rsi + state: fullblush + +- type: marking + id: FaceCheekspotRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: cheekspot_r + +- type: marking + id: FaceCheekspotLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: cheekspot_l + +- type: marking + id: FaceChesireRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: chesire_r + +- type: marking + id: FaceChesireLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: chesire_l + +- type: marking + id: FaceCrowRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: crow_r + +- type: marking + id: FaceCrowLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: crow_l + +- type: marking + id: FaceEarRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: ear_r + +- type: marking + id: FaceEarLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: ear_l + +- type: marking + id: FaceEyebrowRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyebrow_r + + +- type: marking + id: FaceEyebrowLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyebrow_l + + +- type: marking + id: FaceEyebrows + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyebrows + +- type: marking + id: FaceEyecornerRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyecorner_r + +- type: marking + id: FaceEyecornerLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyecorner_l + +- type: marking + id: FaceEyelashRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#141414" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyelash_r + +- type: marking + id: FaceEyelashLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#141414" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyelash_l + +- type: marking + id: FaceEyestripe + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#a1a1a1" + sprites: + - sprite: Mobs/Customization/face.rsi + state: eyestripe + +- type: marking + id: FaceLipcornerRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: lipcorner_r + +- type: marking + id: FaceLipcornerLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: lipcorner_l + +- type: marking + id: FaceGlabella + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: glabella + +- type: marking + id: FaceLowercheekRight + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: lowercheek_r + +- type: marking + id: FaceLowercheekLeft + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: lowercheek_l + +- type: marking + id: FaceNosetape + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: nosetape + +- type: marking + id: FaceNosetip + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: nosetip + + +- type: marking + id: FaceNosestripe + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/face.rsi + state: nosestripe + +- type: marking + id: FaceUnibrow + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#242424" + sprites: + - sprite: Mobs/Customization/face.rsi + state: unibrow + +- type: marking + id: FaceNeckSlim + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/face.rsi + state: neck_f + +- type: marking + id: FaceNeckWide + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/face.rsi + state: neck_m + +- type: marking + id: FaceNeckSlimThick + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/face.rsi + state: neck_thick_f + +- type: marking + id: FaceNeckWideThick + bodyPart: Head + markingCategory: Head + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Reptilian, Vulpkanin, Arachne] + followSkinColor: true + sprites: + - sprite: Mobs/Customization/face.rsi + state: neck_thick_m diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 3ca7a78b39..6e8f7dc819 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml index bfca2ff488..a6ea6a6a42 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml @@ -4,7 +4,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] sprites: - sprite: Mobs/Customization/human_noses.rsi state: schnozz @@ -15,7 +15,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] sprites: - sprite: Mobs/Customization/human_noses.rsi state: nubby @@ -26,7 +26,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] sprites: - sprite: Mobs/Customization/human_noses.rsi state: droop @@ -37,7 +37,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] sprites: - sprite: Mobs/Customization/human_noses.rsi state: blob @@ -48,7 +48,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy, Arachne] sprites: - sprite: Mobs/Customization/human_noses.rsi state: uppie diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml index 901bf6e75c..75a2d9e34a 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml @@ -2,7 +2,7 @@ id: MakeupLips bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Arachne] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -16,7 +16,7 @@ id: MakeupBlush bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy] # Delta V - Felinid, Oni, Vulpkanin, Harpy + speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Arachne] # Delta V - Felinid, Oni, Vulpkanin, Harpy coloring: default: type: @@ -29,8 +29,8 @@ - type: marking id: MakeupNailPolishRight bodyPart: RHand - markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + markingCategory: RightHand + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -43,8 +43,8 @@ - type: marking id: MakeupNailPolishLeft bodyPart: LHand - markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + markingCategory: LeftHand + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Arachne] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 79e0a0ff01..c9050975aa 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Arachne] # Delta V - Felinid, Oni, Harpy followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -12,7 +12,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Arachne] # Delta V - Felinid, Oni, Harpy followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Arachne] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 93a16fcfd3..8b65988566 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne] # Delta V - Felinid, Oni coloring: default: type: @@ -16,7 +16,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne] # Delta V - Felinid, Oni coloring: default: type: @@ -58,7 +58,7 @@ id: TattooCampbellLeftArm bodyPart: LArm markingCategory: LeftArm - speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne] # Delta V - Felinid, Oni coloring: default: type: @@ -72,7 +72,7 @@ id: TattooCampbellRightArm bodyPart: RArm markingCategory: RightArm - speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Shadowkin, Arachne] # Delta V - Felinid, Oni coloring: default: type: @@ -137,3 +137,31 @@ sprites: - sprite: Mobs/Customization/tattoos.rsi state: tattoo_eye_l + +- type: marking + id: TattooEyeArachneRight + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Arachne] + coloring: + default: + type: + !type:EyeColoring + negative: true + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_eye_arachne_r + +- type: marking + id: TattooEyeArachneLeft + bodyPart: Eyes + markingCategory: Head + speciesRestriction: [Arachne] + coloring: + default: + type: + !type:EyeColoring + negative: true + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_eye_arachne_l diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml new file mode 100644 index 0000000000..0e2f9be912 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/wrist.yml @@ -0,0 +1,228 @@ +- type: marking + id: WristBraceletRight + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#cdcdcd" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: bracelet_r + +# Dionae don't have left wrist markings because the markings are currently blocked by their body. +- type: marking + id: WristBraceletLeft + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#cdcdcd" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: bracelet_l + +- type: marking + id: WristBraceletArmRight + bodyPart: RArm + markingCategory: RightArm + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#cdcdcd" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: bracelet_arm_r + +- type: marking + id: WristBraceletArmLeft + bodyPart: LArm + markingCategory: LeftArm + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#cdcdcd" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: bracelet_arm_l + +- type: marking + id: WristWatchRight + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_r + +- type: marking + id: WristWatchLeft + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_l + +- type: marking + id: WristWatchSilverRight + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_silver_r + +- type: marking + id: WristWatchSilverLeft + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_silver_l + +- type: marking + id: WristWatchGoldRight + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_gold_r + +- type: marking + id: WristWatchGoldLeft + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_gold_l + +- type: marking + id: WristWatchHoloRight + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_holo_r + +- type: marking + id: WristWatchHoloLeft + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_holo_l + +- type: marking + id: WristWatchLeatherRight + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_leather_r + +- type: marking + id: WristWatchLeatherLeft + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#ffffff" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_leather_l + +- type: marking + id: WristWatchColorableRight + bodyPart: RHand + markingCategory: RightHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Diona, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#424242" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_colorable_r_tone_1 + - sprite: Mobs/Customization/wrist.rsi + state: watch_colorable_r_tone_2 + +- type: marking + id: WristWatchColorableLeft + bodyPart: LHand + markingCategory: LeftHand + speciesRestriction: [Human, Dwarf, SlimePerson, Arachnid, Reptilian, Felinid, Oni, Vulpkanin, Gingerbread, Arachne] + coloring: + default: + type: + !type:SimpleColoring + color: "#424242" + sprites: + - sprite: Mobs/Customization/wrist.rsi + state: watch_colorable_l_tone_1 + - sprite: Mobs/Customization/wrist.rsi + state: watch_colorable_l_tone_2 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml index cdbb4ecfed..2ae4bc6d62 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml @@ -42,7 +42,7 @@ id: CyberLimbsMarkingBishopLArm bodyPart: LArm markingCategory: LeftArm - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: l_arm-primary @@ -55,7 +55,7 @@ id: CyberLimbsMarkingBishopLHand bodyPart: LHand markingCategory: LeftHand - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: l_hand @@ -87,7 +87,7 @@ id: CyberLimbsMarkingBishopRArm bodyPart: RArm markingCategory: RightArm - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: r_arm-primary @@ -101,7 +101,7 @@ id: CyberLimbsMarkingBishopRHand bodyPart: RHand markingCategory: RightHand - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi state: r_hand @@ -125,4 +125,4 @@ speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] sprites: - sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi - state: r_foot \ No newline at end of file + state: r_foot diff --git a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml index e3bcd07f3a..d6e2194bf3 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml @@ -37,7 +37,7 @@ id: CyberLimbsMarkingHesphiastosLArm bodyPart: LArm markingCategory: LeftArm - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: l_arm-1 @@ -48,7 +48,7 @@ id: CyberLimbsMarkingHesphiastosLHand bodyPart: LHand markingCategory: LeftHand - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: l_hand-1 @@ -84,7 +84,7 @@ id: CyberLimbsMarkingHesphiastosRArm bodyPart: RArm markingCategory: RightArm - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_arm-1 @@ -96,7 +96,7 @@ id: CyberLimbsMarkingHesphiastosRHand bodyPart: RHand markingCategory: RightHand - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] + speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian, Arachne] sprites: - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_hand-1 @@ -125,4 +125,4 @@ - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi state: r_foot-1 - sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi - state: r_foot-2 \ No newline at end of file + state: r_foot-2 diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml index f3bd68709f..51145eef74 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml @@ -22,6 +22,7 @@ color: "#e8b59b" sprite: Mobs/Species/Human/parts.rsi state: head_m + - map: [ "enum.HumanoidVisualLayers.Snout" ] - map: [ "enum.HumanoidVisualLayers.Eyes" ] color: "#008800" sprite: Mobs/Species/eyes.rsi @@ -69,6 +70,7 @@ state: bald sprite: Mobs/Customization/human_hair.rsi - map: [ "mask" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # This is not in the default order so earrings are rendered above masks - map: [ "head" ] - map: [ "pocket1" ] - map: [ "pocket2" ] @@ -163,6 +165,7 @@ color: "#e8b59b" sprite: Mobs/Species/Human/parts.rsi state: head_m + - map: [ "enum.HumanoidVisualLayers.Snout" ] - map: [ "enum.HumanoidVisualLayers.Eyes" ] color: "#008800" sprite: Mobs/Species/eyes.rsi @@ -210,6 +213,7 @@ state: bald sprite: Mobs/Customization/human_hair.rsi - map: [ "mask" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # This is not in the default order so earrings are rendered above masks - map: [ "head" ] - map: [ "pocket1" ] - map: [ "pocket2" ] diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index 4a306a7ce7..79d7e2b86f 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -32,8 +32,8 @@ required: true defaultMarkings: [ OniHornDoubleCurved ] HeadSide: - points: 1 - required: false + points: 3 + required: true defaultMarkings: [ PointyEarsUpwards ] Snout: points: 2 @@ -57,11 +57,11 @@ points: 2 required: false RightHand: - points: 2 + points: 3 required: false LeftArm: points: 2 required: false LeftHand: - points: 2 + points: 3 required: false diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index a0f8d2ad65..ad92ea8046 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml @@ -50,11 +50,11 @@ points: 2 required: false RightHand: - points: 2 + points: 3 required: false LeftArm: points: 2 required: false LeftHand: - points: 2 + points: 3 required: false diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml index 1bc2993f6d..83a0bf5767 100644 --- a/Resources/Prototypes/Species/arachne.yml +++ b/Resources/Prototypes/Species/arachne.yml @@ -20,6 +20,9 @@ Hair: points: 1 required: false + HeadSide: + points: 2 + required: false Tail: points: 1 required: false @@ -30,13 +33,13 @@ points: 2 required: false RightHand: - points: 2 + points: 3 required: false LeftArm: points: 2 required: false LeftHand: - points: 2 + points: 3 required: false @@ -44,7 +47,9 @@ id: MobArachneSprites sprites: Head: MobHumanHead + HeadSide: MobHumanoidAnyMarking Hair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking Chest: MobHumanTorso Eyes: MobArachneEyes LArm: MobHumanLArm diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index a2d941028d..cdfd35c70f 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -57,7 +57,7 @@ points: 1 required: false HeadSide: - points: 1 + points: 3 required: true defaultMarkings: [ ArachnidCheliceraeDownwards ] Chest: @@ -79,13 +79,13 @@ points: 2 required: false RightHand: - points: 2 + points: 3 required: false LeftArm: points: 2 required: false LeftHand: - points: 2 + points: 3 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 9b7f6e2ee6..3d7cc92747 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -41,7 +41,7 @@ points: 1 required: false HeadSide: - points: 1 + points: 3 required: false Chest: points: 1 diff --git a/Resources/Prototypes/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml index cf9e044eee..fc895332c8 100644 --- a/Resources/Prototypes/Species/harpy.yml +++ b/Resources/Prototypes/Species/harpy.yml @@ -53,6 +53,9 @@ points: 1 required: true defaultMarkings: [ HarpyEarsDefault ] + HeadSide: + points: 2 + required: false Chest: points: 1 required: true diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index 0d40cbfb03..7f39048cfd 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -53,6 +53,9 @@ HeadTop: points: 1 required: false + HeadSide: + points: 4 + required: false Chest: points: 1 required: false @@ -72,13 +75,13 @@ points: 2 required: false RightHand: - points: 2 + points: 3 required: false LeftArm: points: 2 required: false LeftHand: - points: 2 + points: 3 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index ec800b943d..17e1579a73 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -59,7 +59,7 @@ points: 2 required: false HeadSide: - points: 1 + points: 2 required: false Chest: points: 1 @@ -80,13 +80,13 @@ points: 2 required: false RightHand: - points: 2 + points: 3 required: false LeftArm: points: 2 required: false LeftHand: - points: 2 + points: 3 required: false - type: humanoidBaseSprite diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index 72fe853498..a78737321a 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -13,6 +13,7 @@ id: MobSlimeSprites sprites: Head: MobSlimeHead + HeadSide: MobHumanoidAnyMarking Hair: MobSlimeMarkingFollowSkin FacialHair: MobSlimeMarkingFollowSkin Chest: MobSlimeTorso @@ -32,6 +33,9 @@ Hair: points: 1 required: false + HeadSide: + points: 2 + required: false FacialHair: points: 1 required: false diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/bangle_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/bangle_l.png new file mode 100644 index 0000000000000000000000000000000000000000..e5fba08f2dcf990c0e8e58211709519a4513cc15 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=rJgR1Ar-gY-ZJDmY{0{ML88k2 zH^aVEJ>~gN$~EVDdnzct_l;6n!+&c}F2e!ANlz{^ez{j1#^HIXdVk)5(5bcegF|;d z{&QHa^7&7oX&^9tYJdIj`11I=o{wvzv)=|XuGzZH^7&@}1*;z22P-(xf6sG?her15 QsQDnir>mdKI;Vst0BX8I#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/bangle_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/bangle_r.png new file mode 100644 index 0000000000000000000000000000000000000000..88767499020ca51e4c06cd8743debfd58150adf6 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=m7Xq+Ar-gY-rUH^Y{z8uYXpMhYkj-#_FMI9tE#~gWJ|y>?&@xy4J%jheiTBorpUqjxn*N*_ yXbccc`S$#}MV{2YFK->L^1d(^d5{Mdey~`aUtE3G#F=2Jv$5{<^jfB}Pg~8~tKY9YZdq*y zGzJJBIBb8zb!Gk2&F{EoG`Qw|U$nmhB;3I4o4QIEGmfU{(@T&dR`H$KX*vpy0!uq!2AJlYqd=uUa;(EIJxvXX-?+s+qpocAYgFFd-?)?Ftfo{Pj)@Kv)SI}Y!Khm)z4*} HQ$iB}BfKG1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..ad230c4e2cec6c531ccf84e95868934b7598fade GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Hl8kyAr-gY-g4w+FyLX{xayB% z+sU?sOZV2ERXFv16+?r(=eaGuZ^M8}L7-yRC9W6DU}i!;ch5q0=T(X3S3!JFS3j3^ HP6u?Gkv*c1k~(nDtkJfniPd?YZA4f4T9=^VYWAPI9sTR!sov1c8{Wr}__f?)_tZ i@_*H=@6*9zHKvSf_Nw!%7bh(T@jYGrT-G@yGywpk5;7G4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/crystal_long_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..575103b1a27f434921b9384b6606ee8610db27e6 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=A)YRdAr-gY-rCK1z<`IaSSnGi%h15+Srq+m9@nZ>d){wZZCGw+GMxaHrs hteiD&p*C3PgQK`Rzh*`7U(XB>-_zC4Wt~$(699NqFAo3! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_1_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_1_l.png new file mode 100644 index 0000000000000000000000000000000000000000..2a4e5ef57ee7c6b20a563c04964a459a0a84f989 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=p`I>|Ar-gY-r6a6K!JzFq3vIH zh`RfeJH}-V3EP`4Pxee^V5ncQs^qkdb*t~B)y#Q&6a7El_J8?GlohBO2%>%$na;aa j&Y)iD`(Zj*WY1=XA0PGh-MX~p7l`la>gTe~DWM4faX&IB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..4b7f5c6930ffcd8d92d095677c685fa1b8cb1d1e GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=p`I>|Ar-gY-rC4}z<`6r;q-6* zlWOm^YDJcA_;{D;MI+xa28MepR+XGKv2OL8w3++Oo`wED?#?dw3Nix({=fdDZP5Ek hIlajDgEm-XPCBDjhTcBm*MgBCzNf37%Q~loCIGL(FpU5J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_2_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_2_l.png new file mode 100644 index 0000000000000000000000000000000000000000..db98b91879625489b2d71a7ffad5976812e40c51 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZJE6VBk5t;gkB^ vz!@fQH!D8zV`5-P&s_~9!QjKe>0o+;3BwQepBrkJkAS$Iu6{1-oD!M3<3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_long_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..090705cf858de44d392b179af9e6c906ef822dd6 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%(2 w#h_S4sO}#N14CHuY9^o>5cu;@6ii!WFsw^s{~7oG@I(;b)78&qol`;+00_4l?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_1_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_1_l.png new file mode 100644 index 0000000000000000000000000000000000000000..5674784c8afc2c97067d463dfebea2433852b712 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=KAtX)Ar-gY-a5$3puoXm@O}Oy z-*c)af|=|)1Rk(wGcu@$gu0n4cv?M|*L)W?ar@{0^96v~fWV>rpO9Mo(&#_DH^BS` Z_ni9a#=@&3C*A?^Jzf1=);T3K0RTQBCn5j< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..15cf6048ef447364c5e4313227bbb8df7044176f GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=0iG_7Ar-gY-rC4}z=4C=;oJO4 zzH_uA$dPxn$_jL7hS?83{1OO$eEsg*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_2_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_2_l.png new file mode 100644 index 0000000000000000000000000000000000000000..84966492a7aeafc0a5d5478cbe241fb1d356f8e8 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=CY~;iAr-gY-g4w+VBk1n@MpH2 z&V&z*OGFJ=S2Hmr=zH3IX9Ow(f`;8S%wWbDlhD81U;p1p{|w@Ky85}Sb4q9e0J1b5 AWdHyG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/dangle_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..4ab399aef9f1353e7e476b59489b23a077626427 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=hMq2tAr-gY-ZT_sVBlch_{%(2 w#h_S)tL{GwLqqKCSIj^)K+s^nrvl7)C)xa(`|A%2ndcy`r>mdKI;Vst04{(WZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_1_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_1_l.png new file mode 100644 index 0000000000000000000000000000000000000000..4a817f18ddf7ad63d4307523599304fb80bf4189 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#-1*YAr-gY-cn>_VBk37@auUk wzo@{2cS=6%xfpg#SP}|U0|s_Kgurw|FJs42_U-TF1NA|CPgg&ebxsLQ0CwgZ@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..d78e40175ba33950549afdb12b0809542a167a4d GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#-1*YAr-gY-ZB(qVBk1n@aOek yS)C0?4b BA5{PV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/drop_colored_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..1ed6edddeb7454986a194a172e3e5df2045083e1 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#-1*YAr-gY-ZT_sVBk1n@aOek yS)C0kGUWfcT!SelF{r5}E*d(i^}4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/drop_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/drop_l.png new file mode 100644 index 0000000000000000000000000000000000000000..753ecabf1942009c43275ffa52f98b392ae0076e GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=KAtX)Ar-gY-rC5?puof8Q25{X zGF#9qfvko1cm?LEKi$s8@Mgly$J@@-KHs>?O3F;B&72vi4G10tYwvFP=ft?YoD_VBk37@auUk wzo@{2cS=6%xfpg#SP}|U0|s_Kgurw|FJs42_U-TF1NA|CPgg&ebxsLQ0CwgZ@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..d78e40175ba33950549afdb12b0809542a167a4d GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#-1*YAr-gY-ZB(qVBk1n@aOek yS)C0gTe~DWM4fs%|7; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/drop_long_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..67fb351316735b40d2c3a33bab874539aaffd7d2 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=o}Mm_Ar-gY-g4w(P~c!W@Z$e@ zQJZVxt0o^i6PcLUZ^g!Nps^!j|I^v#hi69aTJY*8P!9-XEdRCsz{;PyUWoC7xDNKx Xdv}SrE==o?0&zWE{an^LB{Ts58Tl)v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/drop_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/drop_r.png new file mode 100644 index 0000000000000000000000000000000000000000..397d9aa33eed0bb7451024c255184807073add26 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=ex5FlAr-gY-rC4{z<`IvVewz{ zQ0;)1JP(d>YWD10z4Xz;)AGy=Hv&UHZ}a*1Y{%|?zR5F#eHno|f#AnQ-RQ<2zbbx( bLHH3iA0h=^kFs8g1o1sx{an^LB{Ts5E=Dcc literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/eight_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/eight_l.png new file mode 100644 index 0000000000000000000000000000000000000000..3e8d6b27adedde51c04521157d61a8fd1c74b701 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=p`I>|Ar-gY-csaaP~>rSd{=+! z-jnsQ?F%`1joI99E#EE1P~bGlW`9k1i(ujI_B~ckp-=yp{jJ|B=*$Gv4g|?Ny#*dV je7gI+kee%5;KomeHw9g0T7lq${eC7liI{)W g;v1Ef!6J8_Fxp>pH0mg0r~&akUHx3vIVCg!0PATkyZ`_I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_1_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_1_l.png new file mode 100644 index 0000000000000000000000000000000000000000..019fb9014889acb1e316d2d02f27c8b4bf0e79bd GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=5uPrNAr-gY-r6X5z<`Iz;l2G* zGsVzXCKLVb{`)grS;NZkN6~Yg{(Z|sKN_u>!$K!5S(VoJf$cSq#kN0&jEq1N7#JEB o|5TND_~?^$9p~{Lu*ip}j92%06ijWKunNTYboFyt=akR{0Kp|O*8l(j literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..8e409a6ec993101ab86a2400dc46d39ed7d01d4a GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=VV*9IAr-gY-dZSlz<`JOz#IFe zW`UWBo>k|b&X>3)^eu|vfOu|o?T?eHIs0>qeyHT$R=Kcx}+JPWJW_VBk37@auUk wzo@{2cS=6%xfmWeObP=EgTapn-e9_6D&whg_U(=NEjvJbPgg&ebxsLQ0FomePyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_double_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..a158eb1c1de915b7cbdff881a5f89ec5e1363162 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#-1*YAr-gY-ZB(qVBk1n@aOek wS)C0Y_7y&dM4YKbup#e$Cg%KqElF rZ~62ON-c#|4DnxtZe8{Ui&eZ}igh!|E&a{s4&r;d`njxgN@xNAu9r1| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..3aa9a34bc4ceb9e1a0098b72e1e74044d03745de GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=v7RoDAr-gY-ZJDmV8Fq8VZ!hD z;Pr{m^As;6&Hg@3hwaM2m;HsHTGB0_&M0X2ZYj>jp}C)mpz&|?Jg8f>}mdGpSl SSUgn}#PxLbb6Mw<&;$Swa3^K} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_long_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..cc2ca918d87716817ca30c0fc8156cad64c52d22 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&YmugAr-gY-rC5^puoZ6aOmIR zO^oXnls$_58$ThSj)mbs+q-v}=1)C$tg2xIss{o4nVUpU++MU6!h0W?zl?XTqxkAe OAik%opUXO@geCyYdncO! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_1_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_1_l.png new file mode 100644 index 0000000000000000000000000000000000000000..6dbdeaab4b3ba60e5f7bc70c0c72de463472db48 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=cAhSdAr-gY-ZB(qFyLW2@MC+2 zMAkxQ>!4shr0w)=BlXwnrXpkfe+IHm8%S;q-x-?7j>t6a$UXF?~4>*?y} Jvd$@?2>=;5Amac4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_1_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_1_r.png new file mode 100644 index 0000000000000000000000000000000000000000..bdd91ebcfcb41287b1ac2be3e8bb0db43899f0be GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_MR?|Ar-gY-r6Y0pdi4s;eNeq z+d)wsoi9FS4U1FQ7;aqLcE5f9&K8xeK*eCd_enIMX+4C!J~Dr?a$)sk@l+7s)78&q Iol`;+0F|R6pa1{> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_2_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_2_l.png new file mode 100644 index 0000000000000000000000000000000000000000..29448742edfb6c25015e5af7eab6a728c83a3f44 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZErlVBk2s;itK+ wPQiic9xv{)Fg$R$y$YxV3~D~8g6RXN7#MG`|LhcZ`Uc{Ay85}Sb4q9e0G^y3yZ`_I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_2_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/gemstone_tone_2_r.png new file mode 100644 index 0000000000000000000000000000000000000000..82ae53a1895eb2fc4def47c27e0a54b09e223df7 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%(2 wXG4*SP~ATkhJ=N=p+F@d&|trZ3Ct)s$FSaw{pW&Htn)y8Pgg&ebxsLQ04T2;Jpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/heavy_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/heavy_l.png new file mode 100644 index 0000000000000000000000000000000000000000..50a902bbafda1e7eb79395fe6507f1e690bbd586 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=$(}BbAr-gY-nz(nz<`7Gz@)$J zCX@H93&?0$vRB%{<^KFQafS^}ljdCe91)pw?xtCb%F0za^BdNwt=77&zNXswwmQ%d z5Lj?|_Uey64l!8$7wYpou-^aqKaed9405{|13c|oR>UpV0dYND{an^LB{Ts59YZ)H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/heavy_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/heavy_r.png new file mode 100644 index 0000000000000000000000000000000000000000..b9c5bfc0ae9337d5dfdc88ae7c1a70d6c9c0d8b5 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=DV{ElAr-gY-nz(nK!JzVq42-r zW0jX&TW2gPGH>{hbmDq8FGGd0@#k$mwQ7GPl3yDLPE4I2^6SST-rf$KxgXw1KL}t1 y8UqC0cQ1*)h(G-Po~TBtQ}~1FiWV$j@%BoFdx3T>m+nMzfcT!SelF{r5}E+;gEuw+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_l.png new file mode 100644 index 0000000000000000000000000000000000000000..7f1b16874c4a1806dcf29a7bd0cebd3a46cb2fb5 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=8J;eVAr-gY-ZJDmpuod=;nCmq zlIthx>2A4j@LD**EvxbleNs{?We3Z#&6)qj{%A6aj`r>mdKI;Vst E07Vx*=Kufz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_mini_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_mini_l.png new file mode 100644 index 0000000000000000000000000000000000000000..c0ea4ae57845627ef011e716c1e991b3693a57cf GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Zk{fVAr-gY-g4w+P~c&4{PTNF z-(e>HSq@f<7u@~6mX+bo1eM40-**LszCZrf?o&4hP!9;0Z1kQXcQ6mkZZMX9c~5Pj Seb?ewAik%opUXO@geCw?EGa(# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_mini_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_mini_r.png new file mode 100644 index 0000000000000000000000000000000000000000..f53dd82e3b3f8d91d8b7bffa4205fd775e11aeb9 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&YmugAr-gY-ZJC`N-#V8`R(Gq z@xx=`cPs+8L{~91hOd{y>Z$!eLH|QCqm~@$(NL NuBWS?%Q~loCIB^@C6NFC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/hoop_r.png new file mode 100644 index 0000000000000000000000000000000000000000..b4ad90c77750ceee73f6daa6e5c164256a3acf69 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=8J;eVAr-gY-ZJDmpuoc#@bd3^ z$@LTUbhlh^WLLcOT})P_e$%mQ3=M)aXYSYES0$YGS#~jd_51Z(XLX!-`tzOps#Wv& zfyMyA4WGEW=s(x%!jHdceg0?ftN6yJN=j!RF@ogGN|?Hf?T_A*nOhIydb;|#taD0e F0sv%?Jsbc4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/meta.json b/Resources/Textures/Mobs/Customization/earrings.rsi/meta.json new file mode 100644 index 0000000000..0d8b5b39a9 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/earrings.rsi/meta.json @@ -0,0 +1,243 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/7bc5666e9e12ef31dcfdc9bd4b68831b34811bc6, Edited and expanded by Skubman (github: angelofallars)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bangle_l", + "directions": 4 + }, + { + "name": "bangle_r", + "directions": 4 + }, + { + "name": "crescent_l", + "directions": 4 + }, + { + "name": "crescent_r", + "directions": 4 + }, + { + "name": "cross_l", + "directions": 4 + }, + { + "name": "cross_r", + "directions": 4 + }, + { + "name": "cross_saint_peter_l", + "directions": 4 + }, + { + "name": "cross_saint_peter_r", + "directions": 4 + }, + { + "name": "crystal_tone_1_l", + "directions": 4 + }, + { + "name": "crystal_tone_2_l", + "directions": 4 + }, + { + "name": "crystal_tone_1_r", + "directions": 4 + }, + { + "name": "crystal_tone_2_r", + "directions": 4 + }, + { + "name": "crystal_long_tone_1_l", + "directions": 4 + }, + { + "name": "crystal_long_tone_2_l", + "directions": 4 + }, + { + "name": "crystal_long_tone_1_r", + "directions": 4 + }, + { + "name": "crystal_long_tone_2_r", + "directions": 4 + }, + { + "name": "dangle_tone_1_l", + "directions": 4 + }, + { + "name": "dangle_tone_2_l", + "directions": 4 + }, + { + "name": "dangle_tone_1_r", + "directions": 4 + }, + { + "name": "dangle_tone_2_r", + "directions": 4 + }, + { + "name": "dangle_long_tone_1_l", + "directions": 4 + }, + { + "name": "dangle_long_tone_2_l", + "directions": 4 + }, + { + "name": "dangle_long_tone_1_r", + "directions": 4 + }, + { + "name": "dangle_long_tone_2_r", + "directions": 4 + }, + { + "name": "drop_l", + "directions": 4 + }, + { + "name": "drop_r", + "directions": 4 + }, + { + "name": "drop_colored_tone_1_l", + "directions": 4 + }, + { + "name": "drop_colored_tone_2_l", + "directions": 4 + }, + { + "name": "drop_colored_tone_1_r", + "directions": 4 + }, + { + "name": "drop_colored_tone_2_r", + "directions": 4 + }, + { + "name": "drop_long_tone_1_l", + "directions": 4 + }, + { + "name": "drop_long_tone_2_l", + "directions": 4 + }, + { + "name": "drop_long_tone_1_r", + "directions": 4 + }, + { + "name": "drop_long_tone_2_r", + "directions": 4 + }, + { + "name": "eight_l", + "directions": 4 + }, + { + "name": "eight_r", + "directions": 4 + }, + { + "name": "gemstone_tone_1_l", + "directions": 4 + }, + { + "name": "gemstone_tone_2_l", + "directions": 4 + }, + { + "name": "gemstone_tone_1_r", + "directions": 4 + }, + { + "name": "gemstone_tone_2_r", + "directions": 4 + }, + { + "name": "gemstone_long_tone_1_l", + "directions": 4 + }, + { + "name": "gemstone_long_tone_2_l", + "directions": 4 + }, + { + "name": "gemstone_long_tone_1_r", + "directions": 4 + }, + { + "name": "gemstone_long_tone_2_r", + "directions": 4 + }, + { + "name": "gemstone_double_tone_1_l", + "directions": 4 + }, + { + "name": "gemstone_double_tone_2_l", + "directions": 4 + }, + { + "name": "gemstone_double_tone_3_l", + "directions": 4 + }, + { + "name": "gemstone_double_tone_1_r", + "directions": 4 + }, + { + "name": "gemstone_double_tone_2_r", + "directions": 4 + }, + { + "name": "gemstone_double_tone_3_r", + "directions": 4 + }, + { + "name": "heavy_l", + "directions": 4 + }, + { + "name": "heavy_r", + "directions": 4 + }, + { + "name": "hoop_l", + "directions": 4 + }, + { + "name": "hoop_r", + "directions": 4 + }, + { + "name": "hoop_mini_l", + "directions": 4 + }, + { + "name": "hoop_mini_r", + "directions": 4 + }, + { + "name": "stud_l", + "directions": 4 + }, + { + "name": "stud_r", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/stud_l.png b/Resources/Textures/Mobs/Customization/earrings.rsi/stud_l.png new file mode 100644 index 0000000000000000000000000000000000000000..4a817f18ddf7ad63d4307523599304fb80bf4189 GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#-1*YAr-gY-cn>_VBk37@auUk wzo@{2cS=6%xfpg#SP}|U0|s_Kgurw|FJs42_U-TF1NA|CPgg&ebxsLQ0CwgZ@&Et; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/earrings.rsi/stud_r.png b/Resources/Textures/Mobs/Customization/earrings.rsi/stud_r.png new file mode 100644 index 0000000000000000000000000000000000000000..d78e40175ba33950549afdb12b0809542a167a4d GIT binary patch literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=#-1*YAr-gY-ZB(qVBk1n@aOek yS)C0S9xv`nGFW*oVgf1wfj>nbxhsSq>=!!mtGU1W+WB;V_@1tQF6*2UngFJs9OD20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/cheekspot_l.png b/Resources/Textures/Mobs/Customization/face.rsi/cheekspot_l.png new file mode 100644 index 0000000000000000000000000000000000000000..bacfebce82f657bc11abd210a031f7a2e36e3757 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=hMq2tAr-gY-ZJE6VBk5t;gkB^ u!WCt=1d7xd8NzZ`GXa%=z=yMwAq*Y9!W-;A%d7?SKzvVEKbLh*2~7Y=A{%7@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/cheekspot_r.png b/Resources/Textures/Mobs/Customization/face.rsi/cheekspot_r.png new file mode 100644 index 0000000000000000000000000000000000000000..bc9359e0d14cc059103d852344223d8866a366cc GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-rC5^z`${M!@vI} wI~#d9f47|RWN28sEtC4J&j0`b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/crow_r.png b/Resources/Textures/Mobs/Customization/face.rsi/crow_r.png new file mode 100644 index 0000000000000000000000000000000000000000..4ec9100c4ae2b188fa05ad1ce94133d2a151fab8 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%)j v#Gpt;sO}#NL)fh_R-h6P_;FMp!YDYvkWj|{^XB)N$3Oy}u6{1-oD!M zZQdsQ5Azrt|5!0I#H)Bl|C_}NR0skYg|+7bTAjuUR0#rBxBG>>piFrcbNFVdQ&MBb@00luF AivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/eyecorner_l.png b/Resources/Textures/Mobs/Customization/face.rsi/eyecorner_l.png new file mode 100644 index 0000000000000000000000000000000000000000..6108891dff813830381ecfce6ef35ce6d91c670d GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%)j wq`*K;sO}#N!;Xw-QJ@kKXvm+(0%jy+GX(x%|9Nq5#S{?V)78&qol`;+01zM>6aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/eyecorner_r.png b/Resources/Textures/Mobs/Customization/face.rsi/eyecorner_r.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ef4e35533b4c6e4e6b47f7de50a14fadb1e5a6 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%)j v#Gpt;sO}#N!;Oq+QJ@kKcp$zX!YDY%kif?N^I}Uu4@kh%)z4*}Q$iB}4c{7* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/eyelash_l.png b/Resources/Textures/Mobs/Customization/face.rsi/eyelash_l.png new file mode 100644 index 0000000000000000000000000000000000000000..e945ec2a22a41088c4f603c1ef607a69fe8b42eb GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%)j vq`*K;sO}$2!|ZLLj6fwI@Z*^$gprWW5Ojn6=jr~5jUWL}S3j3^P6Vr$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/eyelash_r.png b/Resources/Textures/Mobs/Customization/face.rsi/eyelash_r.png new file mode 100644 index 0000000000000000000000000000000000000000..72dbd9f5795efd9b9d2ffae9e15f9ca10be971b7 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-rC5^z`${M!@vI} wI~#d9f47|RWVn$TEeccu0uRLZLl_L-c@v(o|1@22WerHc)78&qol`;+0Mp(c!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/eyestripe.png b/Resources/Textures/Mobs/Customization/face.rsi/eyestripe.png new file mode 100644 index 0000000000000000000000000000000000000000..0bafeff98c9558b1f7205831c1835ebb53f51f48 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==AJH&Ar-gY-r6Y0V8C(2;9LB! zNCjUF4U3f@h1M}O=zD(B0;&Rmg6q%JA9zC85?K=yrJqh+vW^MF_jL7hS?83{1OPq$ B9|r&c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/fullblush.png b/Resources/Textures/Mobs/Customization/face.rsi/fullblush.png new file mode 100644 index 0000000000000000000000000000000000000000..070dda71080dafcf04cc816052535c8e6cc02bd9 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=m7Xq+Ar-gY-rC4}D1e9cK>865 zk(|R4l1iTq1a2=m!MDsq?1zSe>z%LD{_0HkV|b8%HN&yoe$t)EcUHZ+dAE3y>B*qb z^_z7c8131p`(#u5xtWKVfu;h%fd%j8?XLdiI6w2hr^S)42X0==sb{{w&B7ck`{RW4 W(mV1w5z{R?L3~eFKbLh*2~7Za%tq4y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/glabella.png b/Resources/Textures/Mobs/Customization/face.rsi/glabella.png new file mode 100644 index 0000000000000000000000000000000000000000..e118060f49f1f532cba707a52911e2445f1dcbf6 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=CY~;iAr-gY-ZErlVBk1x@MpH1 xT-k>S9xv`nGOSSP1nC8V52ugnKk$UGHFV>dxxX6Uv^oUhd%F6$taD0e0sy#X9YFv9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/lipcorner_l.png b/Resources/Textures/Mobs/Customization/face.rsi/lipcorner_l.png new file mode 100644 index 0000000000000000000000000000000000000000..1d949b408459f550e8cfa3981be7e3c027681f69 GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=hMq2tAr-gY-ZJE6VBk5t;gkB^ t!WCt=1d7xd86>u@1?dHW1LporV1^H0VFvrp{Bv1go~Nsy%Q~loCIBxB8khh8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/lipcorner_r.png b/Resources/Textures/Mobs/Customization/face.rsi/lipcorner_r.png new file mode 100644 index 0000000000000000000000000000000000000000..893a0fac7e686907e2a5ba1f0f2cf0db32e04230 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-rC5^z`${M!@vI} wI~#d9f47|RWMG(fD~uJW1_XW_)rT;i^V)A?|EaB{odx21y85}Sb4q9e0KZ}#Jpcdz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/lowercheek_l.png b/Resources/Textures/Mobs/Customization/face.rsi/lowercheek_l.png new file mode 100644 index 0000000000000000000000000000000000000000..83f0a40de78c22e40a2acc7551c855fd13c74834 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%)j vq`*K;sO}#N!-EC6p+F^Iu&+`GOef?r1a`3h47hl5Gl=i$>gTe~DWM4f8nhb| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/lowercheek_r.png b/Resources/Textures/Mobs/Customization/face.rsi/lowercheek_r.png new file mode 100644 index 0000000000000000000000000000000000000000..027e5484c199df28c716337b32930715b0121a59 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-ZB(qVBlch_{%)j w#Gpt;sO}#NL&Cz`P@obJXo&yA1ZET*Vu+u{{xjyl`c4qv)78&qol`;+03JLWU;qFB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/meta.json b/Resources/Textures/Mobs/Customization/face.rsi/meta.json new file mode 100644 index 0000000000..a7447b2156 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/face.rsi/meta.json @@ -0,0 +1,135 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/639227c952a8012a88288257140166ca7419385d, edited & single eyebrow/nosetip/glabella created by Skubman (github: angelofallars)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bindi", + "directions": 4 + }, + { + "name": "fullblush", + "directions": 4 + }, + { + "name": "cheekspot_r", + "directions": 4 + }, + { + "name": "cheekspot_l", + "directions": 4 + }, + { + "name": "chesire_r", + "directions": 4 + }, + { + "name": "chesire_l", + "directions": 4 + }, + { + "name": "crow_r", + "directions": 4 + }, + { + "name": "crow_l", + "directions": 4 + }, + { + "name": "ear_r", + "directions": 4 + }, + { + "name": "ear_l", + "directions": 4 + }, + { + "name": "eyebrow_r", + "directions": 4 + }, + { + "name": "eyebrow_l", + "directions": 4 + }, + { + "name": "eyebrows", + "directions": 4 + }, + { + "name": "eyecorner_r", + "directions": 4 + }, + { + "name": "eyecorner_l", + "directions": 4 + }, + { + "name": "eyelash_r", + "directions": 4 + }, + { + "name": "eyelash_l", + "directions": 4 + }, + { + "name": "eyestripe", + "directions": 4 + }, + { + "name": "lipcorner_r", + "directions": 4 + }, + { + "name": "lipcorner_l", + "directions": 4 + }, + { + "name": "glabella", + "directions": 4 + }, + { + "name": "lowercheek_r", + "directions": 4 + }, + { + "name": "lowercheek_l", + "directions": 4 + }, + { + "name": "neck_f", + "directions": 4 + }, + { + "name": "neck_m", + "directions": 4 + }, + { + "name": "neck_thick_f", + "directions": 4 + }, + { + "name": "neck_thick_m", + "directions": 4 + }, + { + "name": "nosetape", + "directions": 4 + }, + { + "name": "nosetip", + "directions": 4 + }, + { + "name": "nosestripe", + "directions": 4 + }, + { + "name": "unibrow", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/face.rsi/neck_f.png b/Resources/Textures/Mobs/Customization/face.rsi/neck_f.png new file mode 100644 index 0000000000000000000000000000000000000000..69d5ef44e6e2409dc4cce6b45346a57eecf8eda0 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=ww^AIAr-gY-ZB(qFyLX{_@O<+ z=;f`A*HxWWnD`H@V`6AX_xv?&iTPJXpkg3M=swwd&mPQtaG7zUl#k`|8Ilh`d{0+D Jmvv4FO#n-=BHjQ1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/neck_m.png b/Resources/Textures/Mobs/Customization/face.rsi/neck_m.png new file mode 100644 index 0000000000000000000000000000000000000000..d0fd1fee9605badd3aab28e783752084b08c9a48 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Zk{fVAr-gY-ZB(rP!w=>{Nvrz zGUG;eWk^Z5L9znVr|V1%4cVS)(^KMZu>+L@L4&x;%x(K?zog4w2vY`&6g+1B#TmT$ SQkI4~i0|p@=d#Wzp$PzbgooCKhW?%Xr~1cr)wJi#K)pb4VE!2y%`pizcK5qHU;ofd~@{ukhP_{wc+Um;E=fW(y+91WAu6{1-oD!Mc&%x#Vcgbh h<(f}3O&LMD;_WuM&+K^kO)(5)h^MQc%Q~loCIHYhMWX-! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/nosestripe.png b/Resources/Textures/Mobs/Customization/face.rsi/nosestripe.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a9a3ff814758bc026ea2c08398d100c4304631 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=PM$7~Ar-gY-csaaFyLW2@bCX+ zAKjVjGNyg;OS~As%Ao7HY1#RPcCDou<%=TqpKi;89ZJ6T-G@yGywo*&>IK< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/nosetip.png b/Resources/Textures/Mobs/Customization/face.rsi/nosetip.png new file mode 100644 index 0000000000000000000000000000000000000000..3cb681f3b45d522de31ab3761716053ed913c81e GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=CY~;iAr-gY-ZB(qVBk1n@Mm_N z%>l!S9xv`_F(fE?h5(g-KtsLWd`5dFFnhzrxM=RL)-s1d#xQug`njxgN@xNAk$@Zh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/face.rsi/unibrow.png b/Resources/Textures/Mobs/Customization/face.rsi/unibrow.png new file mode 100644 index 0000000000000000000000000000000000000000..aa84ea81b2e10ebdd19b6abe1d6c427367ea315d GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Zk{fVAr-gY-g4w(P~c#3`1^nH zTd9)nt`#$P>s6F0GuTZtb`A|ayy#4cA5b+2?6@>(e%*cX8+U~*X0n1s4tPs#Gv#3p SU!h(D;(NOKxvXUcF02Heluf2j+}o;kN>J^us`WPgg&ebxsLQ0L$+k A00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_arachne_r.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_eye_arachne_r.png new file mode 100644 index 0000000000000000000000000000000000000000..121679883a447afaa30b260435bb9031facbdfe5 GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==AJH&Ar-gY-aN?5z`(&|_$^*4 z{6l7v^`TaIPKN5-)rY@T??Gk8Gx}(6rxwds#%Ivn8JM+svoBjVb{{%NfC8L5q z!xPqqJq#1X89p&N#4()so!#)+CjNNghWFO5ciFk!F=R=&z3uuYoim@$nE1xq|2cKj zUz*9_)poZp*OfnXgSB8a2U&23W4M@R9%Di3#7ANb;atepE@!V`j*gT%(4&!A4fFtm Mr>mdKI;Vst05o7%>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/bracelet_r.png b/Resources/Textures/Mobs/Customization/wrist.rsi/bracelet_r.png new file mode 100644 index 0000000000000000000000000000000000000000..efdede9fa23d19b87203efdc93fbfa72635a071b GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP;iT< zi(^Q|oVT|ed7B+X7%pZ8F>@T??Gk8Gx}(6rxt96X-mPc$e14Z^d~*L^^&(b>bqps& z8Fn%$gfl$hYKUQ+pv_RUoo7St?d(XgXO(HQmL0!(^EAWr%6)y06YiH^E8Sc3VtUV? zuSN%!SCto>7L*7?Xv1n2L@?pYp%b4D+Dq_#@b4D7pTPpM1)=;qTe6<$<8QgEYJl!% N@O1TaS?83{1OO2hT@nBQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/meta.json b/Resources/Textures/Mobs/Customization/wrist.rsi/meta.json new file mode 100644 index 0000000000..9be0d6d529 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/wrist.rsi/meta.json @@ -0,0 +1,143 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Aurorastation at commit https://github.com/Aurorastation/Aurora.3/commit/d6acf1ddd9c8b7c038bfbacea03545889c9181c8, bracelet_arm/watch_colorable originally from Aurorastation edited by Skubman (github: angelofallars)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bracelet_r", + "directions": 4 + }, + { + "name": "bracelet_l", + "directions": 4 + }, + { + "name": "bracelet_arm_r", + "directions": 4 + }, + { + "name": "bracelet_arm_l", + "directions": 4 + }, + { + "name": "watch_r", + "directions": 4 + }, + { + "name": "watch_l", + "directions": 4 + }, + { + "name": "watch_silver_r", + "directions": 4 + }, + { + "name": "watch_silver_l", + "directions": 4 + }, + { + "name": "watch_gold_r", + "directions": 4 + }, + { + "name": "watch_gold_l", + "directions": 4 + }, + { + "name": "watch_holo_r", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ] + ] + }, + { + "name": "watch_holo_l", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 2 + ] + ] + }, + { + "name": "watch_leather_r", + "directions": 4 + }, + { + "name": "watch_leather_l", + "directions": 4 + }, + { + "name": "watch_colorable_r_tone_1", + "directions": 4 + }, + { + "name": "watch_colorable_r_tone_2", + "directions": 4 + }, + { + "name": "watch_colorable_l_tone_1", + "directions": 4 + }, + { + "name": "watch_colorable_l_tone_2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_l_tone_1.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_l_tone_1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d68c0fe3c63b46629678cdb079ccc5deb4dc55c GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=-kvUwAr-gY-ZJE6FyvuA@JT&G zfo;P4d5-O2dzlj~Prcd-RK#H6ecRJ0e5#*OZo2!qtM_;R0||nF#qs^FH#T|#Srv!a XfBVW7etcB)2_)g^>gTe~DWM4faqlUX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_l_tone_2.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_l_tone_2.png new file mode 100644 index 0000000000000000000000000000000000000000..eab8c109c318a4e191c5e09fe73079143cc72fa0 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-df1Wz`${M!{7g3 w3~U;lRphUj0|gi!^luXdQed!Q4+oHDXLg9?{>moLqXiQ5boFyt=akR{0A~*xXaE2J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_r_tone_1.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_r_tone_1.png new file mode 100644 index 0000000000000000000000000000000000000000..4a4e912ebfa4d4ee1379448bcc44a9f6184f964c GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=9-c0aAr-gY-ZJDp;2^+!@VWm5 z2c8E(tp~L)dKxoqD|lNBRK##Y|Kygr+8eh`PT9uyF&`uX0%cYG?AQ4?fUKJLjJXlA Ug?Bd^s)HmvUHx3vIVCg!06YOF0{{R3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_r_tone_2.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_colorable_r_tone_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ddac10fd6ec730a081d56eeda6dbb7b4b68fa0c3 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MxHK?Ar-gY-eTlsVBk1x@MpH2 v(FsrO1THgXpzHy8&mw6c4F*|1LHbVV_Gxo}Ji9@Ic?a| z;Z(pNtk+U=|Mv5u|HU!0z6hRY=tyTcV$ASJlHnsyLj{|I4YR^LMuGKL86u~NZaz5g zxoP^A$}diPlsOLMii=;YIQet0lINsT((~_JcWGq%FUqpOX6<2dCH+_Hg|{sTU(m_; z>e{P(2Vqpxa99EqzRuZjJvCZJzF6#I=R=dfulq~X8BQ&{>~+43X@MWiF%a#O*?%yE XR4AoPEm5-p`kukl)z4*}Q$iB}d17_t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_gold_r.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_gold_r.png new file mode 100644 index 0000000000000000000000000000000000000000..b18b5e023f2a788cfa35183413aff99ffcffcb14 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1F$f zi(^Q|oVT|W`3@OKv^|{8@`r^zVuK8$XVXi@f&@z;sqM^XCioQbIyJeT@fVq9>2g!% z_IKM|k>B=vXJ4~?B*Re1*I>c!Fo#*;9HYQ My85}Sb4q9e0C{|Jo&W#< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_holo_l.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_holo_l.png new file mode 100644 index 0000000000000000000000000000000000000000..38a0353f0b3cb641057fc37fe90d5d46c19d4390 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^4M4nrgAGU?nUwMuNO2Z;L>4nJ@ErkR#;MwT(hLkt zn>}3|Ln`LHy=&;j94O*&F`uKOgG0 z78|uH2)PKjFRpEQ@Z;E>YK51FPOFF;ovnYVwosB`4&wo$h!|x?5!b-=`FYEqPK}eA zCwG3Sz1h6`w{Ljqf8HCy=kN4vzy7*q-;ZwnQc!vA)$4qfhB=?_Jb(PUcL_u8jQ>CX z=&##_TXE=C-p(t(sdG!x+4Cfdg@KA?HU<1a* z_ww({ZY@t>Fi!Zh^!eq-E90^$bw0xX-?bTg&M(*h%KmbvOxvHQzbpPl=UbPqUcKSx z#q09B4nJ@ErkR#;MwT(hLkt z`#fD7Ln`LHy}QxNDNv^2<75s&LC5A03sV-qz+im^-`u?pUt%6{?=WrEzc9swlh?Ps z%bG<{$T1~u@zqo7Go@t&*uDn?NblduHcdLs{Yr>_(flTlFXme#rvgyaXt^<9QX3P zyJuC|1!A#E@hbi z`=#NMpf7cQOg;l$7+_-0M05fmHlg5A_l~(y?5bSh(%MR3@@DXK^>bP0l+XkKOI{qC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_l.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_l.png new file mode 100644 index 0000000000000000000000000000000000000000..5d68246758f54063ece322f2808ebe0a8ae70f73 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FJQ zi(^Q|oVT|&@-`cYus!Ua!a1W!GUDLlfFNTbZ3E`u4NRP_Y#tqgkN&-8-0#0h`j1N- z!vt}LC#(#Wj1EZ5drKLYW!^egm=YU4Ew%E>4>!?m9TMy>1 zVyF@OE0^&5cy(4-Dfb-10~hsb+2#adH4w>c2=gw}g4erp_jhlIUpC|U&(-#qwlmyl n*IWAM%Nt#WJ`ofby=07=T(8c>)X#Gn=tl-mS3j3^P6@k1V}?hP3?F$KD%c!sm=)qyGn&0lJ(2Gp_nv?G z>&4R_$$2t}ZT6JlWlyC_cPlx)aS8qCadJ@BwZoPRiKaQ6MP5UC6k<_qj>o4gG zE?_fo7>z7k%9LPw-sw)afO+tn^FRITmsm3jwCnYGJuhQg;D>6+WcD9S5^CCv1t&T3 QfIesNboFyt=akR{0ExhH0{{R3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_leather_r.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_leather_r.png new file mode 100644 index 0000000000000000000000000000000000000000..b8d666b4ff9f128cfeb0dbde89df5820c65b6e7e GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1F?j zi(^Q|oVT|Yb}=PNxII*sVC_DbR4lkV!Kgy^UfcACxo=7(d=7nc-4bb*6M4ffYlB4H z+-GMhQN7h9W%7aO(qapEn=Px%0#SdHGi6JJa^XZE=-jL~{UZxR z1_gbF6Wk1+m>Q6o(ab)Vx19TYW|I!j;SX9H-2@x9 hn4^i}n#;^J47cKyzHQSjTMzUggQu&X%Q~loCIFvHZ0rC4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/wrist.rsi/watch_silver_r.png b/Resources/Textures/Mobs/Customization/wrist.rsi/watch_silver_r.png new file mode 100644 index 0000000000000000000000000000000000000000..958d734a48d803eada4b033fa30df5ce5b9c6b7a GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FVU zi(^Q|oVT|&@-`cYus!Ua600H6YIvhj@kXQQ3yIdIOqoEJt{{sGtnc>Ua;lr3BK5m- z4}*d}!wGJNPfQKS%xI=Bweho-EzFJHwXXWgwJ^qMshY2MZOWCtY!Yh!#eeVjUCw`^ zqFHA={~6R=U!L+lv_YG{eoOQ}=5rzpPgof$86DynCWzx Date: Sun, 1 Dec 2024 10:42:19 +0000 Subject: [PATCH 09/24] Automatic Changelog Update (#1299) --- Resources/Changelog/Changelog.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ad6bed9907..5e0b068c47 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8306,3 +8306,26 @@ Entries: id: 6549 time: '2024-12-01T03:27:05.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1298 +- author: Skubman + changes: + - type: Add + message: >- + 80+ new markings have arrived, including earrings, makeup, bracelets, + and watches. Sashay over to Character Setup to personalize your + character like never before! + - type: Add + message: >- + The Arachne species can now select markings above the leg, including + cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, + gauze, and more! + - type: Tweak + message: >- + The available points for Head (Side), Left Hand, and Right Hand markings + have been increased for most species to support the new markings. + - type: Tweak + message: >- + The Nail Polish markings have been moved from the Overlay category to + the Left Hand and Right Hand categories. + id: 6550 + time: '2024-12-01T10:41:50.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1299 From 1bab6b8844c679897b3a695b363620589292d783 Mon Sep 17 00:00:00 2001 From: Skubman Date: Sun, 1 Dec 2024 22:11:51 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E2=99=82=EF=B8=8F=20Add=20Male=20Arachne?= =?UTF-8?q?=20(#1301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Description Adds the ability for Arachne to be male. Also in this I added chest/arm Arachnid markings for Arachne to use. I enabled footstep sounds for Arachne since it doesn't seem that they were intended to have silent footsteps. ## Media ## Changelog :cl: Skubman - add: Arachne can now be Male instead of only being Female. They can now also wear Facial Hair. - add: Arachne can use Arachnid chest and arm markings. - fix: Arachne will now have footstep sounds instead of being quiet when moving. --- .../Mobs/Customization/Markings/arachnid.yml | 31 +++++++++---------- .../Entities/Mobs/Species/arachne.yml | 3 ++ Resources/Prototypes/Species/arachne.yml | 6 ++-- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml index 395a7368ba..aa8f8c9ef6 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/arachnid.yml @@ -122,7 +122,7 @@ id: ArachnidTorsoStripes bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: stripes @@ -135,7 +135,7 @@ id: ArachnidTorsoSlashes bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: slashes @@ -148,7 +148,7 @@ id: ArachnidTorsoX bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: x @@ -161,7 +161,7 @@ id: ArachnidTorsoCross bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: cross @@ -174,7 +174,7 @@ id: ArachnidTorsoHeart bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: heart @@ -187,7 +187,7 @@ id: ArachnidTorsoHourglass bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: hourglass @@ -200,7 +200,7 @@ id: ArachnidTorsoNailAndHammer bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: nail-and-hammer @@ -213,7 +213,7 @@ id: ArachnidTorsoStar bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: star @@ -226,7 +226,7 @@ id: ArachnidTorsoArrows bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: arrows @@ -239,7 +239,7 @@ id: ArachnidTorsoCore bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: core @@ -252,7 +252,7 @@ id: ArachnidTorsoFiddleback bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: fiddleback @@ -265,7 +265,7 @@ id: ArachnidTorsoSkull bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: skull @@ -278,7 +278,7 @@ id: ArachnidTorsoTarget bodyPart: Chest markingCategory: Chest - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/chest.rsi state: target @@ -292,7 +292,7 @@ id: ArachnidRArmStripes bodyPart: RArm markingCategory: RightArm - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/arms.rsi state: stripes_right @@ -305,7 +305,7 @@ id: ArachnidLArmStripes bodyPart: LArm markingCategory: LeftArm - speciesRestriction: [Arachnid] + speciesRestriction: [Arachnid, Arachne] sprites: - sprite: Mobs/Customization/Arachnid/arms.rsi state: stripes_left @@ -351,4 +351,3 @@ sprites: - sprite: Mobs/Customization/Arachnid/overlay.rsi state: fuzzy - diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml index 51145eef74..4b2b645464 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml @@ -66,6 +66,7 @@ - map: [ "belt" ] - map: [ "neck" ] - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] state: bald sprite: Mobs/Customization/human_hair.rsi @@ -106,6 +107,7 @@ - type: Tag tags: - CanPilot + - FootstepSound - DoorBumpOpener - type: StepTriggerImmune - type: Bloodstream @@ -209,6 +211,7 @@ - map: [ "belt" ] - map: [ "neck" ] - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] - map: [ "enum.HumanoidVisualLayers.Hair" ] state: bald sprite: Mobs/Customization/human_hair.rsi diff --git a/Resources/Prototypes/Species/arachne.yml b/Resources/Prototypes/Species/arachne.yml index 83a0bf5767..45b1f007ba 100644 --- a/Resources/Prototypes/Species/arachne.yml +++ b/Resources/Prototypes/Species/arachne.yml @@ -7,8 +7,6 @@ markingLimits: MobArachneMarkingLimits dollPrototype: MobArachneDummy skinColoration: HumanToned - sexes: - - Female minAge: 60 youngAge: 150 oldAge: 400 @@ -20,6 +18,9 @@ Hair: points: 1 required: false + FacialHair: + points: 1 + required: false HeadSide: points: 2 required: false @@ -49,6 +50,7 @@ Head: MobHumanHead HeadSide: MobHumanoidAnyMarking Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking Chest: MobHumanTorso Eyes: MobArachneEyes From 5476ee090bd735d7791b4ae7f1e8aeea674cd55a Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sun, 1 Dec 2024 14:12:18 +0000 Subject: [PATCH 11/24] Automatic Changelog Update (#1301) --- Resources/Changelog/Changelog.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5e0b068c47..11b8df98be 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8329,3 +8329,18 @@ Entries: id: 6550 time: '2024-12-01T10:41:50.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1299 +- author: Skubman + changes: + - type: Add + message: >- + Arachne can now be Male instead of only being Female. They can now also + wear Facial Hair. + - type: Add + message: Arachne can use Arachnid chest and arm markings. + - type: Fix + message: >- + Arachne will now have footstep sounds instead of being quiet when + moving. + id: 6551 + time: '2024-12-01T14:11:51.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1301 From 4bf762411e866952c0257ce7d255b2610d7a3a21 Mon Sep 17 00:00:00 2001 From: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:56:50 -0500 Subject: [PATCH 12/24] Add Localization for Senior Physician and Senior Engineer (#1302) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Description Adds localization for the Senior Engineer and Senior Physician roles that were recently enabled. --- # TODO n/a ---

Media

![Snímka obrazovky 2024-12-01 164702](https://github.com/user-attachments/assets/ca69e08d-5adb-4e71-aeda-5969d595e429) ![Snímka obrazovky 2024-12-01 165626](https://github.com/user-attachments/assets/18289899-2314-4d21-9b09-9e3e3415a6e0)

--- # Changelog :cl: zelezniciar - fix: Fixed Senior Engineer and Physician names not appearing correctly --- Resources/Locale/en-US/job/job-names.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 60ab9b0543..2e66ec56c5 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -6,6 +6,8 @@ job-name-detective = Detective job-name-brigmedic = Corpsman job-name-borg = Cyborg job-name-senior-researcher = Mystic +job-name-senior-engineer = Senior Engineer +job-name-senior-physician = Senior Physician job-name-scientist = Acolyte job-name-research-assistant = Noviciate job-name-rd = Mystagogue From 9169818f60ef0cf156bb1b095d66e5e9d0b4575b Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Sun, 1 Dec 2024 23:57:16 +0000 Subject: [PATCH 13/24] Automatic Changelog Update (#1302) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 11b8df98be..1bbf800719 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8344,3 +8344,10 @@ Entries: id: 6551 time: '2024-12-01T14:11:51.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1301 +- author: zelezniciar + changes: + - type: Fix + message: Fixed Senior Engineer and Physician names not appearing correctly + id: 6552 + time: '2024-12-01T23:56:50.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1302 From 8573914e8b6183197abc250d3e8f3c186194b0a6 Mon Sep 17 00:00:00 2001 From: Skubman Date: Tue, 3 Dec 2024 00:47:09 +0800 Subject: [PATCH 14/24] Make Cultist Constructs Speak Eldritch (#1303) # Description Fixes cultist constructs only speaking Universal and not being able to understand anyone else due to a missing `LanguageKnowledgeComponent`. ## Changelog :cl: Skubman - tweak: Cultist constructs and soul shards now speak Tau-Ceti Basic and Eldritch. Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> --- .../WhiteDream/Entities/Objects/Cult/constructs.yml | 9 ++++++++- .../WhiteDream/Entities/Objects/Cult/souls_shards.yml | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/constructs.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/constructs.yml index 93806feb0a..d16f12d5c8 100644 --- a/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/constructs.yml +++ b/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/constructs.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: ConstructShell name: construct shell description: empty construct shell @@ -105,6 +105,13 @@ - CannotSuicide - DoorBumpOpener - type: Appearance + - type: LanguageKnowledge + speaks: + - TauCetiBasic + - Eldritch + understands: + - TauCetiBasic + - Eldritch - type: entity id: ConstructJuggernaut diff --git a/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/souls_shards.yml b/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/souls_shards.yml index f872f63403..e410a81c75 100644 --- a/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/souls_shards.yml +++ b/Resources/Prototypes/WhiteDream/Entities/Objects/Cult/souls_shards.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: soul shard description: Mysterious glowing shard. parent: BaseItem @@ -35,6 +35,13 @@ - type: Speech - type: IsDeadIC - type: SoulShard + - type: LanguageKnowledge + speaks: + - TauCetiBasic + - Eldritch + understands: + - TauCetiBasic + - Eldritch - type: entity parent: SoulShard From 114ecde8384ae3d98350aa80d38b96766dc49cfa Mon Sep 17 00:00:00 2001 From: SimpleStation Changelogs Date: Mon, 2 Dec 2024 16:47:35 +0000 Subject: [PATCH 15/24] Automatic Changelog Update (#1303) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1bbf800719..b9edc3998e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8351,3 +8351,12 @@ Entries: id: 6552 time: '2024-12-01T23:56:50.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1302 +- author: Skubman + changes: + - type: Tweak + message: >- + Cultist constructs and soul shards now speak Tau-Ceti Basic and + Eldritch. + id: 6553 + time: '2024-12-02T16:47:10.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1303 From 8f4f3176a4e69bbdcdd1d4148b9269ef323e7387 Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Tue, 3 Dec 2024 12:22:48 -0400 Subject: [PATCH 16/24] Unrelated --- .../Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl b/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl index 3b31fe4663..c7a7affa08 100644 --- a/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl +++ b/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl @@ -1,4 +1,4 @@ -#When an admin adds a game rule +# When an admin adds a game rule add-gamerule-admin = Game rule({$rule}) added - {$admin} list-gamerule-admin-header = | Time | Rule added list-gamerule-admin-no-rules = No game rules have been added. From 4588d029fc7141353956e0e454ddd6668eaa0399 Mon Sep 17 00:00:00 2001 From: Dmitri Date: Tue, 3 Dec 2024 05:06:57 -0500 Subject: [PATCH 17/24] Made ChemMaster Sorted (#2498) * Made ChemMaster Sorted Updated chem master xaml to sort results * Revert "Made ChemMaster Sorted" This reverts commit 3430d748d6d041f6303810507da2e015e873784e. * Reverted and simplified Reverted previous change and used code provided by whatson * Update Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs index 5eace08a7f..d186e36ac4 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs @@ -182,7 +182,7 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state) }; bufferHBox.AddChild(bufferVol); - foreach (var (reagent, quantity) in state.BufferReagents) + foreach (var (reagent, quantity) in state.BufferReagents.OrderBy(x => x.Reagent.Prototype)) // Frontier: add OrderBy { // Try to get the prototype for the given reagent. This gives us its name. _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto); From 46d88148787df711e57f6b8b7fc882fbd84f2a44 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Sat, 2 Nov 2024 14:26:39 -0600 Subject: [PATCH 18/24] One --- Resources/Prototypes/Store/presets.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml index 5086a01d0c..38625c9945 100644 --- a/Resources/Prototypes/Store/presets.yml +++ b/Resources/Prototypes/Store/presets.yml @@ -9,6 +9,7 @@ - UplinkBundles - UplinkTools - UplinkUtility + - UplinkDeception - UplinkImplants - UplinkJob - UplinkArmor From d857a233547adf4752832e2fb6687edaec17a397 Mon Sep 17 00:00:00 2001 From: fenndragon Date: Sat, 2 Nov 2024 14:34:26 -0600 Subject: [PATCH 19/24] Update uplink_catalog.yml --- Resources/Prototypes/Catalog/uplink_catalog.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index b813789c5e..387b7cfe46 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -403,6 +403,7 @@ Telecrystal: 40 categories: - UplinkMisc + - UplinkMisc conditions: - !type:StoreWhitelistCondition whitelist: @@ -423,6 +424,7 @@ Telecrystal: 6 categories: - UplinkMisc + - UplinkMisc saleLimit: 1 - type: listing @@ -434,6 +436,7 @@ Telecrystal: 5 categories: - UplinkMisc + - UplinkMisc saleLimit: 1 - type: listing @@ -445,6 +448,7 @@ Telecrystal: 4 categories: - UplinkMisc + - UplinkMisc saleLimit: 1 - type: listing @@ -456,6 +460,7 @@ Telecrystal: 4 categories: - UplinkMisc + - UplinkMisc saleLimit: 1 - type: listing @@ -467,6 +472,7 @@ Telecrystal: 12 categories: - UplinkMisc + - UplinkMisc saleLimit: 1 - type: listing @@ -478,6 +484,7 @@ Telecrystal: 2 categories: - UplinkMisc + - UplinkMisc - type: listing id: UplinkMedsBundle @@ -488,6 +495,7 @@ Telecrystal: 20 categories: - UplinkMisc + - UplinkMisc conditions: - !type:StoreWhitelistCondition whitelist: @@ -510,6 +518,7 @@ Telecrystal: 3 categories: - UplinkUtility + - UplinkUtility - type: listing id: UplinkStealthBox @@ -520,6 +529,7 @@ Telecrystal: 5 categories: - UplinkUtility + - UplinkUtility - type: listing id: UplinkChameleonProjector @@ -530,6 +540,7 @@ Telecrystal: 7 categories: - UplinkUtility + - UplinkUtility - type: listing id: UplinkCyberpen @@ -540,6 +551,7 @@ Telecrystal: 1 categories: - UplinkUtility + - UplinkUtility - type: listing id: UplinkDecoyDisk @@ -550,6 +562,7 @@ Telecrystal: 1 categories: - UplinkUtility + - UplinkUtility - type: listing id: UplinkUltrabrightLantern @@ -560,6 +573,7 @@ Telecrystal: 2 categories: - UplinkUtility + - UplinkUtility - type: listing id: UplinkBribe @@ -570,6 +584,7 @@ Telecrystal: 4 categories: - UplinkUtility + - UplinkUtility # - type: listing # id: UplinkGigacancerScanner @@ -580,6 +595,7 @@ # Telecrystal: 5 # categories: # - UplinkUtility +# - UplinkUtility - type: listing id: UplinkHolster From 3850de7dad3c2d4e63b24fcc1abcd487cb8c01ad Mon Sep 17 00:00:00 2001 From: fenndragon Date: Sat, 2 Nov 2024 14:35:48 -0600 Subject: [PATCH 20/24] Remove deception, put items into utility. --- Resources/Prototypes/Store/presets.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml index 38625c9945..5086a01d0c 100644 --- a/Resources/Prototypes/Store/presets.yml +++ b/Resources/Prototypes/Store/presets.yml @@ -9,7 +9,6 @@ - UplinkBundles - UplinkTools - UplinkUtility - - UplinkDeception - UplinkImplants - UplinkJob - UplinkArmor From 0de5ce3e64376e3867f0ef798ac570c2a31c30ee Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Wed, 4 Dec 2024 12:58:18 -0400 Subject: [PATCH 21/24] Add ComplexInteractions check for power toggles. --- Content.Server/Power/EntitySystems/PowerReceiverSystem.cs | 8 +++++++- Content.Shared/Interaction/SharedInteractionSystem.cs | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index 2157a53a53..9ba30813dd 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -13,6 +13,8 @@ using Robust.Shared.Audio; using Robust.Shared.Utility; using Content.Shared.Emp; +using Content.Shared.Interaction; + namespace Content.Server.Power.EntitySystems { @@ -22,6 +24,7 @@ public sealed class PowerReceiverSystem : EntitySystem [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly AudioSystem _audio = default!; + [Dependency] private readonly SharedInteractionSystem _interaction = default!; private EntityQuery _recQuery; private EntityQuery _provQuery; @@ -120,12 +123,15 @@ private void OnReceiverDisconnected(EntityUid uid, ApcPowerProviderComponent pro private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, GetVerbsEvent args) { - if(!args.CanAccess || !args.CanInteract) + if (!args.CanAccess || !args.CanInteract) return; if (!HasComp(args.User)) return; + if (!_interaction.SupportsComplexInteractions(args.User)) + return; + if (!_recQuery.TryGetComponent(uid, out var receiver)) return; diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index c225b70fa2..1a35e62b65 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -1002,10 +1002,10 @@ public void InteractUsing( /// Used when clicking on an entity resulted in no other interaction. Used for low-priority interactions. /// public void InteractDoAfter( - EntityUid user, - EntityUid used, - EntityUid? target, - EntityCoordinates clickLocation, + EntityUid user, + EntityUid used, + EntityUid? target, + EntityCoordinates clickLocation, bool canReach, bool checkDeletion = false ) From 664b42399c18f8e8bd79d80541e5d30feb05a2bb Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Wed, 4 Dec 2024 13:00:57 -0400 Subject: [PATCH 22/24] Cleanup --- Content.Shared/Interaction/SharedInteractionSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 1a35e62b65..0492a3fa2a 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -973,7 +973,7 @@ public void InteractUsing( bool checkCanInteract = true, bool checkCanUse = true) { - if ((IsDeleted(user) || IsDeleted(used) || IsDeleted(target))) + if (IsDeleted(user) || IsDeleted(used) || IsDeleted(target)) return; if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target)) From a515ebfb9e908726bbaaa3c96f6036afadf8cc6b Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Wed, 4 Dec 2024 13:21:44 -0400 Subject: [PATCH 23/24] A revenant will never have hands, silly self. --- Content.Shared/Interaction/SharedInteractionSystem.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 0492a3fa2a..3f2e04d265 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -1097,10 +1097,6 @@ public bool InteractionActivate( if (checkAccess && !_containerSystem.IsInSameOrParentContainer(user, used) && !CanAccessViaStorage(user, used)) return false; - // Does the user have hands? - if (!HasComp(user)) - return false; - complexInteractions ??= SupportsComplexInteractions(user); var activateMsg = new ActivateInWorldEvent(user, used, complexInteractions.Value); RaiseLocalEvent(used, activateMsg, true); From 0d982d25a6643f07608cb38f8876cd9c7b85bbaa Mon Sep 17 00:00:00 2001 From: sleepyyapril Date: Wed, 4 Dec 2024 14:01:43 -0400 Subject: [PATCH 24/24] Enable revenants --- Resources/Prototypes/GameRules/events.yml | 24 +++++++++---------- .../Nyanotrasen/GameRules/events.yml | 22 ++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index efea75f73f..fdfc81d999 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -106,18 +106,18 @@ minimumPlayers: 30 # Floof - type: NinjaSpawnRule -#- type: entity -# parent: BaseGameRule -# id: RevenantSpawn -# categories: [ HideSpawnMenu ] -# components: -# - type: StationEvent -# weight: 7.5 -# duration: 1 -# earliestStart: 45 -# minimumPlayers: 20 -# - type: RandomSpawnRule -# prototype: MobRevenant +- type: entity + parent: BaseGameRule + id: RevenantSpawn + categories: [ HideSpawnMenu ] + components: + - type: StationEvent + weight: 7.5 + duration: 1 + earliestStart: 45 + minimumPlayers: 20 + - type: RandomSpawnRule + prototype: MobRevenant # disabled until event is rewritten to be more interesting #- type: entity diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml index de0da97ab5..1099c643f3 100644 --- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml +++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml @@ -155,17 +155,17 @@ maximumGlimmer: 1000 - type: GlimmerRandomSentienceRule -#- type: entity -# parent: BaseGlimmerSignaturesEvent -# id: GlimmerRevenantSpawn -# categories: [ HideSpawnMenu ] -# components: -# - type: GlimmerEvent -# minimumGlimmer: 450 -# maximumGlimmer: 900 -# glimmerBurnLower: 50 -# glimmerBurnUpper: 100 # Gives epi a chance to recover -# - type: GlimmerRevenantRule +- type: entity + parent: BaseGlimmerSignaturesEvent + id: GlimmerRevenantSpawn + categories: [ HideSpawnMenu ] + components: + - type: GlimmerEvent + minimumGlimmer: 450 + maximumGlimmer: 900 + glimmerBurnLower: 50 + glimmerBurnUpper: 100 # Gives epi a chance to recover + - type: GlimmerRevenantRule - type: entity parent: BaseGlimmerSignaturesEvent