cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,125 Commits 26 Branches 2 Tags
ea004bddcf2e6059587d0b8a95df19087d1c7a77
Commit Graph

390 Commits

Author SHA1 Message Date
AffectedArc07
a50f656d8d Game Preferences Update (#13936) 2020-10-09 14:53:59 -04:00
AffectedArc07
8537de8aa6 Merge pull request #14131 from farie82/ticket-conversion-fix 
Refactors the ticket code. Fixes the ticket conversion. Removes bolding of names etc in tickets
 2020-10-04 18:26:52 +01:00
mochi
324e053c1a Merge branch 'master' into fix-ghost-poll-chat-signup 2020-09-29 15:08:16 +02:00
AffectedArc07
b90f9257ed Merge pull request #14462 from Kyep/no_observe_before_startup 
Prevent observe before server is finished starting
 2020-09-27 12:42:33 +01:00
Kyep
96294e625c Prevent observe before server is finished starting 2020-09-27 03:26:42 -07:00
joep van der velden
4ef23e77ec Makes it so that not every datum uses an UID every destroy 2020-09-27 12:11:46 +02:00
TDSSS
7e8d9ad51e Fixes meteor sat emag oversight and cleans event code a bit (#14414) 
* fix and cleanup

* fixes incorrect comment

* incorporates review comments

* Autodoc, yo

* minor typo

* false and true
 2020-09-25 19:56:17 -04:00
joep van der velden
a85b0b5496 Merge remote-tracking branch 'upstream/master' into ticket-conversion-fix 2020-09-21 23:10:40 +02:00
farie82
1ffca6dfed Makes PMs work after the client reconnects (#14404) 2020-09-21 15:08:34 -04:00
AffectedArc07
f110cef216 [TGUI] Cargo Console (#14386) 
* TGUI Cargo Console

* Addesses Mochi
 2020-09-20 11:47:14 -04:00
joep van der velden
81cce5977f Review changes 2020-09-18 13:17:02 +02:00
AffectedArc07
c5597b9372 Merge pull request #14291 from Kyep/tgui_id_computer 
[TGUI] ID Computer
 2020-09-16 20:10:42 +01:00
variableundefined
bda9114547 Bandaids the parallax runtime (#13974) 2020-09-16 11:35:17 -04:00
Kyep
a3787383f5 notify dept target, refactor / consistent buzz sounds, improved logging 2020-09-16 08:22:58 -07:00
Kyep
eb464ebd24 fixes merge conflict 2020-09-16 06:54:30 -07:00
SteelSlayer
860b2c0077 Merge remote-tracking branch 'upstream/master' into SScleanup 2020-09-16 08:11:13 -05:00
Kyep
07b4ff1354 merge conflict fix 2020-09-15 17:04:39 -07:00
Kyep
991f87f7d7 fix comms computer timer display 2020-09-15 16:52:56 -07:00
Kyep
00b458be3e fixes merge conflict 2020-09-15 15:34:50 -07:00
Kyep
b9e0ca1359 fixes merge conflict 2020-09-15 08:54:10 -07:00
Kyep
4e44253af3 fixes merge conflict, updates to master 2020-09-15 00:31:56 -07:00
mochi
e07306f20d Merge branch 'master' into instrument-tgui-n-optimization 2020-09-14 20:04:48 +02:00
mochi
fa9eb84c8b Address AA 2020-09-14 19:58:18 +02:00
AffectedArc07
a2c5fc39a8 Merge pull request #13751 from Fox-McCloud/alarm-overhaul 
Overhauls and Refactors Alarm System
 2020-09-14 13:54:06 +01:00
Fox McCloud
e6bd4b6638 fix ups 2020-09-13 18:33:21 -04:00
SteelSlayer
5730e32fbf stack_trace 2020-09-12 18:41:22 -05:00
SteelSlayer
72f4799ab1 Merge remote-tracking branch 'upstream/master' into SScleanup 2020-09-12 18:31:41 -05:00
SteelSlayer
7f4f4c7328 Update cleanup.dm 2020-09-12 17:46:57 -05:00
Kyep
9e45a00bdd UI cleanup, demote reasons shown in log 2020-09-10 17:10:18 -07:00
SteelSlayer
eebc369704 adds runtime logging when a null is found 2020-09-10 12:57:06 -05:00
SteelSlayer
287e412fae kills off the chat subsystem 2020-09-06 10:55:32 -05:00
SteelSlayer
629f433ccc SScleanup 2020-09-06 10:08:40 -05:00
Kyep
7f61c71b57 WIP, about 30% of the way there 2020-09-05 10:09:43 -07:00
Certhic
f7af928ce6 shuttle defines refactor 2020-09-04 11:19:50 +02:00
mochi
aaa79c5a3e Fix gimmick teams, missing poll icon 2020-09-02 12:05:06 +02:00
Kyep
fe07f53f2e refueling time shows in interface 2020-08-28 12:26:13 -07:00
Kyep
4f2c185bc7 [TGUI] Communications Console 2020-08-28 02:43:35 -07:00
mochi
d060e8bc43 Fix offspring candidacy icon, pref checks and add chat message 2020-08-23 13:26:44 +02:00
farie82
65165ad708 Merge branch 'master' into ticket-conversion-fix 2020-08-22 22:21:30 +02:00
AffectedArc07
801bfea049 Merge pull request #14115 from Deelite34/Night-mode-tweak 
Dark chat tweaks
 2020-08-22 19:33:38 +01:00
joep van der velden
e89d4e80d6 Review fixes 2020-08-22 15:01:32 +02:00
joep van der velden
f2d21f9299 Refactors the ticket SSes. Fixes the ticket conversion 2020-08-22 13:12:41 +02:00
Deelite34
8655b62125 Span instead of copypaste 2020-08-19 22:28:51 +02:00
Deelite34
45ce7b378c Tweaks the night mode chat 2020-08-19 20:34:31 +02:00
AffectedArc07
233c60058d Merge pull request #13710 from dearmochi/overhaul-event-mob-selection 
Overhaul event mob selection
 2020-08-18 10:55:24 +01:00
mochi
c1d3d164fa Kyet stuff 2020-08-18 10:28:47 +02:00
AffectedArc07
7f6d077994 Merge pull request #14080 from Kyep/refactor_exp_update 
Playtime DB update call refactor
 2020-08-16 13:49:37 +01:00
AffectedArc07
07301da5d2 Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob 
ID Computer Demotion/Termination Upgrades
 2020-08-16 13:14:42 +01:00
AffectedArc07
57decdd4fb Merge pull request #13560 from farie82/convert-tickets 
Makes staff able to convert m/ahelp tickets to the other type
 2020-08-16 12:46:23 +01:00
Kyep
7dad849cfe squash 2020-08-14 13:33:15 -07:00