diff --git a/Resources/Prototypes/Datasets/Names/som_first.yml b/Resources/Prototypes/Datasets/Names/som_first.yml new file mode 100644 index 00000000000..1bb28aa541f --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/som_first.yml @@ -0,0 +1,53 @@ +- type: dataset + id: names_som_first + values: + - Ares + - Phobos + - Marsius + - Tiberius + - Valerius + - Galba + - Titus + - Antonius + - Cassius + - Augustus + - Claudius + - Maximus + - Flavius + - Lucius + - Octavius + - Brutus + - Julius + - Marcellus + - Publius + - Caius + - Hadrianus + - Caligula + - Nero + - Commodus + - Traianus + - Seneca + - Ovidius + - Livius + - Plinius + - Vespasianus + - Vitellius + - Justinianus + - Gaius + - Constantinus + - Drusus + - Valentinianus + - Galerius + - Gordianus + - Diocletianus + - Caracalla + - Pertinax + - Valerianus + - Gratianus + - Theodosius + - Honorius + - Arcadius + - Majorianus + - Anthemius + - Olybrius + - Glycerius diff --git a/Resources/Prototypes/Datasets/Names/som_last.yml b/Resources/Prototypes/Datasets/Names/som_last.yml new file mode 100644 index 00000000000..4e9517499a2 --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/som_last.yml @@ -0,0 +1,55 @@ +- type: dataset + id: names_som_last + values: + - Bellator + - Fortis + - Aquilifer + - Fulgor + - Ignis + - Ferrum + - Gladius + - Venator + - Tonitrus + - Volcanus + - Ferocitas + - Draco + - Martialis + - Astrum + - Stellatus + - Marte + - Ferox + - Telum + - Ignitus + - Caelum + - Bellatorius + - Excidium + - Vindex + - Astra + - Obsidio + - Fulmen + - Fervor + - Fortis + - Martialis + - Ignitus + - Gladius + - Bellator + - Excidium + - Ferrum + - Fulmen + - Telum + - Martialis + - Ignitus + - Gladius + - Bellator + - Excidio + - Martialis + - Ignitus + - Gladius + - Bellator + - Ferocitas + - Fulgor + - Ignis + - Bellator + - Ignis + + diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 82f660e7851..d9f1a928082 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -464,9 +464,9 @@ description: These tactical gloves are perfect for choking out Terran opressors. components: - type: Sprite - sprite: Clothing/Hands/Gloves/Boxing/somgloves.rsi + sprite: Clothing/Hands/Gloves/somgloves.rsi - type: Clothing - sprite: Clothing/Hands/Gloves/Boxing/somgloves.rsi + sprite: Clothing/Hands/Gloves/somgloves.rsi - type: Insulated - type: Fiber fiberMaterial: fibers-insulative \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 5e4eb2f5411..526b9d3bfcd 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -103,3 +103,22 @@ name: Syndicate Clone Soldier description: Urist Squad has been activated, work with your brothers and complete your objective. - type: GhostTakeoverAvailable + +# Sons of Mars +- type: entity + save: false + name: Martian Marine + parent: BaseMobHuman + id: MobSOMAgent + components: + - type: Loadout + prototypes: + - MartianMarineGear + - type: RandomMetadata + nameSegments: + - names_som_first + - names_som_last + - type: GhostRole + name: Martian Marine + description: Rise, Son of Mars, and crush the skulls of your Terran opressors! + - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index a4e0d8713cb..5bc61d59c77 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -354,3 +354,16 @@ mask: ClothingMaskGasMerc belt: ClothingBeltMercWebbing +# Sons of Mars +- type: startingGear + id: MartianMarineGear + equipment: + jumpsuit: ClothingUniformSOM + outerClothing: ClothingSoMMedium + back: ClothingBackpackSatchelLeather + shoes: ClothingShoesSOM + gloves: ClothingHandsGlovesSOM + head: ClothingHeadHelmetSOM + id: PassengerPDA + ears: ClothingHeadsetFreelance + mask: ClothingMaskGasSecurity diff --git a/Resources/Textures/Clothing/Hands/Gloves/somgloves.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/somgloves.rsi/equipped-HAND.png index 1452e87fe82..33bfce051b2 100644 Binary files a/Resources/Textures/Clothing/Hands/Gloves/somgloves.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/somgloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/somleaderhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/somleaderhelm.rsi/equipped-HELMET.png index d790aefca32..837674e8fb9 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/somleaderhelm.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/somleaderhelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/equipped-HELMET.png index 6b279e5a08c..c4101e6d7ca 100644 Binary files a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/sonsheavy.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/sonsheavy.rsi/equipped-OUTERCLOTHING.png index bc2893feb54..fc21ded03c4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Misc/sonsheavy.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Misc/sonsheavy.rsi/equipped-OUTERCLOTHING.png differ