Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/_LuaM/Organs.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ent-OrganVulpkaninEyes = Глаза вульпканина
.desc = Они отражают красные тона
ent-JunkCannon = Глаза таяры
.desc = Они отражают даже самые слабые лучи света
ent-OrganTajaranEyes = Кошачьи глаза
.desc = Они отражают даже самые слабые лучи света
55,702 changes: 55,702 additions & 0 deletions Resources/Maps/_LuaM/POI/HeliosLuaM.yml

Large diffs are not rendered by default.

69,976 changes: 69,976 additions & 0 deletions Resources/Maps/_LuaM/POI/camelotLuaM.yml

Large diffs are not rendered by default.

9,421 changes: 9,421 additions & 0 deletions Resources/Maps/_LuaM/Shuttles/PDV/FenrirLuaM.yml

Large diffs are not rendered by default.

4,159 changes: 4,159 additions & 0 deletions Resources/Maps/_LuaM/Shuttles/PDV/SpyglassMK2LuaM.yml

Large diffs are not rendered by default.

3,684 changes: 3,684 additions & 0 deletions Resources/Maps/_LuaM/Shuttles/PDV/TethysLuaM.yml

Large diffs are not rendered by default.

20,695 changes: 20,695 additions & 0 deletions Resources/Maps/_LuaM/Shuttles/PDV/VultureLuaM.yml

Large diffs are not rendered by default.

10,435 changes: 10,435 additions & 0 deletions Resources/Maps/_LuaM/Shuttles/PDV/europaLuaM.yml

Large diffs are not rendered by default.

10,350 changes: 10,350 additions & 0 deletions Resources/Maps/_LuaM/Shuttles/PDV/santieLuaM.yml

Large diffs are not rendered by default.

5,314 changes: 5,314 additions & 0 deletions Resources/Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions Resources/Prototypes/Body/Organs/human.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@
- type: Item
size: Small
heldPrefix: brain
- type: RadarBlip # LuaM
radarColor: "#E0FFFF"
scale: 6
shape: Star
visibleFromOtherGrids: true
gridConfig:
color: "#E0FFFF"
shape: Star
respectZoom: true
rotate: true
bounds: "-0.5,-0.5,0.5,0.5"
# - type: RadarBlip # LuaM
# radarColor: "#E0FFFF"
# scale: 6
# shape: Star
# visibleFromOtherGrids: true
# gridConfig:
# color: "#E0FFFF"
# shape: Star
# respectZoom: true
# rotate: true
# bounds: "-0.5,-0.5,0.5,0.5"

