cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,196 Commits 26 Branches 2 Tags
98b8efc080a07ebbab80ca7c65d6ea87381d2646
Commit Graph

32012 Commits

Author SHA1 Message Date
variableundefined
98b8efc080 Merge pull request #11349 from Arkatos1/BolaSound 
Adds bola throw sound, sets hitsound for all types of bolas
 2019-04-29 22:53:46 +08:00
variableundefined
d2750dd33e Merge pull request #11404 from farie82/popup-limiter-fix 
Fixes some edge cases for the popup limiting
 2019-04-29 22:29:33 +08:00
variableundefined
3747721232 Merge pull request #11335 from Arkatos1/DiceRoll 
Dice will now roll when thrown
 2019-04-29 22:27:51 +08:00
variableundefined
45300c2e1c Merge pull request #11323 from AffectedArc07/nttc-spans 
Makes NTTC use classes instead of colors
 2019-04-29 22:23:45 +08:00
joep van der velden
0f034f0443 Fixes some edge cases for the popup limiting 2019-04-29 15:53:51 +02:00
Fox McCloud
84e4be57f0 Merge pull request #11129 from iantine/master 
Adds Lumi's fluff vox suit
 2019-04-28 20:52:39 -04:00
Fox McCloud
4e4697ad2f Merge pull request #11391 from farie82/admin-pm-fix 
PM's work again
 2019-04-28 13:42:45 -04:00
Fox McCloud
87f56ddf16 processing fix 2019-04-27 22:33:10 -04:00
joep van der velden
efcfbbcf2d Added checks now 2019-04-28 00:08:03 +02:00
joep van der velden
86c8cf0c8b PM's work again 2019-04-27 22:25:04 +02:00
Fox McCloud
5b7f483ad0 Fixes Multi-Blob 2019-04-27 03:15:31 -04:00
variableundefined
4b9bac327e Merge pull request #11364 from Fox-McCloud/death-of-object-processing 
Kills off Object and Fast Object Processes
 2019-04-26 08:11:48 +08:00
Fox McCloud
ce0b2c5828 Merge pull request #11367 from farie82/juice-fix 
fixed orange juice and doctordelight not working on ingestion
 2019-04-24 13:54:56 -04:00
Arkatos1
8d79486d3a Code review fixes 2019-04-24 16:29:22 +02:00
joep van der velden
b19d460909 fixed orange juice and doctordelight 2019-04-24 13:03:22 +02:00
Fox McCloud
5bdbb64da2 returning parent value 2019-04-24 01:11:42 -04:00
Fox McCloud
89883a7b28 fixes 2019-04-24 00:49:23 -04:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
AffectedArc07
1c5a412227 This shouldnt be existing anymore 2019-04-23 22:44:58 +01:00
Fox McCloud
4431f2ef22 Merge pull request #11361 from AffectedArc07/ss-alarms 
SSalarms
 2019-04-23 15:56:20 -04:00
Fox McCloud
f6afbf98b1 Merge pull request #11362 from alex-gh/cult_lobby_fix 
Players in the lobby no longer see cult speak.
 2019-04-23 15:52:00 -04:00
AffectedArc07
fa6ba7343f Merge branch 'master' into ss-alarms 2019-04-23 20:37:42 +01:00
AffectedArc07
42624fe847 Spaces > Tabs 2019-04-23 20:31:26 +01:00
alex-gh
5e0817a478 Players in the lobby no longer see cult speak. 2019-04-23 21:21:31 +02:00
Fox McCloud
ff1edb1080 Merge pull request #11300 from Arkatos1/Ghost_Hud 
Adds Observer HUD buttons + Refactor of some ghost verbs
 2019-04-23 15:11:15 -04:00
Fox McCloud
5bd258c560 Merge pull request #11360 from AffectedArc07/ss-events 
SSevents & SSholiday
 2019-04-23 14:25:56 -04:00
variableundefined
73f4c6ea99 Merge pull request #11284 from Arkatos1/Null_Charge 
New Shadowling Ability - Null Charge! (replaces Drain Life)
 2019-04-23 21:02:11 +08:00
variableundefined
624699e6d9 Merge pull request #11332 from Arkatos1/VarArts 
Adds an option to grant Martial Arts via Var menu
 2019-04-23 20:47:03 +08:00
variableundefined
905fc7607a Merge pull request #11328 from farie82/mhelp-rights-fix 
Admins can now see the mhelp tickets
 2019-04-23 20:46:34 +08:00
variableundefined
f917c36ff7 Merge pull request #11329 from farie82/glare-logging 
Vampire glare is logged now
 2019-04-23 20:46:08 +08:00
variableundefined
337aeca559 Merge pull request #11354 from Kyep/ert_alert_fix 
Improves unspawnable ERT alert
 2019-04-23 20:42:44 +08:00
variableundefined
ce87d5208f Merge pull request #11355 from Kyep/href_hack_alert_fix 
Fixes unnecessary pAI warning for admins
 2019-04-23 20:42:10 +08:00
AffectedArc07
acee1dcb42 SSalarms 2019-04-23 12:45:35 +01:00
variableundefined
03a5ee47b8 Merge pull request #11292 from farie82/puke-refactor 
Refactors puke to make it less lag inducing
 2019-04-23 19:45:01 +08:00
variableundefined
b738f9a92f Merge pull request #11283 from Fox-McCloud/emote-refactor 
Emote Refactor
 2019-04-23 19:44:26 +08:00
variableundefined
b37e55998e Merge pull request #11278 from Arkatos1/Summon_Ghosts 
New Wizard spell - Summon Ghosts!
 2019-04-23 18:52:03 +08:00
AffectedArc07
563a951975 SSevents & SSholiday 2019-04-23 10:55:36 +01:00
Lumi
fc0f06536b Merge remote-tracking branch 'upstream/master' 2019-04-23 16:43:47 +10:00
Kyep
e1fe8b3196 Fixes href warning 2019-04-22 07:35:58 -07:00
Kyep
1b9fe80d4f Fixes/refactors unspawnable ERT alert 2019-04-22 07:03:55 -07:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
Fox McCloud
f761acb2ff Merge pull request #11318 from AffectedArc07/die-master-controller 
Kills off the master controller
 2019-04-21 15:44:54 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Arkatos1
d31b159813 Added bola throw sound, sound equality across all bolas 2019-04-21 20:25:14 +02:00
AffectedArc07
a0581c314a SSvote 2019-04-21 16:34:11 +01:00
Fox McCloud
d88411f947 Merge pull request #11255 from Markolie/safe 
Safe refactor
 2019-04-21 04:04:13 -04:00
Fox McCloud
7539976878 Merge pull request #11333 from Arkatos1/HelmetFix 
Toggling hardhat light on/off now correctly updates wearer's sprite
 2019-04-20 21:46:24 -04:00
CthulhuOnIce
bb7582149b these should be continues 2019-04-19 20:43:32 -05:00
Arkatos1
321748a7e7 Dice will now roll when thrown 2019-04-19 22:48:15 +02:00
Arkatos1
2feb01fec8 Fixes a bug regarding hardhats and refactors them 2019-04-19 20:00:31 +02:00