Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shipside minimap icons #110

Open
wants to merge 90 commits into
base: master220
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
4e1b268
Feat: add cyrillic support
Bizzonium Nov 18, 2021
d17d753
Tweak: set SS220 world name
Bizzonium Nov 18, 2021
2122f68
Reverted some char functions back to non-char
Vallat Nov 18, 2021
7e134fe
Ability to setup keybinds on russian keylayout
Vallat Nov 18, 2021
c69e546
Feat: add more cyrillic support
Bizzonium Nov 18, 2021
3483b1e
Tweak: revision info
Bizzonium Nov 18, 2021
7581bab
Fix: reject_bad_name() now works correctly (#3)
Vallat Nov 19, 2021
2397fc1
Fix: use char couts instead byte position __HELPERS/text.dm
Bizzonium Nov 19, 2021
bb653cc
Fix: more use of char counts instead of byte position
Bizzonium Nov 19, 2021
7c3fa3e
Feat: add cyrillic support to message modificators
Bizzonium Nov 19, 2021
0a1ce05
Feat: add latin to cyrillic keys transform (#2)
KuzyXD Nov 19, 2021
049dc06
Tweak: removes fps setting because it's rudiment, we have tick_lag
Vallat Nov 21, 2021
4754cb5
Tweak: PRELOAD_RSC=0
Bizzonium Nov 23, 2021
89164d6
Feat: add x flag to executables in tools directory~
Bizzonium Jun 12, 2022
ec58074
Feat: add user?.client checks to fix null user runtimes
Bizzonium Nov 23, 2021
c10778d
Fix: letter "Ё" now displays correctly (#11)
Vallat Nov 24, 2021
f8db475
Feat: main menu translation to RU (#18)
KuzyXD Dec 14, 2021
3f4cb40
Feat: Translate messages for marine command auras (#19)
KuzyXD Dec 14, 2021
7529c52
Fix: localize aura messages (#20)
KuzyXD Dec 17, 2021
7d38eee
Feat: new ship - TGS Talos (#26)
He11Force Jan 8, 2022
fed378d
Fix: issues on ship TGS Talos (#27)
He11Force Jan 8, 2022
7af8e9e
Fix: issues on ship TGS Talos v1.1 (#28)
He11Force Jan 12, 2022
d8eb431
Feat: separate reject_bad_name option for cyrillic (#23)
Bizzonium Jan 12, 2022
8bfbbd4
Refactor: change ban table format (#29)
Bizzonium Jan 12, 2022
bcc143e
Feat: add secondary status topic
Bizzonium Jan 12, 2022
ebdc301
Fix: issues on ship TGS Talos v1.2 (#30)
He11Force Jan 14, 2022
9d4957f
Fix: rearrange hub status text
Bizzonium Jan 15, 2022
e9c9f39
Fix: remove link to webmap from hub status text
Bizzonium Jan 15, 2022
529aa86
Fix: replace replacetextEx with replacetextEx_char
Bizzonium Jan 16, 2022
b50f6f9
Fix: check client when creating characters
Bizzonium Jan 16, 2022
c896c26
Fix: avoid sleeping update_preview_icon
Bizzonium Jan 16, 2022
fab2539
Tweak: GC won't do unnecessary hard dels (#33)
Vallat Jan 17, 2022
dacdd86
Fix: zero out negative staminaloss
Bizzonium Jan 20, 2022
d75ee71
Fix: sanitize values on ban update
Bizzonium Jan 22, 2022
f978a74
Refactor: make SSautomatedfire to be subsystem of SStimer
Bizzonium Jan 24, 2022
6e75334
Feat: update ship TGS Talos v1.3 (#34)
He11Force Jan 26, 2022
04f6d3e
fix: Alien Queen now can use Cyrillic in their announcements (#35)
Vallat Jan 30, 2022
4487a71
Feat: add censorship system
Bizzonium Jan 30, 2022
252e3a1
Feat: add classic meme vote start sound
Bizzonium Feb 6, 2022
9e1d733
feat: Reworked xeno_upgrade section
KuzyXD Feb 10, 2022
148eb23
Tweak: enable Primordial globally
Bizzonium Feb 15, 2022
400bd76
feat: Primordial upgrade can't buyed while shutters are closed
KuzyXD Feb 10, 2022
0645230
Feat: update ship TGS Talos v1.4 (#39)
He11Force Feb 23, 2022
b5a4609
feat: Aliens can't regress to primo from ancient (#40)
KuzyXD Feb 28, 2022
8acdb46
Feat: add 2 maps and new ERT (#50)
boartem Apr 1, 2022
d41ece5
Fix: replace recoilless_system with holster/backholster/rpg/full
Bizzonium Apr 11, 2022
bd272e1
Twea: larva spawn rates (#53)
goose4429 May 14, 2022
2d07ceb
Feat: add queue engine support
Bizzonium May 15, 2022
10b4936
Fix: comment unused vars in world status info block
Bizzonium May 15, 2022
849c8c5
Feat: more exp tracking and locking (#54)
goose4429 May 19, 2022
eb015ae
Fix: Med exp type (#56)
goose4429 May 19, 2022
181a797
Fix: Tracked playtime fixes (#57)
goose4429 May 23, 2022
2dfbbad
Revert: remove primo limit (#59)
goose4429 May 23, 2022
cd57f90
Tweak: Removing Airlocks To Chemistry (#58)
TrashDoxx May 26, 2022
3ae644d
Feat: add KRISS Vector (#60)
goose4429 Jun 3, 2022
a48f8d5
Feat: Vector Update (#61)
goose4429 Jun 4, 2022
966b196
Feat: ss220 Weapons Module (#62)
goose4429 Jun 8, 2022
572f86d
Feat: add VAL-HAL-A - halberd harvester (#63)
goose4429 Jun 9, 2022
3666494
Fix: VAL-HAL-A halberd nerf (#64)
goose4429 Jun 9, 2022
72140b6
Feat: Val-hal-a balance patch (#65)
goose4429 Jun 14, 2022
33da210
Tweak: Val-hal-a balance patch (#68)
goose4429 Jun 17, 2022
94ee246
Feat: bring back medical nanites bottle. (#69)
Etrnlmelancholy Jun 21, 2022
8e4bb68
Feat: roundstart timelock checks (#71)
goose4429 Jun 22, 2022
44bab6f
Feat: Survivors jobs and playtime (#72)
goose4429 Jun 22, 2022
f415914
Fix: Survs fix (#73)
goose4429 Jun 23, 2022
f2b7e59
Fix: another surv timelock fix (#74)
goose4429 Jun 23, 2022
7db17c6
Tweak: Trama rebalance (#76)
goose4429 Jun 26, 2022
43bf3d5
Tweak: Xeno Buffs part 1 v3 - toxic edition (#70)
Jordanstolethepreciousslam Jun 28, 2022
231bebf
Feat: Survivor rebalance and points system (#77)
goose4429 Jun 28, 2022
e741a89
Feat: Removing Turrets From Maps (#79)
TrashDoxx Jun 30, 2022
01e0035
Feat: Advanced robo armors (#78)
goose4429 Jul 13, 2022
c589292
Revert "Hyro, rye and synap now have lemoline in their recipes" (#81)
Etrnlmelancholy Jul 16, 2022
d0dbe85
Feat: Old Good T25 (#85)
DraITMar Jul 21, 2022
c626eaa
Feat: Revolving Rifle 2.0 (#86)
Dediinside Jul 23, 2022
af48e02
Feat: SP-13 (Calico) buff (#87)
goose4429 Jul 28, 2022
88182c8
Revert "Refactor: make SSautomatedfire to be subsystem of SStimer"
Bizzonium Jul 28, 2022
d7abc94
Feat: T25 Factory, T25 skin on back and on suit(#89)
DraITMar Aug 3, 2022
43bed80
Feat: update ship TGS Talos v1.5 (#88)
He11Force Aug 8, 2022
7e64e6e
Feat: M1855 Revolving Rifle Buff (#91)
goose4429 Aug 8, 2022
a3ead48
Feat: new Hats and Masks (#92)
terribaum Aug 8, 2022
c545cce
Revert "Tweak: Xeno Buffs part 1 v3 - toxic edition (#70)"
Bizzonium Aug 13, 2022
09eae43
Feat: Squad headbands (#94)
siegluck Aug 14, 2022
0f74bdb
Feat: Kidneys rework (#95)
goose4429 Aug 18, 2022
0a552fe
Rebalance: defiler (#96)
Jordanstolethepreciousslam Aug 18, 2022
7a00dd6
Rebalance: Carrier (#97)
Jordanstolethepreciousslam Aug 18, 2022
4b3bcde
Rebalance: sentinel (#100)
Jordanstolethepreciousslam Aug 18, 2022
cfb0d2f
Feat: allow resting in staggered state (#101)
goose4429 Aug 18, 2022
f1bd9e6
Rebalance: Praetorian neurospit (#103)
Jordanstolethepreciousslam Aug 18, 2022
6cbb17d
Feat: update ship TGS Talos v1.5.1 (#106)
He11Force Aug 18, 2022
90de67b
shipside minimap icons
Aug 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
36 changes: 18 additions & 18 deletions SQL/tgmc-schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `admin` (
`ckey` varchar(32) NOT NULL,
`rank` varchar(32) NOT NULL,
PRIMARY KEY (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.admin_log
Expand All @@ -30,7 +30,7 @@ CREATE TABLE IF NOT EXISTS `admin_log` (
`target` varchar(32) NOT NULL,
`log` varchar(1000) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.admin_ranks
Expand All @@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS `admin_ranks` (
`exclude_flags` smallint(5) unsigned NOT NULL,
`can_edit_flags` smallint(5) unsigned NOT NULL,
PRIMARY KEY (`rank`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.ban
Expand Down Expand Up @@ -72,7 +72,7 @@ CREATE TABLE IF NOT EXISTS `ban` (
KEY `idx_ban_isbanned` (`ckey`,`role`,`unbanned_datetime`,`expiration_time`),
KEY `idx_ban_isbanned_details` (`ckey`,`ip`,`computerid`,`role`,`unbanned_datetime`,`expiration_time`),
KEY `idx_ban_count` (`bantime`,`a_ckey`,`applies_to_admins`,`unbanned_datetime`,`expiration_time`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.connection_log
Expand All @@ -86,7 +86,7 @@ CREATE TABLE IF NOT EXISTS `connection_log` (
`ip` int(10) unsigned NOT NULL,
`computerid` varchar(45) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.death
Expand Down Expand Up @@ -117,7 +117,7 @@ CREATE TABLE IF NOT EXISTS `death` (
`last_words` varchar(255) DEFAULT NULL,
`suicide` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.feedback
Expand All @@ -130,7 +130,7 @@ CREATE TABLE IF NOT EXISTS `feedback` (
`key_type` enum('text','amount','tally','nested tally','associative') NOT NULL,
`json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.messages
Expand All @@ -157,7 +157,7 @@ CREATE TABLE IF NOT EXISTS `messages` (
KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`,`deleted`),
KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`,`deleted`),
KEY `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`,`deleted`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.player
Expand All @@ -176,7 +176,7 @@ CREATE TABLE IF NOT EXISTS `player` (
PRIMARY KEY (`ckey`),
KEY `idx_player_cid_ckey` (`computerid`,`ckey`),
KEY `idx_player_ip_ckey` (`ip`,`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.poll_option
Expand All @@ -193,7 +193,7 @@ CREATE TABLE IF NOT EXISTS `poll_option` (
`deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `idx_pop_pollid` (`pollid`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.poll_question
Expand All @@ -216,7 +216,7 @@ CREATE TABLE IF NOT EXISTS `poll_question` (
KEY `idx_pquest_question_time_ckey` (`question`,`starttime`,`endtime`,`createdby_ckey`,`createdby_ip`),
KEY `idx_pquest_time_deleted_id` (`starttime`,`endtime`, `deleted`, `id`),
KEY `idx_pquest_id_time_type_admin` (`id`,`starttime`,`endtime`,`polltype`,`adminonly`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.poll_textreply
Expand All @@ -231,7 +231,7 @@ CREATE TABLE IF NOT EXISTS `poll_textreply` (
`deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `idx_ptext_pollid_ckey` (`pollid`,`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.poll_vote
Expand All @@ -248,7 +248,7 @@ CREATE TABLE IF NOT EXISTS `poll_vote` (
PRIMARY KEY (`id`),
KEY `idx_pvote_pollid_ckey` (`pollid`,`ckey`),
KEY `idx_pvote_optionid_ckey` (`optionid`,`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.role_time
Expand All @@ -257,7 +257,7 @@ CREATE TABLE IF NOT EXISTS `role_time` (
`job` varchar(32) NOT NULL,
`minutes` int(10) unsigned NOT NULL,
PRIMARY KEY (`ckey`,`job`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.role_time_log
Expand All @@ -271,7 +271,7 @@ CREATE TABLE IF NOT EXISTS `role_time_log` (
KEY `ckey` (`ckey`),
KEY `job` (`job`),
KEY `datetime` (`datetime`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.round
Expand All @@ -289,7 +289,7 @@ CREATE TABLE IF NOT EXISTS `round` (
`end_state` varchar(64) DEFAULT NULL,
`map_name` varchar(32) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.schema_revision
Expand All @@ -298,7 +298,7 @@ CREATE TABLE IF NOT EXISTS `schema_revision` (
`minor` tinyint(3) unsigned NOT NULL,
`date` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
PRIMARY KEY (`major`,`minor`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table feedback.stickyban
Expand All @@ -308,7 +308,7 @@ CREATE TABLE IF NOT EXISTS `stickyban` (
`banning_admin` varchar(32) NOT NULL,
`datetime` datetime NOT NULL DEFAULT current_timestamp(),
PRIMARY KEY (`ckey`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

--
-- Table structure for table `stickyban_matched_ckey`
Expand Down
3 changes: 3 additions & 0 deletions _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
#include "map_files\icy_caves\icy_caves.dmm"
#include "map_files\Sulaco\Sulaco.dmm"
#include "map_files\Research_Outpost\Research_Outpost.dmm"
#include "map_files\Barrenquilla_Mining\Barrenquilla_Mining_Facility.dmm"
#include "map_files\Magmoor_Digsite_IV\Magmoor_Digsite_IV.dmm"
#include "map_files\Orion_Military_Outpost\orionoutpost.dmm"
#include "map_files\Twin_Pillars\Twin_Pillars.dmm"
#include "map_files\Minerva\TGS_Minerva.dmm"
#include "map_files\Talos\TGS_Talos.dmm"
#include "map_files\Twin_Pillars_ss220_edition\Twin_Pillars_ss220_edition.dmm"
#ifdef CIBUILDING
#include "templates.dm"
#endif
Expand Down
6 changes: 6 additions & 0 deletions _maps/barrenquilla_mining.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"map_name": "Barrenquilla Mining Facility",
"map_path": "map_files/Barrenquilla_Mining",
"map_file": "Barrenquilla_Mining_Facility.dmm",
"announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to LO145. Through use of emergency bluespace drive tech, the ###SHIPNAME### has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
}
Loading