- type: entity
id: OrganHumanEyes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
uiWindowPos: 1,3
strippingWindowPos: 1,1
displayName: Mask
# - name: eyes
# slotTexture: glasses
# slotFlags: EYES
# stripTime: 3
# uiWindowPos: 0,4
# strippingWindowPos: 0,0
# displayName: Eyes
- name: eyes # LuaM - Enabled
slotTexture: glasses
slotFlags: EYES
stripTime: 3
uiWindowPos: 0,4
strippingWindowPos: 0,0
displayName: Eyes
- name: ears
slotTexture: ears
slotFlags: EARS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- torso
organs:
brain: OrganHumanBrain
eyes: OrganHumanEyes
eyes: OrganTajaranEyes # LuaM - OrganHumanEyes -> OrganTajaranEyes
torso:
part: TorsoHuman
connections:
Expand Down Expand Up @@ -47,4 +47,4 @@
right foot:
part: RightFootHuman
left foot:
part: LeftFootHuman
part: LeftFootHuman
6 changes: 3 additions & 3 deletions Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
- type: damageModifierSet
id: Felinid
coefficients:
Blunt: 1.1 # 1.15->1.1 Mono
Slash: 1.1 # 1.15->1.1 Mono
# Piercing: 1.1
Blunt: 1.25 # 1.15 -> 1.1 by Mono, 1.1 -> 1.25 by LuaM
Slash: 1.25 # 1.15 -> 1.1 by Mono, 1.1 -> 1.25 by LuaM
Piercing: 1.15 # disabled by Mono, 1.1 -> 1.25 and enabled by LuaM
2 changes: 1 addition & 1 deletion Resources/Prototypes/Nyanotrasen/Species/felinid.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Felinid
name: species-name-felinid
roundStart: false # Mono
roundStart: true # LuaM - false -> true (меня заставили)
prototype: MobFelinid
sprites: MobHumanSprites
markingLimits: MobFelinidMarkingLimits
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
- ReptilianCube
- VulpkaninCube
- SlimePersonCube
- YowieCube
# - YowieCube #LuaM - Disabled... Хуй вам а не выключение передозов
- VoxCube
- ResomiCube
- GoblinCube
- ChitinidCube
# - ProtogenCube #mono: retired
- ProtogenCube #LuaM - enabled
2 changes: 1 addition & 1 deletion Resources/Prototypes/Species/arachnid.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Arachnid
name: species-name-arachnid
roundStart: true
roundStart: false #LuaM True -> false due to a bug
prototype: MobArachnid
sprites: MobArachnidSprites
defaultSkinTone: "#385878"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
- type: MobThresholds
thresholds:
0: Alive
100: Dead # mono
150: Dead # LuaM - 100 -> 150
stateAlertDict:
Alive: BorgHealth
Critical: BorgCrit
Expand All @@ -87,9 +87,9 @@
- !type:GibBehavior { }
- type: SlowOnDamage
speedModifierThresholds:
60: 0.7
90: 0.5
120: 0.3
90: 0.8 # LuaM 60 -> 90 / 0.7 -> 0.8
115: 0.5 # LuaM 90 -> 115
140: 0.3 # LuaM 120 -> 140
- type: SiliconDownOnDead
- type: Inventory
templateId: ipc
Expand All @@ -111,7 +111,7 @@
0: 0.00
- type: BatteryDrinker
- type: EncryptionKeyHolder
keySlots: 8 # Mono
keySlots: 18 # LuaM - 8 -> 18
examineWhileLocked: false
keysExtractionMethod: Cutting
keysUnlocked: false
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/_Mono/Body/Organs/protogen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@
components:
- type: Organ # Shitmed Change
slotId: eyes # Shitmed Change
onAdd:
- type: ThermalVision # LuaM
flashDurationMultiplier: 1
pulseTime: 2
isEquipment: false
toggleAction: PulseVulpkaninThermalVision
color: "#da4260"
- type: Eyes # Shitmed Change
- type: Sprite
layers:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
- type: damageModifierSet # Mono
id: Protogen
coefficients:
Heat: 1.3
Heat: 1.1 # 1.3 -> 1.1 by LuaM
Cold: 1.15
Radiation: 1.55
Shock: 1.5
# Shock: 1.5 # Disabled by LuaM
Blunt: 0.8
Slash: 0.9
Piercing: 0.9
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/PointsOfInterest/pdvhelios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
maximumDistance: 9500
spawnGamePreset: [ NFAdventure, NFPirate, MonoStandard, MonoRogueTSF, MonoRogueUSSP, MonoADS, MonoChimera, MonoMixed, MonoAllAtOnce ]
spawnGroup: Required
gridPath: /Maps/_Mono/POI/pdvhelios.yml
gridPath: /Maps/_LuaM/POI/HeliosLuaM.yml #LuaM: /Maps/_Mono/POI/pdvhelios.yml -> /Maps/_LuaM/POI/heliosLuaM.yml
addComponents:
- type: IFF
color: "#DE9E59"
Expand All @@ -22,7 +22,7 @@
- type: gameMap
id: HeliosFortress
mapName: 'PDV Helio Fortress'
mapPath: /Maps/_Mono/POI/pdvhelios.yml
mapPath: /Maps/_LuaM/POI/HeliosLuaM.yml #LuaM: /Maps/_Mono/POI/pdvhelios.yml -> /Maps/_LuaM/POI/heliosLuaM.yml
minPlayers: 0
stations:
HeliosFortress:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/PointsOfInterest/ussp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
maximumDistance: 12400
spawnGamePreset: [ NFAdventure, NFPirate, MonoStandard, MonoRogueUSSP, MonoTSFUSSP, MonoADS, MonoChimera, MonoMixed, MonoAllAtOnce ]
spawnGroup: Required
gridPath: /Maps/_Mono/POI/camelot.yml
gridPath: /Maps/_LuaM/POI/camelotLuaM.yml # LuaM: /Maps/_Mono/POI/camelot.yml -> /Maps/_LuaM/POI/camelotLuaM.yml
addComponents:
- type: IFF
color: "#ccaa55"

