cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 18:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,839 Commits 17 Branches 2 Tags
a4f19cb4b3b1867ca1663287e9db446a637ad574
Commit Graph
30839 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alffd a4f19cb4b3 Fixes issues with CL unicode, adds Fox's last unicode changelog. 2016-11-27 15:47:16 -05:00
Crazy LemonandGitHub 635335dd5c Merge pull request #5910 from FreeStylaLT/patreoncustom 
[s]Adds a few additional custom items for patreon loadout
 2016-11-26 16:44:21 -08:00
Crazy LemonandGitHub 9418fdf204 Merge pull request #5916 from Fox-McCloud/status-fixes 
Fixes Faint and Mickey Finn
 2016-11-26 13:41:44 -08:00
Fox-McCloud ed3a5252c8 Fixes Faint and Mickey Finn 2016-11-26 16:09:00 -05:00
FreeStylaLT 512fe140de Removes the black pete hat - had too much resemblance to an already-existing fluff item 2016-11-24 18:29:24 +02:00
FreeStylaLT 9e0223874e fixed conflict 2016-11-24 16:24:08 +02:00
FreeStylaLT 4108d3610c adds all the new items 2016-11-24 16:04:35 +02:00
Fox McCloudandGitHub 55fc510c92 Merge pull request #5859 from Markolie/oocthrottle 
[s]Adds OOC throttling
 2016-11-24 07:46:35 -05:00
ParadiseSS13-Bot 995941d006 Automatic changelog compile, [ci skip] 2016-11-23 17:00:08 -05:00
ParadiseSS13-Bot d15c8b6394 Automatic changelog generation for PR #5781 [ci skip] 2016-11-23 16:28:29 -05:00
Fox McCloudandGitHub e0e930b63b Merge pull request #5781 from Aurorablade/Bugzapper 
Bugzapper
 2016-11-23 16:28:28 -05:00
Fox McCloudandGitHub 86eac97aa7 Merge pull request #5902 from shazbot194/master 
fix for l6 description and paper hat sprites
 2016-11-23 16:26:07 -05:00
ParadiseSS13-Bot 95ad4cc940 Automatic changelog generation for PR #5897 [ci skip] 2016-11-23 16:22:18 -05:00
Crazy LemonandGitHub b769147449 Merge pull request #5897 from FlattestGuitar/e20 
e20 gets logged now
 2016-11-23 13:22:16 -08:00
shazbot194 0cd9a555cd Fixing my error 
It apears the code I am using is a little old and didn't have a fix fox
made.
 2016-11-23 02:31:42 -09:00
shazbot194 95f381f0f7 Smaller fix for paper 
turns out I made an error when testing, this is a proper fix for the in
hand item
 2016-11-23 00:31:14 -09:00
ParadiseSS13-Bot 3cbbce5743 Automatic changelog compile, [ci skip] 2016-11-23 01:00:11 -05:00
ParadiseSS13-Bot 134b91f55f Automatic changelog generation for PR #5903 [ci skip] 2016-11-23 00:48:26 -05:00
Crazy LemonandGitHub 77ae63652a Merge pull request #5903 from Fox-McCloud/newscaster-fix 
Fixes Super Breaking News
 2016-11-22 21:48:25 -08:00
Fox-McCloud ccf8b12fea Fixes Super Breaking News 2016-11-23 00:06:25 -05:00
shazbot194 00444598d9 fix for l6 description and paper hat sprites 
Changes the description of the L6 from 7.62 to 5.56 so it matches both
its ammo and magizine caliber.
Adds in paper_words sprites to head, and hands so when you have a paper
that is writen on, it can both be seen when holding and when wearing as
a hat.
 2016-11-22 11:16:32 -09:00
ParadiseSS13-Bot 60306d29ce Automatic changelog compile, [ci skip] 2016-11-22 01:19:01 -05:00
ParadiseSS13-Bot 15b9d3fbc1 Automatic changelog generation for PR #5900 [ci skip] 2016-11-22 00:59:32 -05:00
KasparoVyandCrazy Lemon 30a8a5feb3 Fixes Disability/Shock Stuttering, Resolves #5899 (#5900) 
* Fixes Stutteing.

The 0 argument was busting this proc because it meant that the current
value of stuttering would be the only one stuttering would ever get set
to through SetStuttering. It didn't even use the 'amount' value.

