cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,267 Commits 26 Branches 2 Tags
0d627d321393670d0406d49b4e3d66ce8c4bcadc
Commit Graph

28267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fox McCloud
0d627d3213 Merge pull request #4629 from DaveTheHeadcrab/chaplain_stuff 
Prayer Bead Fix
 2016-06-09 23:49:21 -04:00
SamCroswell
3664fe6b7f Quick Fix 2016-06-09 21:52:44 -04:00
ParadiseSS13-Bot
1f02da25a0 Automatic changelog generation for PR #4625 2016-06-09 03:50:50 -04:00
Fox McCloud
7f099b4b75 Merge pull request #4625 from Krausus/PoliceTapeBumpFix 
Fixes Tape Moving Mobs Recklessly
 2016-06-09 03:50:46 -04:00
Krausus
3c7ab29e2e Fixes police tape moving mobs recklessly 2016-06-09 01:01:03 -04:00
Fox McCloud
e2f4d53b43 Merge pull request #4603 from DaveTheHeadcrab/chaplain_stuff 
Adds Alternate Chaplain Item - Prayer Beads
 2016-06-09 00:46:07 -04:00
SamCroswell
18260bff66 Prayer Beads - Merge Conflict Fix (For real this time) 2016-06-08 23:32:18 -04:00
SamCroswell
70812226d1 Prayer Beads - Merge Conflicts Fix 2016-06-08 23:29:38 -04:00
ParadiseSS13-Bot
cd5322a4e3 Automatic changelog generation for PR #4515 2016-06-08 22:49:12 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again 
Major Gun Refactor
 2016-06-08 22:49:10 -04:00
TheDZD
c6b4539548 Finishing touches 2016-06-08 15:11:24 -04:00
ParadiseSS13-Bot
2987f6090c Automatic changelog generation for PR #4613 2016-06-08 11:15:21 -04:00
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss 
Experimentor Duplication Limit
 2016-06-08 11:15:18 -04:00
SamCroswell
509752f678 Spelling Fix 2016-06-07 21:59:35 -04:00
ParadiseSS13-Bot
b991cd8bc7 Automatic changelog generation for PR #4558 2016-06-07 09:31:04 -04:00
Fox McCloud
3594337638 Merge pull request #4558 from monster860/cluwne_voice 
Adds comical implants
 2016-06-07 09:31:02 -04:00
TheDZD
fc22b855ef Merge pull request #4615 from Krausus/DBConnSpamFix 
Fixes Excessive Database Reconnections
 2016-06-07 09:00:03 -04:00
Krausus
c5fc47eca4 Fixes repeated database reconnections 
setup_database_connection resets the database connection each time it's
called, and was being called for each new client
 2016-06-07 05:05:02 -04:00
Fox McCloud
9cecbb5dde Merge pull request #4612 from LittleBigKid2000/Fluff 
MrBarrelrolll Fluff Item
 2016-06-07 02:51:03 -04:00
Fox-McCloud
bb02bfa284 Experimentor Duplication Limit 2016-06-07 02:25:06 -04:00
Isaac Erwin
eca41351cd MrBarrelrolll Fluff Item 
Adds in a fluff item for MrBarrelrolll, the Viridi Protegat. It's
functionally identical to the roman armor.
 2016-06-07 00:16:00 -04:00
ParadiseSS13-Bot
6aaccbccbd Automatic changelog generation for PR #4597 2016-06-06 22:10:28 -04:00
TheDZD
a7d0cfd09c Merge pull request #4597 from Fox-McCloud/progress-fixes 
Fixes Construction Progress Bars
 2016-06-06 22:10:25 -04:00
ParadiseSS13-Bot
456ae8f41d Automatic changelog generation for PR #4605 2016-06-06 22:10:16 -04:00
TheDZD
50d801ad1e Merge pull request #4605 from Fox-McCloud/experimentation 
Fixes Experimentor Cold Critical Reaction
 2016-06-06 22:10:14 -04:00
