cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,451 Commits 26 Branches 2 Tags
b5c322e00a2449b441ffb573f4c50135d0842e60
Commit Graph

905 Commits

Author SHA1 Message Date
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined
5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option 
Better SSD management
 2019-04-30 11:29:49 +08:00
Kyep
de29dbcc94 Ansari request #define SSD_WARNING_TIMER 2019-04-29 20:16:28 -07:00
joep van der velden
86c8cf0c8b PM's work again 2019-04-27 22:25:04 +02:00
Mark van Alphen
045311ae84 Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-23 22:59:11 +02:00
Mark van Alphen
1bb35a43ef SQL fix 2019-04-23 15:13:33 +02:00
Kyep
d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Mark van Alphen
c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Mark van Alphen
e5033a927a Fix toggle sanization 2019-04-22 00:55:54 +02:00
Mark van Alphen
64f8300c2d Switch to preference toggle for ambient occlusion 2019-04-21 18:11:10 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
joep van der velden
36f5c8ea14 let cmd_admin_pm handle the null client 2019-04-13 10:42:08 +02:00
joep van der velden
9598dcac5e fixed PM's 2019-04-13 00:57:59 +02:00
Ionward
0266c2fee2 fixed the display names in the loadout to fit alphabetical order better, and adjusted allowed list spacing 2019-04-09 21:12:25 -07:00
Ionward
4d754dde41 adjusted armor values and added options to the suit loadout menu 2019-04-09 20:49:14 -07:00
variableundefined
fc616d8a19 Merge pull request #11242 from Markolie/hotkeymode 
Hotkey mode handling is now instantaneous
 2019-04-07 21:21:21 +08:00
variableundefined
525b28014c Merge pull request #11026 from farie82/popup-limiting 
Gives the option to limit the text popups to 1
 2019-04-07 20:41:24 +08:00
Mark van Alphen
aa58a88296 Switch to client-side hotkey toggling 2019-04-05 22:45:05 +02:00
variableundefined
7192280996 Merge pull request #11075 from AffectedArc07/alphabetisation-for-all 
Alphabetical preferences menu
 2019-03-24 17:51:50 +08:00
variableundefined
85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs 
[Goonchem] Pills, Bottles, Patches, and Pillbottles
 2019-03-24 17:51:00 +08:00
AffectedArc07
c5f5fef912 Alphabetical prefs 2019-03-18 17:28:01 +00:00
joep van der velden
9631eef2aa Fixed the middle mouse exploit 2019-03-18 14:53:41 +01:00
Fox McCloud
d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
Aurorablade
238b73121f Asset logging 2019-03-14 00:42:17 -04:00
joep van der velden
58b42c6566 sql updated now as well 2019-03-12 20:26:09 +01:00
joep van der velden
f8a5e81ea2 Popups can now be limited to 1 2019-03-12 20:11:20 +01:00
Couls
4e1e55b9e9 Fix spacing errors 2019-03-10 18:00:49 -04:00
Couls
9037aa2d87 Hotfix 
send proper message about karma gains, display a message about whether it's enabled or not at roundstart for less confusion
 2019-03-10 16:05:02 -04:00
variableundefined
c217f3a8a9 Merge pull request #10996 from Couls/toggle_karma2 
[Ready to Merge]Toggle Karma
 2019-03-09 21:40:16 +08:00
Couls
5d83925223 Revert "Revert "Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2"" 
This reverts commit bed368d1c9.
 2019-03-07 17:43:19 -05:00
Couls
bed368d1c9 Revert "Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2" 
This reverts commit 79777f441e, reversing
changes made to a76e7c4060.
 2019-03-07 17:42:53 -05:00
Couls
ddb335fe2c remove redundant var 2019-03-07 15:45:58 -05:00
Couls
8bc511f50f Make karma toggleable 
Add in feedback message

Update client defines.dm

keep it as bool I guess

Update karma.dm

Make it persistent

Update karma.dm

Update karma.dm

Update preferences.dm

make it compile, include kyet's suggestions

fix some things with the help of dtx
 2019-03-05 20:26:43 -05:00
AffectedArc07
6ab0344bb6 Config option for the paranoid 2019-03-03 11:37:49 +00:00
AffectedArc07
d1a161cf8f ;SECURITY HELP 2019-03-02 12:28:59 +00:00
AffectedArc07
3f54239614 Auto admin for localhost 2019-03-02 10:42:52 +00:00
variableundefined
82778bd88e Merge pull request #10872 from AffectedArc07/changelog-button-fix 
Refactors changelog button
 2019-02-11 21:14:17 +08:00
AffectedArc07
d7b11a51ff Fixes changelog button 2019-02-10 18:24:04 +00:00
Shadeykins
3c2f36759b Readds deaf 2019-02-06 18:50:23 -07:00
Shadeykins
0638fb599d Woopwoop. 2019-02-04 20:35:57 -07:00
Shadeykins
0c0e4a02af Removes several disabilities, adds chav. 2019-02-04 20:25:43 -07:00
variableundefined
8e0f0761ea Merge pull request #10785 from AffectedArc07/changelog-button-fix 
Darkmode fixes
 2019-02-01 10:41:21 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
AffectedArc07
2d4dfb55b7 Darkmode fixes 2019-01-30 17:34:12 +00:00
AffectedArc07
e7405fcd3f Merge branch 'master' into darkmode-sql 2019-01-29 16:31:57 +00:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
AffectedArc07
b078d356c4 oops forgot that 2019-01-27 16:07:28 +00:00
AffectedArc07
edf7667869 WORKING TOGGLEABLE DARKMODE (With <3 to Teri) 2019-01-27 16:02:17 +00:00
variableundefined
15732a7587 Merge pull request #10638 from Kyep/mentorhelp_bwoinks_for_admins 
Let admins disable bwoink sound for mentorhelps
 2019-01-20 14:24:02 +08:00