Skip to content

Commit

Permalink
Merge branch 'master' into things
Browse files Browse the repository at this point in the history
  • Loading branch information
BL02DL authored Nov 16, 2024
2 parents b97fb29 + 2d59a90 commit 7236b29
Show file tree
Hide file tree
Showing 21 changed files with 89 additions and 7 deletions.
22 changes: 22 additions & 0 deletions Resources/Changelog/ChangelogLPP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2805,3 +2805,25 @@
id: 147
time: '2024-11-07T18:09:48.0000000+00:00'
url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/322
- author: Kest
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0433\u0440\
\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435 \u043F\u043E \u0440\u043E\u0441\
\u0442\u0443 \u0434\u043B\u044F \u041A\u0430\u043F\u0438\u0442\u0430\u043D\u0430\
\ (\u043E\u0442 150\u0441\u043C)"
type: Add
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0433\u0440\
\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435 \u043F\u043E \u0440\u043E\u0441\
\u0442\u0443 \u0434\u043B\u044F \u043E\u0442\u0434\u0435\u043B\u0430 \u0421\u0411\
\ \u0438 \u041E\u0421\u0429 (\u043E\u0442 160\u0441\u043C)"
type: Add
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0432\u0435\u0440\u0445\
\u043D\u0438\u0435/\u043D\u0438\u0436\u043D\u0438\u0435 \u043F\u043E\u0440\u043E\
\u0433\u0438 \u0434\u043B\u044F \u0440\u043E\u0441\u0442\u0430 \u0443 \u043D\
\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0440\u0430\u0441 \u0434\u043B\
\u044F \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u044F\
\ \u0438\u043C\u0435\u044E\u0449\u0438\u043C\u0441\u044F \u043B\u043E\u0440\u0443"
type: Tweak
id: 148
time: '2024-11-16T12:47:09.0000000+00:00'
url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/329
2 changes: 1 addition & 1 deletion Resources/Credits/GitHub.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, angelofallars, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlueHNT, Boaz1111, BobdaBiscuit, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, CilliePaint, clorl, Clyybber, CodedCrow, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, d4kii, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, dootythefrooty, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, Evgencheg, exincore, exp111, Fahasor, FairlySadPanda, Fansana, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, geraeumig, Git-Nivrak, github-actions[bot], gituhabu, gluesniffler, Golinth, GoodWheatley, gradientvera, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, Ichaie, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, Lgibb18, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Mnemotechnician, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, nyeogmi, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, paolordls, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, ShatteredSwords, SignalWalker, SimpleStation14, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, stellar-novas, StrawberryMoses, superjj18, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, Tmanzxd, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UltimateJester, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zerorulez, zionnBE, ZNixian, ZoldorfTheWizard, Zymem
0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, angelofallars, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, beck-thompson, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlueHNT, Boaz1111, BobdaBiscuit, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, CilliePaint, clorl, Clyybber, CodedCrow, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, d4kii, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, dootythefrooty, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, Evgencheg, exincore, exp111, Fahasor, FairlySadPanda, Fansana, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, geraeumig, Git-Nivrak, github-actions[bot], gituhabu, gluesniffler, Golinth, GoodWheatley, gradientvera, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, Ichaie, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, KaiShibaa, kalane15, kalanosh, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, Lgibb18, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Mnemotechnician, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, nyeogmi, OCOtheOmega, OctoRocket, OldDanceJacket, osjarw, Owai-Seek, pali6, Pangogie, paolordls, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuroSlavKing, qrtDaniil, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, ShatteredSwords, SignalWalker, SimpleStation14, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, SleepyScarecrow, sleepyyapril, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpaceRox1244, SpeltIncorrectyl, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, stellar-novas, StrawberryMoses, superjj18, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, Tmanzxd, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UltimateJester, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zerorulez, zionnBE, ZNixian, ZoldorfTheWizard, Zymem
2 changes: 2 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-brigmedic
playTimeTracker: JobBrigmedic
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:DepartmentTimeRequirement
department: Medical
min: 21600 # 6 hrs
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/DeltaV/Species/vulpkanin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
maleFirstNames: names_vulpkanin_male
femaleFirstNames: names_vulpkanin_female
lastNames: names_vulpkanin_last
minHeight: 0.75
defaultHeight: 0.85
maxHeight: 1.1
minWidth: 0.65
defaultWidth: 0.85
maxWidth: 1.15

