cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,337 Commits 14 Branches 2 Tags
842615cd5b5bba29c0cdc4aaa85db9b07302b952
Commit Graph
43337 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
joep van der velden 842615cd5b Fixed an ahelp follow up bug. Works now 2019-03-09 22:20:19 +01:00
joep van der velden 8d6cee7915 in between 2019-03-09 20:57:59 +01:00
ParadiseSS13-Bot e57f0b9306 Automatic changelog generation for PR #11006 [ci skip] 2019-03-09 09:17:06 -05:00
variableundefinedandGitHub 62412c1611 Merge pull request #11006 from Kyep/mystery_antags 
Event Role Feature
 2019-03-09 22:17:05 +08:00
ParadiseSS13-Bot e2f6995ed7 Automatic changelog generation for PR #10996 [ci skip] 2019-03-09 08:40:17 -05:00
variableundefinedandGitHub c217f3a8a9 Merge pull request #10996 from Couls/toggle_karma2 
[Ready to Merge]Toggle Karma
 2019-03-09 21:40:16 +08:00
ParadiseSS13-Bot 0f7e03e381 Automatic changelog generation for PR #10975 [ci skip] 2019-03-09 08:32:44 -05:00
variableundefinedandGitHub 9dd9799e50 Merge pull request #10975 from AffectedArc07/autoadmin 
Auto admin for localhost
 2019-03-09 21:32:43 +08:00
ParadiseSS13-Bot e36c6242fa Automatic changelog generation for PR #10978 [ci skip] 2019-03-09 04:04:13 -05:00
variableundefinedandGitHub bcc6063926 Merge pull request #10978 from AffectedArc07/mapmerge2-again 
Mapmerge2 2
 2019-03-09 17:04:11 +08:00
variableundefinedandGitHub dea53b7c6e Merge pull request #10974 from AffectedArc07/appveyor 
Appveyor CI
 2019-03-09 16:18:00 +08:00
ParadiseSS13-Bot 70bf47e01c Automatic changelog generation for PR #10989 [ci skip] 2019-03-09 02:54:20 -05:00
variableundefinedandGitHub 55bf28a402 Merge pull request #10989 from AffectedArc07/discord-verb-movement 
Moves discord verbs to "Special Verbs" instead of "OOC"
 2019-03-09 15:54:18 +08:00
Kyep 24b562b349 starts using a custom 'E' icon for 'event role' 2019-03-08 11:41:08 -08:00
ParadiseSS13-Bot 4e6ed3433a Automatic changelog compile, [ci skip] 2019-03-08 15:15:26 +00:00
ParadiseSS13-Bot 091c7e453f Automatic changelog generation for PR #10991 [ci skip] 2019-03-08 09:41:47 -05:00
variableundefinedandGitHub c514b4e34a Merge pull request #10991 from Dave-TH/medbay_qol 
Smartfridges Accept IV Bags
 2019-03-08 22:41:45 +08:00
ParadiseSS13-Bot 983643bf61 Automatic changelog generation for PR #10990 [ci skip] 2019-03-08 09:31:16 -05:00
variableundefinedandGitHub 3088eff926 Merge pull request #10990 from AzuleUtama/cyberImplantNukeFix 
Cyber implant bundle fix and Discount balancing
 2019-03-08 22:31:14 +08:00
variableundefinedandGitHub c8a8b2218d Merge pull request #10981 from Kyep/spider_venom 
Reworks Giant Spider Venom
 2019-03-08 22:28:13 +08:00
ParadiseSS13-Bot 96132bfe33 Automatic changelog generation for PR #10973 [ci skip] 2019-03-08 09:27:18 -05:00
variableundefinedandGitHub c3de57a13f Merge pull request #10973 from Jazz23/Potion-Fix 
Adds mousedrop to speed/fire potions
 2019-03-08 22:27:16 +08:00
ParadiseSS13-Bot 3f1ae09de0 Automatic changelog generation for PR #10988 [ci skip] 2019-03-08 09:14:17 -05:00
variableundefinedandGitHub 3d0667a1f7 Merge pull request #10988 from Jazz23/Golem-Fix 
Removes golem shell after species swap
 2019-03-08 22:14:16 +08:00
variableundefinedandGitHub 0b79e58a8e Merge pull request #10992 from Aurorablade/PSHairFluff 
Pinapple salad hair fluff
 2019-03-08 21:41:02 +08:00
Kyep 57d9b22675 Eventmob/specialrole v1.0 2019-03-08 02:08:24 -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 79777f441e Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2 2019-03-07 15:47:35 -05:00
Couls ddb335fe2c remove redundant var 2019-03-07 15:45:58 -05:00
ParadiseSS13-Bot aedfc096ea Automatic changelog compile, [ci skip] 2019-03-07 05:09:11 +00:00
Aurorablade 389f055a5b Fixes a pathing format error that i should know better then not to do. 2019-03-06 20:22:02 -05:00
ParadiseSS13-Bot 940c771585 Automatic changelog generation for PR #10994 [ci skip] 2019-03-06 20:11:37 -05:00
variableundefinedandGitHub cbc45451bc Merge pull request #10994 from Agameofscones/lang_key_fix 
Fixes Neo-Russkiya Lang key
 2019-03-07 09:11:36 +08:00
ParadiseSS13-Bot ff2b6be026 Automatic changelog generation for PR #10977 [ci skip] 2019-03-06 20:02:30 -05:00
variableundefinedandGitHub c0532dd1d8 Merge pull request #10977 from AzuleUtama/uplinkFormatAndTooltips 
Uplink - Formatting changes and Tooltips added for item descriptions
 2019-03-07 09:02:29 +08:00
ParadiseSS13-Bot d3b12d35f6 Automatic changelog generation for PR #10968 [ci skip] 2019-03-06 19:49:06 -05:00
variableundefinedandGitHub 6549234b8c Merge pull request #10968 from Fox-McCloud/his-grace 
His Grace Binds His Will
 2019-03-07 08:49:05 +08:00
CoulsandGitHub a76e7c4060 Update preferences_toggles.dm 2019-03-06 12:52:26 -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
Gwydion Brain 23ba90fffc Initial 
I broke pls fix
 2019-03-05 13:09:40 -08:00
variableundefinedandGitHub c1fa401d4c Merge pull request #10993 from Dave-TH/longlivetheking 
Dethrones Tigercat
 2019-03-05 22:37:59 +08:00
Dave c73e1d0f70 Die, monster! You don't belong in this world! 
It is not by my hand that I am once again given maintainership. I was brought here by *coders* who wish to pay me tribute!
Tribute?! You steal men's features! And make them your own!
 2019-03-05 08:54:10 -05:00
Aurorablade ca629f4bd3 Pinapplehairfluff 2019-03-04 22:10:22 -05:00
Dave ef8142d130 Medbay Smartfridges 2019-03-04 18:57:42 -05:00
ParadiseSS13-Bot 67ae64f97d Automatic changelog compile, [ci skip] 2019-03-04 22:49:14 +00:00
AzuleUtama a5cd29f17b Fixed two bugs with the cyber implant bundle, ammo bag and cyber bundle no longer discountable 2019-03-04 19:40:23 +00:00
AffectedArc07 f9e321fbe2 Moves discord verbs to "Special Verbs" instead of "OOC" 2019-03-04 15:49:10 +00:00
ParadiseSS13-Bot eb468c9b0e Automatic changelog generation for PR #10970 [ci skip] 2019-03-04 09:08:46 -05:00
variableundefinedandGitHub b70f2940b7 Merge pull request #10970 from AffectedArc07/fluff 
Fluff Item
 2019-03-04 22:08:44 +08:00