cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,400 Commits 26 Branches 2 Tags
ca773c32dcdf90548ba4934caefe38f5813263ba
Commit Graph

19464 Commits

Author SHA1 Message Date
Kyep
ca773c32dc Fixes ventcrawl while buckled to something 2019-03-15 03:33:48 -07: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
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
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
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
Jazz23
e9827f8c96 Didn't know this function existed 2019-03-03 07:20:55 -08:00
variableundefined
e109e4fcaa Merge pull request #10939 from Agameofscones/elysian-russian 
Neo-Russkiya
 2019-03-03 23:04:36 +08:00
variableundefined
8236d9e061 Merge pull request #10956 from craftxbox/ai-doorknob-tweak 
AI Doorknob tweak
 2019-03-03 22:39:46 +08:00
variableundefined
5559fba980 Merge pull request #10963 from Kyep/rpd_hardsuit 
Hardsuits already allowing RCDs in suit storage slot now allow RPDs too
 2019-03-03 22:39:35 +08:00
variableundefined
682e7b453e Merge pull request #10948 from datlo/hijackprisonners 
Allow hijackers to take hostages
 2019-03-03 22:37:48 +08:00
AffectedArc07
6ab0344bb6 Config option for the paranoid 2019-03-03 11:37:49 +00:00
Kyep
d231367960 reworks giant spider venom 2019-03-02 19:30:20 -08:00
Jazz23
df91eca51d Can't be incapacitated 2019-03-02 09:09:21 -08:00
Fox McCloud
6bd0ecfab0 tweaks 2019-03-02 10:03:09 -05:00
AffectedArc07
d1a161cf8f ;SECURITY HELP 2019-03-02 12:28:59 +00:00