Fox McCloud
cad0d7ba3a Merge pull request #4607 from monster860/rnd_fix 
Fix some origin_tech s
 2016-06-06 07:17:54 -04:00
monster860
14a6a575a9 Fix some origin_tech's 2016-06-06 05:47:10 -04:00
ParadiseSS13-Bot
2c0cc805ee Automatic changelog generation for PR #4593 2016-06-05 22:27:17 -04:00
Fox McCloud
674a5d681f Merge pull request #4593 from pinatacolada/soap 
command soap books
 2016-06-05 22:27:16 -04:00
Fox-McCloud
56b4eb72bf Fixes Experimentor Cold Critical Reaction 2016-06-05 22:24:24 -04:00
TheDZD
11aab7aeff Merge pull request #4602 from Tastyfish/nano-fix 
Smooth nano fixes
 2016-06-05 20:46:47 -04:00
TheDZD
2681af396f Merge pull request #4601 from monster860/tcomms_crash 
Removes ability of bus to talk to another bus, thus fixing a server crash bug.
 2016-06-05 20:42:57 -04:00
Tastyfish
5499e15ca9 Made chem dispenser's total volume sharply change again 2016-06-05 18:22:55 -04:00
SamCroswell
106743163e Prayer Beads - Fixes 
The wait time is now appropriate.
Ensures you can only do one prayer at a time.
Changes messages to reflect if you're praying for yourself.
 2016-06-05 17:31:02 -04:00
SamCroswell
04c7c4f843 Prayer Beads - Adds Item 2016-06-05 17:07:40 -04:00
Tastyfish
5a6cf095aa Fixes smooth nano(tm) for windows 7- users 2016-06-05 16:09:38 -04:00
monster860
f306e6fb98 Removes ability of bus to talk to another bus. 2016-06-05 13:56:08 -04:00
Fox-McCloud
5db40a08c7 Fixes Construction Progress Bars 2016-06-04 23:12:23 -04:00
ParadiseSS13-Bot
5426418427 Automatic changelog generation for PR #4573 2016-06-04 21:19:45 -04:00
TheDZD
e7aa12e339 Merge pull request #4573 from Fox-McCloud/mocha 
Adds in Cafe Mocha
 2016-06-04 21:19:43 -04:00
ParadiseSS13-Bot
4df0bca5c3 Automatic changelog generation for PR #4576 2016-06-04 21:10:32 -04:00
Fox McCloud
c342d22f8b Merge pull request #4576 from Twinmold93/narsie-ai 
Adds Nar-Sie Hologram and Backup Error Screen to AI
 2016-06-04 21:10:29 -04:00
pinatacolada
4dfbd113bc command soap books 
just adds one to the blueshield's, nt rep's, IAA, captain's, and HoP's
offices. das all

🆑 pinatacolada
rscadd:Adds Command SOP books
/🆑
 2016-06-04 15:49:49 +01:00
ParadiseSS13-Bot
0c3d0c31dc Automatic changelog generation for PR #4574 2016-06-04 00:55:51 -04:00
Fox McCloud
ba746fe938 Merge pull request #4574 from KasparoVy/Updated-IPC-Ass 
Adds the Legit IPC-Butt QR Code Sprite
 2016-06-04 00:55:48 -04:00
ParadiseSS13-Bot
757caf2dbd Automatic changelog generation for PR #4591 2016-06-04 00:53:35 -04:00
TheDZD
43aa200724 Merge pull request #4591 from Fox-McCloud/fixes-laser-armor 
Fixes Laser Armor
 2016-06-04 00:53:33 -04:00
Fox-McCloud
39509e54af Fixes Laser Armor 2016-06-04 00:50:18 -04:00
TheDZD
4339629cac Removes L6 SAW adminbus ammo and fixes icon update issue with energy weapons 2016-06-04 00:49:01 -04:00
TheDZD
8b8dd41d36 Fixes 2016-06-03 23:41:54 -04:00