Skip to content

Commit

Permalink
revert emote panel since upstream has it (#25)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Убирает эмоут панель

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

Уже есть
  • Loading branch information
larentoun authored Nov 4, 2023
2 parents 532df8b + 03f975e commit 39a23bc
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 166 deletions.
2 changes: 1 addition & 1 deletion modular_bandastation/emote_panel/_emote_panel.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/emote_panel
name = "Панель эмоций"
desc = "Добавляет панель эмоций"
desc = "Перевод панели эмоций"
author = "larentoun"
1 change: 0 additions & 1 deletion modular_bandastation/emote_panel/_emote_panel.dme
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#include "_emote_panel.dm"

#include "code/emote_panel.dm"
#include "code/emotes.dm"
60 changes: 0 additions & 60 deletions modular_bandastation/emote_panel/code/emote_panel.dm

This file was deleted.

8 changes: 0 additions & 8 deletions modular_bandastation/emote_panel/code/emotes.dm
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
/datum/emote
var/name

/datum/emote/New()
. = ..()
if(!name)
name = key

// Imaginary Friend

/datum/emote/imaginary_friend/point
Expand Down
2 changes: 1 addition & 1 deletion modular_bandastation/keybindings/_keybindings.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "code/carbon.dm"
#include "code/client.dm"
#include "code/communication.dm"
#include "code/emote.dm"
//#include "code/emote.dm" TODO: Return it when Emote Panel is merged
#include "code/human.dm"
#include "code/living.dm"
#include "code/mob.dm"
Expand Down
2 changes: 1 addition & 1 deletion modular_bandastation/modular_bandastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "crawl_speed/_crawl_speed.dme"
#include "cyrillic_fixes/_cyrillic_fixes.dme"
#include "discord/_discord.dme"
#include "emote_panel/_emote_panel.dme"
//#include "emote_panel/_emote_panel.dme"
#include "events/_events.dme"
#include "examine_panel/_examine_panel.dme"
#include "gunhud/_gunhud.dme"
Expand Down
94 changes: 0 additions & 94 deletions tgui/packages/tgui/interfaces/EmotePanel.tsx

This file was deleted.

0 comments on commit 39a23bc

Please sign in to comment.