cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-01 01:51:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,798 Commits 12 Branches 2 Tags
ec4add0ebfa3a02003fc6abfb801a88dfdca56e8
Commit Graph

12924 Commits

Author SHA1 Message Date
Fox-McCloud
80587202fe forcemove fixes 2017-01-27 21:03:57 -05:00
Fox-McCloud
6fb69e272c Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-27 20:15:25 -05:00
Crazy Lemon
cd31694e12 Merge pull request #6253 from fludd12/GhostBar 
Respawner Machine (Attempt Deux)
 2017-01-27 16:59:36 -08:00
Fox-McCloud
9fd8718bc7 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-27 19:31:07 -05:00
Fox-McCloud
6d3ef6001f drying racks 2017-01-26 23:48:47 -05:00
Fox McCloud
a1ac4a9ec2 Merge pull request #6231 from Aurorablade/ThePowerOfSalt 
THE POWER OF SALT COMPELS YOU
 2017-01-26 10:52:44 -05:00
Aurorablade
55e58ef471 honk 2017-01-26 10:39:48 -05:00
fludd12
bb263d58c5 #JustAdminThings 2017-01-26 09:23:49 -05:00
Fox-McCloud
51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy Lemon
0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor 
Makes Reagents Holder Process and Refactors NOREACT
 2017-01-26 03:47:30 -08:00
fludd12
3cff59ec74 Adds Respawner 2017-01-26 05:09:44 -05:00
Fox-McCloud
cd93a21a97 nymphs and fixes 2017-01-26 03:38:25 -05:00
FlattestGuitar
f9218307c0 Fixes shadowling scaling. 2017-01-25 18:34:11 +01:00
Crazy Lemon
15dca8b4aa Merge pull request #6226 from Fox-McCloud/debug-this 
Removes Unused Object
 2017-01-25 04:15:18 -08:00
Fox-McCloud
084ed30446 more fixes and features 2017-01-25 01:04:01 -05:00
Aurorablade
29c6a89f45 removes processed bread 2017-01-24 23:24:49 -05:00
Fox-McCloud
36bfee25dc last of the missing stuff, hopefully 2017-01-24 18:33:22 -05:00
scrubmcnoob
409d9ecdae Tweaks 2017-01-24 06:53:32 -05:00
Fox-McCloud
b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Aurorablade
318c339f11 icons are silly 2017-01-23 18:32:40 -05:00
Aurorablade
eb4b320676 fox changes 2017-01-23 18:31:13 -05:00
scrubmcnoob
9312d831ae Lesser Slings count back to 5 and lose veil 2017-01-23 18:07:38 -05:00
Fox-McCloud
3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud
5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Fox-McCloud
104bfab759 sprite and code fixes 2017-01-22 23:25:56 -05:00
Aurorablade
64b8200823 changes 2017-01-22 19:42:13 -05:00
Fox-McCloud
706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3 more work 2017-01-22 01:46:48 -05:00
scrubmcnoob
06f9ae7038 Clamp to 25 2017-01-22 00:32:10 -05:00
scrubmcnoob
acfee0a404 Reworks Max Thralls and changes Thrall abilities 2017-01-21 21:34:19 -05:00
Aurorablade
1769672037 this icon was a thing.... 2017-01-21 19:37:08 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
scrubmcnoob
13baacbe54 Shadowling Thrall Scaling 
Shadowlings now have a scaling thrall count for acension dependent on
amount of players.
Min amount of thralls is limited to 15 as normal.
Max amount of thralls is capped to 40.
Formula is Players/2.5
Just happens 100 players is exactly 40 thralls.

Looking at a balancing standpoint, most can agree right now that
shadowlings only needing 15 thralls on 100+ rounds is way too little and
prematurely ends the round before things can get really heated up.

Also the game mode's minimum playercount is 30, to which it still
expects you to convert half the station to thralls, 15. This formula is
much less drastic than that but still raises the count.

Thanks to Kyet for writing this and explaining the in&outs of the code,
and helping me with this.
 2017-01-21 18:28:02 -05:00
Aurorablade
8f3ea0d5cb blrghh 2017-01-21 08:50:58 -05:00
Aurorablade
559fcebb57 ferp 2017-01-21 08:50:30 -05:00
Aurorablade
0d125c20a0 why do i do this.. 2017-01-21 06:17:06 -05:00
Fox-McCloud
723e87effd Removes Unused Object 2017-01-20 21:50:00 -05:00
Fox McCloud
e0569091c9 Merge pull request #6222 from Markolie/ann2 
Announcement fixes
 2017-01-19 13:21:18 -05:00
Markolie
cedfc2ccbf Announcement fixes 2017-01-19 15:12:20 +01:00
Crazy Lemon
2a209f62cd Merge pull request #5814 from Markolie/ann2 
Announcement refactor
 2017-01-18 19:17:30 -08:00
Crazy Lemon
37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
Fox McCloud
03e3f1d624 Merge pull request #6169 from Aurorablade/KALIMAH 
Bugsie 3
 2017-01-18 18:52:19 -05:00
Crazy Lemon
deba5d8b95 Merge pull request #6170 from Fox-McCloud/species-lever-options 
Adds Species Levers
 2017-01-18 15:35:17 -08:00
Aurorablade
9029f1c7cf Dammit Flattest 2017-01-18 09:23:33 -05:00
Aurorablade
9f1037006d Changes and more shit i noticed... 2017-01-17 23:45:47 -05:00
Crazylemon64
56673f786b Fixes Joined Souls 
Fixes Summoning the finale rune
 2017-01-17 11:22:22 -08:00
Mieszko Jędrzejczak
1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Fox McCloud
495cb56e74 Merge pull request #6191 from Krausus/CharacterSlotFixes 
Character Slot Randomization and Loading Fixes
 2017-01-16 13:31:19 -05:00