Skip to content
Merged
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 = Они отражают даже самые слабые лучи света
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
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"

22 changes: 11 additions & 11 deletions Resources/Prototypes/radio_channels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,64 @@
- type: radioChannel
id: CentCom
name: chat-radio-centcom
keycode: 'y'
keycode: 'ц' # LuaM - локалайз каналов
frequency: 1337
color: "#2681a5"
longRange: true

- type: radioChannel
id: Command
name: chat-radio-command
keycode: 'c'
keycode: 'к' # LuaM - локалайз каналов
frequency: 1353
color: "#5569ff" # Mono

- type: radioChannel
id: Engineering
name: chat-radio-engineering
keycode: 'e'
keycode: 'и' # LuaM - локалайз каналов
frequency: 1357
color: "#ff733c"

- type: radioChannel
id: Medical
name: chat-radio-medical
keycode: 'm'
keycode: 'м' # LuaM - локалайз каналов
frequency: 1355
color: "#57b8f0"

- type: radioChannel
id: Science
name: chat-radio-science
keycode: 'n'
keycode: 'ь' # LuaM - локалайз каналов
frequency: 1351
color: "#cd7ccd"

- type: radioChannel
id: Security
name: chat-radio-security
keycode: 'g'
keycode: 'о' # LuaM - локалайз каналов
frequency: 1359
color: "#ff4242"

- type: radioChannel
id: Service
name: chat-radio-service
keycode: 'v'
keycode: 'л' # LuaM - локалайз каналов
frequency: 1349
color: "#09b96d"

- type: radioChannel
id: Supply
name: chat-radio-supply
keycode: 'u'
keycode: 'г' # LuaM - локалайз каналов
frequency: 1347
color: "#b48b57"

- type: radioChannel
id: Syndicate
name: chat-radio-syndicate
keycode: 't'
keycode: 'с' # LuaM - локалайз каналов
frequency: 1213
color: "#8f4a4b"
# longRange: true # Frontier - Move to Syndicate Base
Expand Down Expand Up @@ -94,7 +94,7 @@
- type: radioChannel
id: Freelance
name: chat-radio-freelance
keycode: 'f'
keycode: 'н' # LuaM - локалайз каналов
frequency: 1984
color: "#f6ce64"
# long range since otherwise it'd defeat the point of a handheld radio independent of telecomms
Expand All @@ -103,7 +103,7 @@
- type: radioChannel
id: VanguardCommand
name: chat-radio-vanguard-command
keycode: 'r'
keycode: 'ф' # LuaM - локалайз каналов
frequency: 1985
color: "#BF94E4"
# long range since otherwise it'd defeat the point of a handheld radio independent of telecomms
Expand Down
Loading