- type: gameMap
id: USSPCamelot
mapName: 'Camelot Station'
mapPath: /Maps/_Mono/POI/camelot.yml
mapPath: /Maps/_LuaM/POI/camelotLuaM.yml # LuaM: /Maps/_Mono/POI/camelot.yml -> /Maps/_LuaM/POI/camelotLuaM.yml
minPlayers: 0
stations:
USSPCamelot:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/Shipyard/BlackMarket/europa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
category: Large
group: BlackMarket
access: Pirate
shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/europa.yml
shuttlePath: /Maps/_LuaM/Shuttles/PDV/europaLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/europa.yml -> /Maps/_LuaM/Shuttles/PDV/europaLuaM.yml
guidebookPage: Null
class:
- Pirate
Expand All @@ -22,7 +22,7 @@
- type: gameMap
id: Europa
mapName: 'PDV Europa'
mapPath: /Maps/_Mono/Shuttles/BlackMarket/europa.yml
mapPath: /Maps/_LuaM/Shuttles/PDV/europaLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/europa.yml -> /Maps/_LuaM/Shuttles/PDV/europaLuaM.yml
minPlayers: 0
stations:
Europa:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/Shipyard/BlackMarket/fenrir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
category: Medium
group: BlackMarket
access: Pirate
shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/fenrir.yml
shuttlePath: /Maps/_LuaM/Shuttles/PDV/FenrirLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/Fenrir.yml -> /Maps/_LuaM/Shuttles/PDV/FenrirLuaM.yml
guidebookPage: ShipyardFenrir
class:
- Pirate
Expand All @@ -21,7 +21,7 @@
- type: gameMap
id: Fenrir
mapName: 'PDV Fenrir'
mapPath: /Maps/_Mono/Shuttles/BlackMarket/fenrir.yml
mapPath: /Maps/_LuaM/Shuttles/PDV/FenrirLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/Fenrir.yml -> /Maps/_LuaM/Shuttles/PDV/FenrirLuaM.yml
minPlayers: 0
stations:
Fenrir:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/Shipyard/BlackMarket/saintie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
purchasable: false # Voucher only
category: Large
group: BlackMarket
shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/saintie.yml
shuttlePath: /Maps/_LuaM/Shuttles/PDV/santieLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/santie.yml -> /Maps/_LuaM/Shuttles/PDV/santieLuaM.yml
guidebookPage: Null
class:
- Pirate
Expand All @@ -21,7 +21,7 @@
- type: gameMap
id: Saintie
mapName: 'Saintie'
mapPath: /Maps/_Mono/Shuttles/BlackMarket/saintie.yml
mapPath: /Maps/_LuaM/Shuttles/PDV/santieLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/santie.yml -> /Maps/_LuaM/Shuttles/PDV/santieLuaM.yml
minPlayers: 0
stations:
Saintie:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
category: Medium
group: BlackMarket
access: Pirate
shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/scorpion.yml
shuttlePath: /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml
guidebookPage: Null
class:
- Pirate
Expand All @@ -22,7 +22,7 @@
- type: gameMap
id: Scorpion
mapName: 'PDV Scorpion'
mapPath: /Maps/_Mono/Shuttles/BlackMarket/scorpion.yml
mapPath: /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/skorpion.yml -> /Maps/_LuaM/Shuttles/PDV/skorpionLuaM.yml
minPlayers: 0
stations:
Scorpion:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
category: Small
group: BlackMarket
access: Pirate
shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/spyglassmk2.yml
shuttlePath: /Maps/_LuaM/Shuttles/PDV/SpyglassMK2LuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/spyglassmk2.yml -> /Maps/_LuaM/Shuttles/PDV/SpyglassMK2LuaM.yml
guidebookPage: Null
class:
- Pirate
Expand All @@ -20,7 +20,7 @@
- type: gameMap
id: SpyglassMKII
mapName: 'PDV Spyglass MKII'
mapPath: /Maps/_Mono/Shuttles/BlackMarket/spyglassmk2.yml
mapPath: /Maps/_LuaM/Shuttles/PDV/SpyglassMK2LuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/spyglassmk2.yml -> /Maps/_LuaM/Shuttles/PDV/SpyglassMK2LuaM.yml
minPlayers: 0
stations:
SpyglassMKII:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/Shipyard/BlackMarket/tethys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
category: Medium
group: BlackMarket
access: Pirate
shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/tethys.yml
shuttlePath: /Maps/_LuaM/Shuttles/PDV/TethysLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/Tethys.yml -> /Maps/_LuaM/Shuttles/PDV/TethysLuaM.yml
guidebookPage: Null
class:
- Pirate
Expand All @@ -19,7 +19,7 @@
- type: gameMap
id: Tethys
mapName: 'PDV Tethys'
mapPath: /Maps/_Mono/Shuttles/BlackMarket/tethys.yml
mapPath: /Maps/_LuaM/Shuttles/PDV/TethysLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/Tethys.yml -> /Maps/_LuaM/Shuttles/PDV/TethysLuaM.yml
minPlayers: 0
stations:
Tethys:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Mono/Shipyard/BlackMarket/vulture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
category: Large
group: BlackMarket
access: Pirate
shuttlePath: /Maps/_Mono/Shuttles/BlackMarket/vulture.yml
shuttlePath: /Maps/_LuaM/Shuttles/PDV/VultureLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/vulture.yml -> /Maps/_LuaM/Shuttles/PDV/vultureLuaM.yml
guidebookPage: Null
class:
- Pirate
Expand All @@ -22,7 +22,7 @@
- type: gameMap
id: Vulture
mapName: 'Vulture'
mapPath: /Maps/_Mono/Shuttles/BlackMarket/vulture.yml
mapPath: /Maps/_LuaM/Shuttles/PDV/VultureLuaM.yml # LuaM: /Maps/_Mono/Shuttles/BlackMarket/vulture.yml -> /Maps/_LuaM/Shuttles/PDV/vultureLuaM.yml
minPlayers: 0
stations:
Vulture:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Mono/Species/protogen.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: species
id: Protogen
name: species-name-protogen
roundStart: false
roundStart: true # LuaM - false -> true
prototype: MobProtogen
sprites: MobProtogenSprites
defaultSkinTone: "#ffda93"
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/radio_channels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- type: radioChannel
id: Traffic
name: chat-radio-traffic
keycode: 'd'
keycode: 'д' # LuaM - локалайз каналов
frequency: 1022
color: "#CC6633"
maxRange: 1500
Expand All @@ -13,7 +13,7 @@
- type: radioChannel
id: Nfsd
name: chat-radio-ncmc
keycode: 's'
keycode: 'т' # LuaM - локалайз каналов
frequency: 1023
color: "#0c8ad3"

Loading
Loading