cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 00:52:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,098 Commits 26 Branches 2 Tags
bdf50ea89400a5d080df567b99025b399eaeee5a
Commit Graph

131 Commits

Author SHA1 Message Date
S34N
4f5c3376e3 Updates tools to include mapmerge hooks and merge drivers, plus more (#18034) 
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-06-21 23:53:19 +01:00
S34N
1910d4cb37 Removes instances of rusty turfs (#17980) 
* removes instances of rusty turfs

* and this
 2022-06-16 20:52:06 +01:00
moxian
b000bd2a88 Add eslint settings to vscode config (#17680) 
* Add eslint settings to vscode config

* Lint vscode settings as json5

* A tiny bit better argument parsing, oops
 2022-04-29 13:07:46 +01:00
dependabot[bot]
d3ee2eb11a Bump pillow from 9.0.0 to 9.0.1 in /tools/mapmerge2 (#17474) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.0.0...9.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-11 23:47:45 +00:00
AffectedArc07
95ce462b14 Completely refactors Karma (#17447) 
* Refactors Karma

* I FELL VICTIM TO MY OWN CI

* Update code/modules/client/client_procs.dm

* Update SQL/updates/31-32.py

* Mochi tweaks

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2022-03-08 22:14:05 +01:00
S34N
fda697e2b5 [MDB Ignore] Makes maps comply with "[dir]_bump" standards (#17259) 2022-01-17 21:18:00 +01:00
dependabot[bot]
dc7b8bcc8f Bump pillow from 8.3.2 to 9.0.0 in /tools/mapmerge2 (#17320) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-13 08:11:30 +01:00
AffectedArc07
62aabe7401 The end of an era 2021-10-30 10:47:25 +01:00
AffectedArc07
e643684a4c aaaaaaaaaaaaaa 2021-10-13 22:43:12 +01:00
AffectedArc07
61ddfa6520 im falling apart 2021-10-13 22:40:53 +01:00
AffectedArc07
3392a45ed9 h 2021-10-13 22:34:12 +01:00
AffectedArc07
cef5cc0e2a Update tools/loadout_converter/loadout_converter.py 2021-10-09 20:44:37 +01:00
AffectedArc07
f59cbdf70e Rewrites loadout converter python script 2021-10-09 20:43:22 +01:00
SabreML
bc739c353d Loadout DB Storage Refactor (#16453) 
* `display_name` -> Typepaths V1

* Loadout display name capitalisation

#15857

* Review 1, plus json fixes

* (Hopefully) final tweaks

* Styling nitpicks

* Extra tweaks because why not

It never caused a runtime, but the `?.` is just in case.

* Deconflicting

* Warning comment

* Whoops

Typing faster than my brain
 2021-10-09 19:35:15 +01:00
AffectedArc07
c358a20498 Moves pAI saves to the DB 2021-10-04 19:15:53 +01:00
AffectedArc07
c7b10e9fd9 Makes us use release dmdoc 2021-09-13 22:01:40 +01:00
dependabot[bot]
1548d5ec04 Bump pillow from 8.2.0 to 8.3.2 in /tools/mapmerge2 (#16656) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.2.0...8.3.2)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-08 20:19:51 +01:00
S34N
606bd484ac Merge branch 'master' into AI_announcer_new 2021-08-05 09:53:03 +01:00
SabreML
5577960583 Map conflict fixer markdown (#16450) 2021-07-29 15:19:11 +01:00
AffectedArc07
bede78aeff Removes table prefixes 2021-07-26 17:21:24 +01:00
variableundefined
d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config 
[READY] Converts configs to use TOML + Configuration refactor
 2021-07-25 08:26:29 -04:00
S34NW
a5cc1f325a Merge branch 'master' into AI_announcer_new 2021-07-20 17:39:30 +01:00
SabreML
036a69fea4 Removes pixel_* = 0 and tag = "icon*" from the map files (#15438) 
* Pixel Removal

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Fix

Why is that even there?

* Fix

Apparently I did the regex stuff in the wrong order for `Lavaland.dm`. Whoops

* Unit tests

* Mother of all map edits

* `tag = "icon` purging

* No area check

Far too much code debt for this PR to cover, but soon...

* At request

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-14 23:07:12 +01:00
AffectedArc07
efed543f47 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-13 14:15:07 +01:00
dependabot[bot]
0c66d089a2 Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2 (#16138) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-06-10 16:06:42 +01:00
AffectedArc07
8e6787a791 2FA for server login (#16094) 
* AA2FA

* Its always dbconfig

* Extra security

* oops
 2021-05-30 12:19:56 -04:00
AffectedArc07
968d1bc88d Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-24 15:30:20 +01:00
AffectedArc07
663eff7b5e MAP ROTATION PART 2 (#12345) 
* MAP ROTATION

* Tweaks + New additions

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Fixes improper naming

* Fixes map vote

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-05-24 08:25:18 -06:00
AffectedArc07
f728993007 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-16 13:22:14 +01:00
AffectedArc07
cc3d81df96 Server Update Update 2021-05-15 20:28:08 +01:00
AffectedArc07
314ce28c0b Merge branch 'master' into no-more-myisam 2021-05-07 15:28:47 +01:00
AffectedArc07
9ac84b241f Converts configs to use TOML 2021-05-03 18:12:42 +01:00
S34NW
5ef5f39af2 slowed down by 4% 2021-05-02 14:49:51 +01:00
Sean Williams
1a5f59f104 how to read me 2021-05-02 14:18:47 +01:00
S34NW
b22ded5a93 What happened to you, AI? 2021-05-02 13:34:53 +01:00
dependabot[bot]
e201eb05c1 Bump pillow from 7.1.1 to 8.1.1 in /tools/mapmerge2 (#15732) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.1.1 to 8.1.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/7.1.1...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-19 09:47:05 +00:00
AffectedArc07
3f56546291 Converts MyISAM tables to InnoDB 2021-03-18 14:26:49 +00:00
AffectedArc07
81182dbab0 Attempts to fix CI dependency failures (#15709) 
* Attempts to fix CI dependency failures

* Lets try this

* And this

* And this
 2021-03-13 09:07:02 -05:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
AffectedArc07
fd79e342a8 Fixes rank being a reserved SQL keyword (#15661) 2021-03-04 11:50:36 -07:00
dearmochi
3c87d9a396 Adds the Volume Mixer to adjust individual channel volumes (#15507) 
* Adds the Volume Mixer

* Address AA

* LF -> CRLF

* Puts thunderdome.ogg on CHANNEL_ADMIN

* Update interface name
 2021-02-25 22:30:19 +00:00
AffectedArc07
3c211aa5da Comments 2021-02-03 14:56:01 +00:00
AffectedArc07
0dc2501285 Unicode is still unsupported in the year 2021 2021-02-03 13:00:29 +00:00
AffectedArc07
6a63542132 RUSTG DLL Unit Tests 2021-02-03 12:55:49 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
AffectedArc07
0821128f40 Actions matter 2021-01-26 11:18:46 +00:00
AffectedArc07
adb9b58f8e Updates some admin stuff (#15297) 
* Fixes camera view

* Unique CID tracking notes

* Ban tracking

* Note round IDs

* Karma viewing

* Minor tweak

* Manual ban job bans

* More tweaks

* Farie tweaks

* Connection result field

* Orange watchlist names

* Autopopulate tickbox
 2021-01-16 16:38:45 -05:00
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132) 
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
 2020-12-24 16:06:48 -05:00
AffectedArc07
2bad70717c Async SQL + SSdbcore (#15007) 
* Initial Commit - Async SQL

* First batch of queries

* More progress

* Nukes DB Polls

* More work

* oops

* One push

* Notes work now

* Ok these work

* Watchlist done

* Async Bans!

* Async Permissions

* Async client procs

* I officially hate preference datums

* Also these

* Async Custom Items

* Async Karma

* Async Library

* Async TOS

* Cleans out the old SQL code

* CI Sanity

* Apparently MySQL doesnt support this

* What about this

* Maybe this

* Review pass 1

* This too

* Fixes job ban loading

* Fix undeleted queries

* Prevents sensitive queries being logged

* Documentation + tweaks

* Adds a verb to force reconnect the DB

* More review tweaks

* Farie tweaks

* Fixes this
 2020-12-16 15:46:25 -05:00
AffectedArc07
6ee4c907b7 Further increases the speed of CI (#15049) 
* Further increases the speed of CI

* Might need this too
 2020-12-04 17:03:47 -05:00