cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,688 Commits 26 Branches 2 Tags
7b2cc1e12bf9d86c45652dffbb4e2c0eee6fdd39
Commit Graph

260 Commits

Author SHA1 Message Date
tayyyyyyy
760009a0cb Fix style 2019-08-13 16:32:31 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
variableundefined
c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker 
Panic Bunker
 2019-08-12 19:34:19 +08:00
Couls
6790d65da4 review fix 2019-08-11 16:48:54 -04:00
Couls
9cca74ce66 change preload_rsc value to set before resources are sent and not after 2019-07-15 17:37:01 -04:00
Couls
7b102e2f4d Remove unused winsets 2019-07-11 01:01:22 -04:00
Couls
4a832c4f61 Fix testmerge issues 2019-07-08 11:20:25 -04:00
AffectedArc07
9bd54a2267 Update client procs.dm 2019-06-23 11:33:08 +01:00
AffectedArc07
afef712773 Auto bunker 2019-06-22 09:58:18 +01:00
AffectedArc07
fec44e72a9 Panic Bunker 2019-06-21 16:23:21 +01:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
Crazy Lemon
8502c44df6 Merge pull request #11359 from Kyep/ipintel 
Adds XKeyScore (from TG), forum link, removes old discord link
 2019-05-30 19:57:18 -07:00
Kyep
cbfe1ce906 Message before disconnecting 2019-05-30 18:06:10 -07:00
Kyep
eaeea7ce2f adds forum link, removes boxen discord table 2019-05-29 14:56:28 -07:00
Kyep
3662b90265 fix, 'more info' for admins, better whitelist support, pre-client bans 2019-05-28 11:35:53 -07:00
Couls
fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
Fox McCloud
238780cae6 Merge pull request #11511 from Markolie/lighting 
Make the lighting plane master respect client color and other lighting fixes
 2019-05-15 20:42:44 -04:00
Mark van Alphen
5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +02:00
Kyep
1b0defba92 fixes merge conflict 2019-05-10 09:56:58 -07:00
Kyep
f4de59a4f8 adds whitelist functionality 2019-05-10 09:54:20 -07:00
Kyep
75bfb77007 fix for $5+ donors not getting more loadout points 2019-05-08 19:12:53 -07:00
Fox McCloud
79815eb042 Merge pull request #11357 from Markolie/lighting 
Lighting system update
 2019-05-08 00:27:16 -04:00
variableundefined
00207f8d9d Merge pull request #11399 from Kyep/patreon_update 
Patreon Upgrade
 2019-05-06 18:52:50 +08:00
Kyep
2555679050 is_connecting_from_localhost() 2019-05-04 22:47:04 -07:00
Couls
fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
Kyep
07bd1b0cc0 fixes merge conflict 2019-04-30 00:54:49 -07: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
Kyep
78c67b9a1f patreon perks, admins, custom events 2019-04-28 03:40:50 -07:00
joep van der velden
86c8cf0c8b PM's work again 2019-04-27 22:25:04 +02:00
Couls
4826ea13f8 more fixes and formatting 2019-04-27 07:08:05 -04:00
Couls
21f5aecf6a Update client procs.dm 2019-04-26 21:04:37 -04:00
Couls
374eda6695 Add in debug for input subsystem 2019-04-26 19:46:35 -04:00
Couls
c2028e9ac3 Change reverse_dir to not cause a runtime when moving diagonal 2019-04-26 05:39:34 -04:00
Kyep
d5cb816b0c removes message to admins in common use case of regular player 2019-04-26 01:17:53 -07:00
Couls
4921405749 make clients inherit from datums 2019-04-23 19:55:17 -04:00
Couls
7eb7d723f9 Implement keybinding system and remove old hotkey modes 2019-04-23 01:31:03 -04:00
Kyep
d61d8a3dc1 new feature: ssd warning system 2019-04-22 21:38:47 -07:00
Kyep
a35ba2fc5f spacing 2019-04-22 18:52:50 -07:00
Kyep
4561ee94f8 WIP ports XKeyScore from TG 2019-04-22 16:53:20 -07:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02: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
joep van der velden
9631eef2aa Fixed the middle mouse exploit 2019-03-18 14:53:41 +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