- type: speciesBaseSprites
id: MobVulpkaninSprites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-guard
playTimeTracker: JobPrisonGuard
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterOverallTimeRequirement
min: 18000
- !type:DepartmentTimeRequirement
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Command/captain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-captain
playTimeTracker: JobCaptain
requirements:
- !type:CharacterHeightRequirement
min: 150
- !type:CharacterAgeRequirement
min: 25
max: 80
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/detective.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-detective
playTimeTracker: JobDetective
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 36000 # DeltaV - 10 hours
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-hos
playTimeTracker: JobHeadOfSecurity
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterPlaytimeRequirement
tracker: JobWarden
min: 14400 #DeltaV 4 hrs
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-cadet
playTimeTracker: JobSecurityCadet
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterOverallTimeRequirement
min: 14400 # DeltaV - 4 hours
# - !type:DepartmentTimeRequirement # Lost Paradise - return time limit
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-security
playTimeTracker: JobSecurityOfficer
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 14400 # DeltaV - 4 hours
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
playTimeTracker: JobSeniorOfficer
setPreference: false # DeltaV - Disable Senior Roles round start selection
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterPlaytimeRequirement
tracker: JobWarden
min: 21600 #6 hrs
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/warden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-warden
playTimeTracker: JobWarden
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterPlaytimeRequirement # DeltaV - JobSecurityOfficer time requirement. Make them experienced in proper officer work.
tracker: JobSecurityOfficer
min: 43200 # DeltaV - 12 hrs
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Species/arachnid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
lastNames: names_arachnid_last
sexes:
- Unsexed
minHeight: 0.9
defaultHeight: 1
maxHeight: 1.45
minWidth: 0.80
defaultWidth: 1
maxWidth: 1.5

- type: speciesBaseSprites
id: MobArachnidSprites
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Species/human.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
markingLimits: MobHumanMarkingLimits
dollPrototype: MobHumanDummy
skinColoration: HumanToned
minHeight: 0.8
defaultHeight: 1
maxHeight: 1.25
minWidth: 0.7
defaultWidth: 1
maxWidth: 1.25

# The lack of a layer means that
# this person cannot have round-start anything
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Species/moth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
maleFirstNames: names_moth_first_male
femaleFirstNames: names_moth_first_female
lastNames: names_moth_last
minHeight: 0.8
defaultHeight: 0.9
maxHeight: 1.3
minWidth: 0.70
defaultWidth: 0.9
maxWidth: 1.35

- type: speciesBaseSprites
id: MobMothSprites
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Species/reptilian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
maleFirstNames: names_reptilian_male
femaleFirstNames: names_reptilian_female
naming: FirstDashFirst
minHeight: 0.7
defaultHeight: 0.95
maxHeight: 1.25
minWidth: 0.65
defaultWidth: 0.95
maxWidth: 1.3
minHeight: 0.8
defaultHeight: 1.15
maxHeight: 1.35
minWidth: 0.70
defaultWidth: 1.15
maxWidth: 1.40

- type: speciesBaseSprites
id: MobReptilianSprites
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Species/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
markingLimits: MobSlimeMarkingLimits
dollPrototype: MobSlimePersonDummy
skinColoration: Hues
minHeight: 0.7
defaultHeight: 0.8
maxHeight: 1.1
minWidth: 0.65
defaultWidth: 0.7
maxWidth: 1.15

- type: speciesBaseSprites
id: MobSlimeSprites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
maleFirstNames: firstMaleTajaran
femaleFirstNames: firstFemaleTajaran
lastNames: TajaranLast
minHeight: 0.7
defaultHeight: 0.8
maxHeight: 1
minWidth: 0.60
defaultWidth: 0.8
maxWidth: 1.05

- type: speciesBaseSprites
id: MobTajaranSprites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-blueshieldofficer
playTimeTracker: JobBlueShieldOfficer
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterAgeRequirement
min: 25
max: 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-security-enginer
playTimeTracker: LPPJobSecurityEnginer
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 36000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
description: job-description-secpilot
playTimeTracker: JobPilot
requirements:
- !type:CharacterHeightRequirement
min: 160
- !type:CharacterPlaytimeRequirement
tracker: JobSecurityOfficer
min: 14400 # 4 hrs
Expand Down

0 comments on commit 7236b29

Please sign in to comment.