diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl index 087d9c2af5..d2b955634d 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-108.ftl @@ -13,7 +13,7 @@ ent-HandHeldMassScanner = ручной сканер массы .desc = Ручной сканер массы. ent-Lantern = фонарь .desc = Священный свет освещает путь. -ent-FlippoLighter = зажигалку "Флиппо" +ent-FlippoLighter = зажигалка "Флиппо" .desc = Прочная металлическая зажигалка, служит довольно долго. ent-FlippoEngravedLighter = гравированная зажигалка "Флиппо" .desc = Прочная золотая зажигалка, служит довольно долго. Гравировка не дает никаких тактических преимуществ. diff --git a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl index 71fb9d7476..2bee19c60b 100644 --- a/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl +++ b/Resources/Locale/ru-RU/_white/locales-new/autotranslate-74.ftl @@ -38,6 +38,5 @@ ent-MobMoth = Ури́ст МакФлафф ent-MobSkeletonCloset = скелет в шкафу .desc = "скелет в шкафу" ent-MobHumanTerminator = exterminator - .desc = "exterminator" -ent-MobTerminatorEndoskeleton = эндоскелет nt-800 "exterminator" +ent-MobTerminatorEndoskeleton = эндоскелет nt-800 "Экстерминатор" .desc = Внутренняя движущая сила инфильтрационного андроида Susnet. Невероятно прочный сплав внутри, обычная плоть снаружи. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index b62834dd98..9b0482476f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -110,9 +110,9 @@ description: There's no cult without cult hoods. components: - type: Sprite - sprite: Clothing/Head/Hoods/cult.rsi + sprite: White/Cult/culthood.rsi # WD - type: Clothing - sprite: Clothing/Head/Hoods/cult.rsi + sprite: White/Cult/culthood.rsi # WD - type: Tag tags: - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 441920c250..0102a79c2c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -144,9 +144,9 @@ description: There's no cult without classic red/crimson cult robes. components: - type: Sprite - sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + sprite: White/Cult/cultrobes.rsi # WD - type: Clothing - sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + sprite: White/Cult/cultrobes.rsi # WD - type: entity parent: ClothingOuterMiscBase # WD edit diff --git a/Resources/Prototypes/Entities/Objects/Misc/cds.yml b/Resources/Prototypes/Entities/Objects/Misc/cds.yml index a80a7d1d58..7320fcd5cd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/cds.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/cds.yml @@ -4,6 +4,10 @@ id: CoordinatesDisk description: A disk containing the coordinates to a location in space. Necessary for any FTL-traversing vessel to reach their destination. Fits inside shuttle consoles. components: + - type: Item # WD + size: Small + shape: + - 0, 0, 0, 0 - type: Sprite sprite: Objects/Misc/cd.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml index fdcd8455bf..98bf2982fb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -46,6 +46,8 @@ - type: Sprite sprite: Objects/Misc/nukedisk.rsi state: icon + - type: Item # WD + size: Tiny - type: StaticPrice price: 1 # it's worth even less than normal items. Perfection. # WD edit sounds start diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index ff12975c6c..1426f8c2e0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -7,9 +7,9 @@ - type: Item size: Small shape: - - 0, 0, 1, 1 + - 0, 0, 0, 0 # WD - type: Sprite - sprite: Objects/Specific/Research/researchdisk.rsi + sprite: White/Objects/Specific/Research/researchdisk.rsi # WD state: icon - type: ResearchDisk - type: GuideHelp @@ -61,6 +61,10 @@ name: technology disk description: A disk for the R&D server containing research technology. components: + - type: Item # WD + size: Small + shape: + - 0, 0, 0, 0 - type: Sprite sprite: Objects/Misc/module.rsi layers: diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 7281063c49..fe73962252 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -169,6 +169,7 @@ path: /Audio/Announcements/attention.ogg startDelay: 10 earliestStart: 15 + minimumPlayers: 15 # WD weight: 6 duration: 50 - type: VentCrittersRule diff --git a/Resources/Textures/White/Cult/culthood.rsi/equipped-HELMET.png b/Resources/Textures/White/Cult/culthood.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..54f688d3bc Binary files /dev/null and b/Resources/Textures/White/Cult/culthood.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Cult/culthood.rsi/icon.png b/Resources/Textures/White/Cult/culthood.rsi/icon.png new file mode 100644 index 0000000000..b88272cceb Binary files /dev/null and b/Resources/Textures/White/Cult/culthood.rsi/icon.png differ diff --git a/Resources/Textures/White/Cult/culthood.rsi/inhand-left.png b/Resources/Textures/White/Cult/culthood.rsi/inhand-left.png new file mode 100644 index 0000000000..aa3d43df17 Binary files /dev/null and b/Resources/Textures/White/Cult/culthood.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Cult/culthood.rsi/inhand-right.png b/Resources/Textures/White/Cult/culthood.rsi/inhand-right.png new file mode 100644 index 0000000000..9b7997973b Binary files /dev/null and b/Resources/Textures/White/Cult/culthood.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Cult/culthood.rsi/meta.json b/Resources/Textures/White/Cult/culthood.rsi/meta.json new file mode 100644 index 0000000000..0635ca5b3b --- /dev/null +++ b/Resources/Textures/White/Cult/culthood.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "theredrd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING-body-slim.png b/Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING-body-slim.png new file mode 100644 index 0000000000..ea4da88ec8 Binary files /dev/null and b/Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING-body-slim.png differ diff --git a/Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..ea4da88ec8 Binary files /dev/null and b/Resources/Textures/White/Cult/cultrobes.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/White/Cult/cultrobes.rsi/icon.png b/Resources/Textures/White/Cult/cultrobes.rsi/icon.png new file mode 100644 index 0000000000..5b10cf1728 Binary files /dev/null and b/Resources/Textures/White/Cult/cultrobes.rsi/icon.png differ diff --git a/Resources/Textures/White/Cult/cultrobes.rsi/inhand-left.png b/Resources/Textures/White/Cult/cultrobes.rsi/inhand-left.png new file mode 100644 index 0000000000..099fb41690 Binary files /dev/null and b/Resources/Textures/White/Cult/cultrobes.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Cult/cultrobes.rsi/inhand-right.png b/Resources/Textures/White/Cult/cultrobes.rsi/inhand-right.png new file mode 100644 index 0000000000..69f1a29518 Binary files /dev/null and b/Resources/Textures/White/Cult/cultrobes.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Cult/cultrobes.rsi/meta.json b/Resources/Textures/White/Cult/cultrobes.rsi/meta.json new file mode 100644 index 0000000000..53d014ce38 --- /dev/null +++ b/Resources/Textures/White/Cult/cultrobes.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "theredrd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-body-slim", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/icon.png b/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/icon.png new file mode 100644 index 0000000000..2fb631c049 Binary files /dev/null and b/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/icon.png differ diff --git a/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/meta.json b/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/meta.json new file mode 100644 index 0000000000..9b51a6cc1e --- /dev/null +++ b/Resources/Textures/White/Objects/Specific/Research/researchdisk.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} \ No newline at end of file