This fixes it as per the way it used to be
https://github.com/ParadiseSS13/Paradise/commit/6a7f7394a807cd8a028d5bb2a1608927c8e4474f#diff-2de2df982739a4fbdb54a4b2715d6f92L114.
 2016-11-21 21:59:31 -08:00
ParadiseSS13-Bot 08142bb855 Automatic changelog generation for PR #5827 [ci skip] 2016-11-21 19:55:14 -05:00
Crazy LemonandGitHub eb8dd0b8ff Merge pull request #5827 from Twinmold93/arcade_runtime 
Fixes Arcade Runtime From Lack of People to Remove
 2016-11-21 16:55:12 -08:00
Crazy LemonandGitHub 405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization 
Reagent Reorganization
 2016-11-21 16:54:41 -08:00
Crazy LemonandGitHub f215041315 Merge pull request #5893 from Fox-McCloud/event-cleanup 
Removes Event Procs
 2016-11-21 16:51:16 -08:00
ParadiseSS13-Bot 8f22af8232 Automatic changelog compile, [ci skip] 2016-11-20 10:03:30 -05:00
ParadiseSS13-Bot dcceed87ce Automatic changelog generation for PR #5896 [ci skip] 2016-11-20 10:01:07 -05:00
Fox McCloudandGitHub 29306b63b2 Merge pull request #5896 from KasparoVy/fix-dnase-injector 
Fixes #5894, Spawnable DNA SE Injectors (i.e. ones found in the abandoned mining crates) Now Work
 2016-11-20 10:01:06 -05:00
Mieszko Jędrzejczak 7874bba921 e20 get logged 2016-11-20 01:42:22 +01:00
KasparoVy 0b23981f1b Fix. 
The spawnable DNA Injectors containing powers (XRay, etc.) will now
activate/deactivate the powers correctly.
 2016-11-19 18:29:43 -05:00
Fox McCloudandGitHub f264b2703d Merge pull request #5886 from FlattestGuitar/cap-fluff 
Fluff item for Captain Cardgage
 2016-11-16 07:40:58 -05:00
Fox-McCloud 9ace0245cf Removes Event Procs 2016-11-16 07:14:08 -05:00
FlattestGuitar 10476052d8 removes the weird thingy 2016-11-15 14:42:56 +01:00
FlattestGuitar e224919844 Merge branch 'cap-fluff' of https://github.com/FlattestGuitar/Paradise into cap-fluff 2016-11-15 14:41:57 +01:00
FlattestGuitar c89de8fb4a Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2016-11-15 14:41:14 +01:00
ParadiseSS13-Bot ffc1393b2f Automatic changelog compile, [ci skip] 2016-11-15 00:00:09 -05:00
ParadiseSS13-Bot b4cd5384e5 Automatic changelog generation for PR #5887 [ci skip] 2016-11-14 23:30:34 -05:00
Fox McCloudandGitHub d93636261f Merge pull request #5887 from KasparoVy/computer-coil 
Tidies up Machine and Computer crafting backend, fixes #5883
 2016-11-14 23:30:33 -05:00
ParadiseSS13-Bot c6b4a2acb7 Automatic changelog compile, [ci skip] 2016-11-13 20:29:09 -05:00
ParadiseSS13-Bot b3efc79f2b Automatic changelog generation for PR #5872 [ci skip] 2016-11-13 20:27:28 -05:00
TheDZDandGitHub 220ed7b27b Merge pull request #5872 from Fox-McCloud/bsa 
BSA Tweaks
 2016-11-13 20:27:27 -05:00
TheDZDandGitHub 9807576359 Merge pull request #5875 from Fox-McCloud/vision-fix 
Fixes Simple Mobs Attacking Pods/Mechs Across Z-Levels
 2016-11-13 19:52:24 -05:00
Mieszko Jędrzejczak b25e9ca261 floofs 2016-11-14 01:42:30 +01:00
Fox McCloudandGitHub 497cbad899 Merge pull request #5788 from Markolie/randomfixes 
Fixes
 2016-11-13 19:26:02 -05:00
Fox McCloudandGitHub 922091d786 Merge pull request #5885 from Markolie/grammarfix 
Grammar fix
 2016-11-13 19:00:21 -05:00
Markolie f5c9ebc068 Grammar fix 2016-11-14 00:22:24 +01:00
KasparoVy fae398ae42 Replaces \blue and \red with spans, removes unnecessary SRCs and :s, Fixes Negative Cable Coil Bug 2016-11-13 18:16:37 -05:00