cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 20:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,400 Commits 27 Branches 2 Tags
b52a36f70305c1f0352be47d0835bd2c170df4fa
Commit Graph

31482 Commits

Author SHA1 Message Date
Arkatos1
b52a36f703 Allows Wizards to choose the type of guardian spirit they want from the tarot deck, and updates tarot deck description in the spellbook accordingly 2019-03-15 16:06:03 +01:00
variableundefined
66eddce16c Merge pull request #11024 from Arkatos1/Guardian_Intent_UI 
Adds action intent UI for Guardians [Now with custom icons]
 2019-03-15 11:27:03 +08:00
variableundefined
3285eae748 Merge pull request #11023 from Couls/defib-text 
Defibrillator QoL
 2019-03-15 11:25:25 +08:00
variableundefined
9d821534a5 Merge pull request #10845 from Quantum-M/bureaucraticUpdate 
Updates stamps and adds contract sprites.
 2019-03-14 15:04:40 +08:00
variableundefined
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
variableundefined
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
Aurorablade
238b73121f Asset logging 2019-03-14 00:42:17 -04:00
Arkatos1
840929e0a8 Custom icons for Guardian action intents! 2019-03-13 19:23:27 +01:00
variableundefined
a9e69906a2 Merge pull request #11028 from Couls/simple-animal-text-fix 
Simple mobs text fix
 2019-03-13 08:23:02 +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
Arkatos1
f38f1a0a81 Adds intent UI for guardians 2019-03-12 16:14:07 +01:00
Couls
2f23d50740 Make text blue 2019-03-11 21:44:32 -04:00
Couls
7b08f73b25 Add a line about ctrl-clicking 2019-03-11 20:51:12 -04: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
rb303
2db1ea7e34 Fix conflicts 2019-03-11 03:04:47 +00:00
rb303
f1716ed14a fixes conflicts 2019-03-11 02:55:21 +00: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
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
variableundefined
62412c1611 Merge pull request #11006 from Kyep/mystery_antags 
Event Role Feature
 2019-03-09 22:17:05 +08:00
variableundefined
c217f3a8a9 Merge pull request #10996 from Couls/toggle_karma2 
[Ready to Merge]Toggle Karma
 2019-03-09 21:40:16 +08:00
variableundefined
9dd9799e50 Merge pull request #10975 from AffectedArc07/autoadmin 
Auto admin for localhost
 2019-03-09 21:32:43 +08:00
variableundefined
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
rb303
26bcfacf2a Fluff Item 2019-03-08 17:49:34 +00:00
variableundefined
c514b4e34a Merge pull request #10991 from Dave-TH/medbay_qol 
Smartfridges Accept IV Bags
 2019-03-08 22:41:45 +08:00
variableundefined
3088eff926 Merge pull request #10990 from AzuleUtama/cyberImplantNukeFix 
Cyber implant bundle fix and Discount balancing
 2019-03-08 22:31:14 +08:00
variableundefined
c8a8b2218d Merge pull request #10981 from Kyep/spider_venom 
Reworks Giant Spider Venom
 2019-03-08 22:28:13 +08:00
variableundefined
c3de57a13f Merge pull request #10973 from Jazz23/Potion-Fix 
Adds mousedrop to speed/fire potions
 2019-03-08 22:27:16 +08:00
variableundefined
3d0667a1f7 Merge pull request #10988 from Jazz23/Golem-Fix 
Removes golem shell after species swap
 2019-03-08 22:14:16 +08:00
variableundefined
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
ddb335fe2c remove redundant var 2019-03-07 15:45:58 -05: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
variableundefined
cbc45451bc Merge pull request #10994 from Agameofscones/lang_key_fix 
Fixes Neo-Russkiya Lang key
 2019-03-07 09:11:36 +08:00
variableundefined
6549234b8c Merge pull request #10968 from Fox-McCloud/his-grace 
His Grace Binds His Will
 2019-03-07 08:49:05 +08: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
Aurorablade
ca629f4bd3 Pinapplehairfluff 2019-03-04 22:10:22 -05:00
Dave
ef8142d130 Medbay Smartfridges 2019-03-04 18:57:42 -05: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
variableundefined
b70f2940b7 Merge pull request #10970 from AffectedArc07/fluff 
Fluff Item
 2019-03-04 22:08:44 +08:00
variableundefined
c12a43913b Merge pull request #10921 from Nicaragua1/General_Griefsky 
Genewul Giftskee is less annoying
 2019-03-04 19:02:47 +08:00
Jazz23
29840da88b Removes golem shell after species swap. 2019-03-03 21:08:04 -08:00