cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,972 Commits 26 Branches 2 Tags
c5e6c9323b47ee123c68b96b7530e44717239ebd
Commit Graph

523 Commits

Author SHA1 Message Date
Aurorablade
c5e6c9323b addresses mrrowl comments 
still haveing shuttle load issues after first one is loaded..
 2016-12-11 23:11:21 -05:00
Aurorablade
19925a3313 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-06 21:22:16 -05:00
Crazy Lemon
558a7c5d46 Merge pull request #5929 from Fox-McCloud/timer-update 
Timer Controller Update
 2016-12-05 08:57:46 -08:00
Crazy Lemon
51822ab940 Revert "Revert "Makes the admin logout tracking system actually work"" 2016-12-03 02:23:18 -08:00
Crazy Lemon
c8f54b4d53 Revert "Makes the admin logout tracking system actually work" 2016-12-03 01:53:47 -08:00
Fox-McCloud
c70e69004c Timer Controller Update 2016-11-30 17:50:16 -05:00
Crazylemon64
8271a89dab Makes the admin logout tracking system actually work 2016-11-27 12:00:57 -08:00
Aurorablade
01f4e64f12 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-12 20:37:09 -04:00
TheDZD
568e648bfb Merge pull request #5581 from Fox-McCloud/cloning-update 
Cloning Update
 2016-10-11 16:51:34 -04:00
Crazylemon64
11a37ae960 Should make the rnd console less prone to freezing 
"wait_message" is now guaranteed to be unset provided that the timer
controller doesn't go down, and it'll be reset anyways by the `spawn` if
nothing runtimes in there
 2016-09-27 14:12:15 -07:00
Aurorablade
2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00
Kyep
e4a9ced8f3 Changes syndi team radio display text 
From 'syndteam' to '#unid'. Close enough to '#unkn' used by normal
traitor, but distinct enough you can tell them apart.
 2016-09-06 21:50:36 -07:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Kyep
02ffbd084e Creates Syndicate Team Radio Frequency 2016-09-05 03:35:29 -07:00
Fox-McCloud
bc7f3c67a6 Cloning Update 2016-08-31 01:48:02 -04:00
Aurorablade
65d1c781c8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-26 21:54:56 -04:00
Fox McCloud
4f590f27c4 Merge pull request #5537 from Crazylemon64/debug_log_to_error_viewing 
Moves from `log_debug` to `log_runtime` for non-fatal abberant states
 2016-08-26 21:15:31 -04:00
Crazylemon64
b633cf53af Moves from log_debug to log_runtime for non-fatal abberant states 2016-08-23 17:03:52 -07:00
Crazylemon64
d3c5c6dbbb Adds the name back to the hash 2016-08-23 13:44:06 -07:00
Crazylemon64
ea669191d5 Moves airlocks to the addtimer system 2016-08-23 02:50:27 -07:00
Krausus
541076b6b4 Conflict resolution 2016-08-17 22:54:22 -04:00
Fox McCloud
d6f9b9ff7a Merge pull request #5459 from Crazylemon64/clicky_stat_button 
Clicky stat buttons
 2016-08-17 20:17:43 -04:00
Krausus
4478855cfd Process deferral and profiling improvements 2016-08-17 02:10:39 -04:00
Crazylemon64
60ff7e100a Clicky stat buttons 2016-08-15 09:44:07 -07:00
Fox-McCloud
1df5fd5e9d Strips Out Media Players 2016-08-14 00:03:09 -04:00
Aurorablade
39924a55fd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-11 02:01:41 -04:00
TheDZD
91f18ac1d7 Merge pull request #5393 from Fox-McCloud/fast-processing 
Adds in Fast Processing
 2016-08-10 18:21:00 -04:00
Fox-McCloud
359d33799d tweaks 2016-08-09 14:32:55 -04:00
Fox-McCloud
8cd140e48a Adds in Fast Processing 2016-08-09 06:55:00 -04:00
Aurorablade
5e90dd83ed Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-09 02:43:27 -04:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Aurorablade
79c9b690ac EVERYBODY HURTS 2016-08-03 23:51:13 -04:00
Fox McCloud
a15721b22a Merge pull request #5209 from Krausus/OnceYouLeaveYouCannotComeBack 
Changes to Player Respawnability
 2016-08-03 19:12:04 -04:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system 
Implements Fire System
 2016-08-01 19:39:50 -04:00
Crazylemon64
c48d216ebc Fixes negated conditions 2016-08-01 14:25:38 -07:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Aurorablade
a69b3fde45 work work 2016-07-31 22:57:37 -04:00
Fox-McCloud
1da7d26b1e tweaks 2016-07-31 11:56:42 -04:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Krausus
03abd702e5 Adds early abandon penalty period and other tweaks 
- New config option to set how many minutes is too early in a round to
abandon it
- Suicide-ghosting and cryo-ghosting now only make you non-respawnable
during the penalty period
- Manually entering a cryopod now despawns you 90% faster
- Joining as a drone now has a confirmation box
 2016-07-29 18:26:54 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Aurorablade
9735ff78ac shuttles 2016-07-28 23:47:05 -04:00
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax" 
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
 2016-07-28 15:48:27 -07:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
Krausus
6cff9b10d6 Further voting controller tweaks 
- Adds admin logging to creating and canceling votes
- Adds exception handling
- Adds deletion handling (should, theoretically, never be necessary)
- Adds tick-checking, just in case there's a lot of clients watching a
vote
- Adds the vote controller to the "debug controller" list
- Fixes that one "if" Tiger whined about
 2016-07-24 19:46:34 -04:00
Krausus
5b21a9a785 Improves voting system 
- Makes votes show votes for winning option, or all options in a custom
vote
- Makes the voting panel automatically update
- Makes the voting panel use the browser datum
- Turns the voting notice into a clickable link
- Fixes admin status not properly being checked when the voting page is
refreshed
- Replaces vote process with a spawned loop in the vote controller
- Removes vote processing from the pre-game game ticker
 2016-07-23 02:03:19 -04:00