cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,389 Commits 13 Branches 2 Tags
787dd510aa95cd37148dc7ca6a89b391e5b501ea
Commit Graph
43389 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
B.A.L 787dd510aa Adds plasmaman and Vox crates 2019-03-14 21:22:31 -07:00
ParadiseSS13-Bot 60d44d8151 Automatic changelog compile, [ci skip] 2019-03-14 08:49:02 +00:00
ParadiseSS13-Bot 01989bc732 Automatic changelog generation for PR #10845 [ci skip] 2019-03-14 03:04:42 -04:00
variableundefinedandGitHub 9d821534a5 Merge pull request #10845 from Quantum-M/bureaucraticUpdate 
Updates stamps and adds contract sprites.
 2019-03-14 15:04:40 +08:00
ParadiseSS13-Bot 7a96ae5f1b Automatic changelog generation for PR #10795 [ci skip] 2019-03-14 03:04:31 -04:00
variableundefinedandGitHub 6a2067f9c4 Merge pull request #10795 from Quantum-M/alienOrgans 
[Ready for Review]Adds different looking organs to each species, some blood color changes, and MMI changes
 2019-03-14 15:04:29 +08:00
ParadiseSS13-Bot de4d1c9060 Automatic changelog generation for PR #11030 [ci skip] 2019-03-14 02:43:50 -04:00
variableundefinedandGitHub dcd9ea8278 Merge pull request #11030 from Couls/shesi-fluff-fix 
Update shesi's fluff sprites and add in a custom winter hood
 2019-03-14 14:43:48 +08:00
variableundefinedandGitHub 26e15110bf Merge pull request #11041 from Aurorablade/CoverOurASSets 
Asset logging
 2019-03-14 14:41:16 +08:00
Aurorablade 238b73121f Asset logging 2019-03-14 00:42:17 -04:00
ParadiseSS13-Bot 26db1292fb Automatic changelog compile, [ci skip] 2019-03-13 02:43:20 +00:00
ParadiseSS13-Bot ab3583a0ea Automatic changelog generation for PR #11028 [ci skip] 2019-03-12 20:23:03 -04:00
variableundefinedandGitHub a9e69906a2 Merge pull request #11028 from Couls/simple-animal-text-fix 
Simple mobs text fix
 2019-03-13 08:23:02 +08:00
ParadiseSS13-Bot 5d88ddb4e9 Automatic changelog compile, [ci skip] 2019-03-13 00:16:23 +00:00
ParadiseSS13-Bot 0e7fb8f84d Automatic changelog generation for PR #11029 [ci skip] 2019-03-12 20:16:11 -04:00
variableundefinedandGitHub 476144412f Merge pull request #11029 from Couls/you're-welcome-mute-people 
Tcomms no longer translates emotes!
 2019-03-13 08:16:10 +08:00
Couls b89c3dd6cf Tcomms no longer translates emotes! 2019-03-12 19:42:15 -04:00
Couls 379735e899 Consistency fixes 2019-03-12 18:58:50 -04:00
Couls cc7d2606be Update shesi's fluff sprites and add in a custom winter hood to go with the coat 2019-03-12 18:24:04 -04:00
ParadiseSS13-Bot 74235e0c19 Automatic changelog compile, [ci skip] 2019-03-12 00:44:42 +00:00
ParadiseSS13-Bot 2c94df3c62 Automatic changelog generation for PR #11020 [ci skip] 2019-03-11 19:39:02 -04:00
variableundefinedandGitHub 65dd614d19 Merge pull request #11020 from Arkatos1/AntagHUD_fix_traitorvamp_traitorchan 
AntagHUD fixes for pure Vampires/Changelings in Traitor+Vampire and Traitor+Changeling gamemodes
 2019-03-12 07:39:00 +08:00
Arkatos1 5953eed5bc Fixes issue when no antaghud icon was shown for traitor vampire and traitor changeling 2019-03-11 19:25:19 +01:00
ParadiseSS13-Bot 274066f407 Automatic changelog compile, [ci skip] 2019-03-11 11:47:08 +00:00
ParadiseSS13-Bot 3e4d8cde9b Automatic changelog generation for PR #11008 [ci skip] 2019-03-11 04:05:06 -04:00
variableundefinedandGitHub b76ff1e4eb Merge pull request #11008 from rb303/rb-fluff 
Rb303 fluff item 2: electric boogaloo
 2019-03-11 16:05:04 +08:00
rb303 2db1ea7e34 Fix conflicts 2019-03-11 03:04:47 +00:00
rb303 f1716ed14a fixes conflicts 2019-03-11 02:55:21 +00:00
ParadiseSS13-Bot 3d012d127e Automatic changelog generation for PR #11017 [ci skip] 2019-03-10 20:40:00 -04:00
variableundefinedandGitHub 46aa8f42c5 Merge pull request #11017 from Couls/toggle-karma-hotfix 
Toggle Karma Hotfix
 2019-03-11 08:39:58 +08: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
ParadiseSS13-Bot 4bfc880648 Automatic changelog compile, [ci skip] 2019-03-10 07:40:27 +00:00
ParadiseSS13-Bot e187e61acf Automatic changelog generation for PR #11014 [ci skip] 2019-03-10 03:23:01 -04:00
variableundefinedandGitHub f8ff2c6723 Merge pull request #11014 from TheMadTrickster/Fluff-sprite-fixes-for-Dan-Jello 
Fixed fluff guitar and trench coat sprites
 2019-03-10 15:22:59 +08:00
ParadiseSS13-Bot 3772bdf88a Automatic changelog compile, [ci skip] 2019-03-10 06:49:08 +00:00
Pineapple Salad e8e8f37fd8 Fixed fluff guitar and trench coat sprites 
Approved by Necaladun w/ discord

Fixes wonky/bugged ugly sprites for Dan Jellos fluffs
 2019-03-10 01:18:26 -05:00
ParadiseSS13-Bot 1b9bef4ad4 Automatic changelog generation for PR #11012 [ci skip] 2019-03-09 20:07:52 -05:00
variableundefinedandGitHub bd87257e73 Merge pull request #11012 from Tails2091/simple-help 
Adds Missing simple_animal Emote Help Text
 2019-03-10 09:07:51 +08:00
Tails2091 8eadbdcd59 Adds missing simple_animal help text 2019-03-09 17:57:05 -05: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