cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-04 04:53:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,486 Commits 15 Branches 2 Tags
84031049806af4d819ea30bf06c35447e47e754f
Commit Graph

2545 Commits

Author SHA1 Message Date
variableundefined bccdd15b6d Merge pull request #12259 from Ty-Omaha/revert-11733-this-has-psised-me-off-long-enough 
Revert "Adds Auto-Note for Manual Bans"
 2019-09-10 21:54:40 -04:00
variableundefined 8077e61d08 Merge pull request #12241 from SteelSlayer/admin-verb-removals 
Admin verb mega update
 2019-09-10 19:38:00 -04:00
Ty-Omaha 240cf39025 Revert "Adds Auto-Note for Manual Bans" 2019-09-10 17:00:10 -04:00
xProlithium 829d1297cf CA to TP on adminpm and prayers 
I missed changing CA to TP on these two folders.
 2019-09-10 03:38:26 -04:00
SteelSlayer 4fb7d83595 re-add sticky ban, player_panel, increase width of ssd/afk window a bit 2019-09-09 10:12:58 -04:00
SteelSlayer 46ad75ec14 Revert "taking player_panel out to the woodshed" 
This reverts commit 8fc8063c74.
 2019-09-09 08:46:43 -04:00
SteelSlayer 8fc8063c74 taking player_panel out to the woodshed 2019-09-09 02:00:31 -04:00
SteelSlayer 275266a73a Admin verb mega update 
changes/removes all sorts of admin verbs, requested by Kyet
 2019-09-09 01:26:50 -04:00
xProlithium 04540c7b9b Changed ahelp CA to TP 
Changed the CA link in admin helps to TP link. Also moved it further up.
 2019-09-08 02:17:05 -04:00
variableundefined 854e5de97f Merge pull request #12206 from Fox-McCloud/refactors-corgis 
Refactors Corgis and Other Doggos
 2019-09-05 21:17:53 -04:00
Fox McCloud 10d3c7e463 Merge pull request #12117 from variableundefined/ResolvingProblem 
Add a quick resolve button to mentor and adminhelp ticket
 2019-09-05 20:06:16 -04:00
Fox McCloud a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Fox McCloud dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
SteelSlayer da534b2df1 Round start delay works properly again 2019-08-28 19:20:44 -04:00
variableundefined d25970e13a Add a quick resolve button to mentor and adminhelp ticket 2019-08-28 12:59:38 -04:00
Fox McCloud cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined 5daf9a190b Merge pull request #11712 from Markolie/lazy 
Custom outfit manager and spawn with outfit on transform/reincarnate
 2019-08-24 12:27:48 -04:00
variableundefined a968dc6a09 Merge pull request #11936 from farie82/antidrop-remove-on-drop 
Dropped anti drop items now lose the antidrop status if not initialized with it
 2019-08-24 10:53:23 -04:00
variableundefined a42226c112 Merge pull request #11691 from TDSSS/lavaland-fax 
Gives lavaland syndie base a fax (+some small other changes)
 2019-08-23 08:33:04 -04:00
Fox McCloud e4ca25be3d Merge pull request #11998 from Tayyyyyyy/pm_window_links 
Add links to ping and open conversation in window for PMs
 2019-08-21 01:49:03 -04:00
Fox McCloud 5d9fc8e9ea Merge pull request #11985 from Tayyyyyyy/admin_pencode 
Add admin pencode: style, class, and img
 2019-08-14 22:22:34 -04:00
Tayyyyyyy 534a4ce3b9 Add links to ping and open conversation in window for PMs 2019-08-12 23:31:23 -07:00
Tayyyyyyy f17798d95b FIx more garbled quotes 2019-08-12 22:08:08 -07:00
Tayyyyyyy 48c002b361 Add admin pencode: style, class, and img 2019-08-12 09:47:59 -07:00
variableundefined c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker 
Panic Bunker
 2019-08-12 19:34:19 +08:00
variableundefined 635db54625 Merge pull request #11730 from farie82/afk-list 
Adds a list AFK players verb for admins
 2019-08-12 17:48:33 +08:00
variableundefined 0b469ce563 Merge pull request #11577 from farie82/mhelp-take 
Ticket take now asks for a confirmation if it's already assigned + ticket/PM code refactor
 2019-08-12 17:44:26 +08:00
Tayyyyyyy 90bbc01cf4 Fix input sanitization issues 2019-08-11 22:40:16 -07:00
Fox McCloud fcc137500a Merge pull request #11919 from florkeger/freeze-name-fix 
Updated admin freeze text
 2019-08-11 17:08:19 -04:00
variableundefined 0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
Kyep 977087a97e fixes merge conflict 2019-08-11 01:36:09 -07:00
joep van der velden 402d1ef131 No drop items now lose their nodrop if dropped 2019-07-29 00:03:18 +02:00
farie82 d6f6029147 Merge branch 'master' into afk-list 2019-07-28 23:43:37 +02:00
kazboo 78d38ffea8 usr to admin 
changed the passed variable from usr to admin
 2019-07-25 03:17:26 +02:00
kazboo 6c7f4aeb9c Update admin freeze text 
This simple comit removes the admin ckey message that is shown to the player upon being frozen and only shows the character assigned to the admin.
 2019-07-25 03:08:15 +02:00
Crazy Lemon 0019ebc5f2 Merge pull request #11825 from Ty-Omaha/permaban 
Replaces "This is a permanent ban" with "This ban does not expire automatically and must be appealed."
 2019-07-15 19:18:49 -06:00
tayyyyyyy 57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
Couls de5defa936 Diagonal tweaks 2019-07-12 06:00:19 -04:00
Ty-Omaha dd1a48e947 this stupid space who even made appealmessage have a space in it 2019-07-11 19:03:01 -04:00
Ty-Omaha eb3f70684d reword the reword 2019-07-11 18:42:03 -04:00
Ty-Omaha 73a7bff8b3 Permaban 2019-07-11 16:58:02 -04:00
Mark van Alphen 6c58f9fcbb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lazy 
# Conflicts:
#	paradise.dme
 2019-07-08 19:37:54 +02:00
Couls cee64d5c37 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-08 10:13:15 -04:00
variableundefined 49059b5317 Merge pull request #11619 from Tayyyyyyy/scrolling_messages 
Add scrolling to messages window, bug fix
 2019-07-08 20:23:37 +08:00
Couls a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined df199a651d Merge pull request #11663 from Markolie/maskofnarsie 
Remove traces of the Mask of Nar'Sie
 2019-07-07 22:10:02 +08:00
Couls 33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
variableundefined 7ffce9acdf Merge pull request #11504 from Crazylemon64/sdql_verb_interface_remove 
Removes the verb interface to SDQL2
 2019-06-30 14:36:04 +08:00
AffectedArc07 fec44e72a9 Panic Bunker 2019-06-21 16:23:21 +01:00