cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,688 Commits 26 Branches 2 Tags
7b2cc1e12bf9d86c45652dffbb4e2c0eee6fdd39
Commit Graph

20458 Commits

Author SHA1 Message Date
Fox McCloud
7b2cc1e12b Merge pull request #11808 from Couls/fat-mice 
Mice now have a chance of chewing through wires
 2019-08-22 19:21:47 -04:00
variableundefined
07e9cf10a3 Merge pull request #12024 from Fox-McCloud/crusher-trophies 
Ports Crusher Trophies
 2019-08-22 18:55:54 -04:00
variableundefined
5046c8649d Merge pull request #12033 from Fox-McCloud/fultons 
Ports TG's Fultons
 2019-08-22 18:07:56 -04:00
Fox McCloud
39d0b0b3f5 Merge remote-tracking branch 'upstream/master' into crusher-trophies 2019-08-22 16:28:06 -04:00
variableundefined
806c00ba68 Merge pull request #12039 from Fox-McCloud/more-lavaland-updates 
More Lavaland Updates: Primal and Bayonets
 2019-08-21 22:38:25 -04:00
variableundefined
aba2f20d2a Merge pull request #12043 from Fox-McCloud/survival-pen-tweak 
Tweaks/Buffs Survival Pen
 2019-08-21 21:54:59 -04:00
Fox McCloud
dc6fa07731 Merge pull request #11924 from TDSSS/larva-growth-boost 
gives event-spawned xeno larva  a growth boost
 2019-08-21 02:03:51 -04:00
Fox McCloud
bb0fcaa73f Merge pull request #11986 from Aurorablade/honk 
Upgrades Honktumor, Adds Honkbladder
 2019-08-21 01:51:23 -04:00
Fox McCloud
e4ca25be3d Merge pull request #11998 from Tayyyyyyy/pm_window_links 
Add links to ping and open conversation in window for PMs
 2019-08-21 01:49:03 -04:00
Fox McCloud
c6372ec138 Merge pull request #12044 from DoctorDrugs/Colossus-vocal-cords-fix 
Removes the ability to consume the divine vocal cords
 2019-08-20 21:12:31 -04:00
DoctorDrugs
e293f5b012 Removes the ability to consume the divine vocal cords 2019-08-20 16:23:53 -04:00
Fox McCloud
52f263ba01 Tweaks/Buffs Survival Pen 2019-08-20 15:02:15 -04:00
Tayyyyyyy
4fa093fb2c Improve shuttle parallax stopping 2019-08-19 21:29:13 -07:00
Fox McCloud
c805cda038 Merge pull request #11615 from Tayyyyyyy/aa/parallax-no-sql 
Parallax
 2019-08-19 21:13:33 -04:00
Tayyyyyyy
c73f0aafd2 Shuttle parallax! 2019-08-19 18:01:45 -07:00
Fox McCloud
3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Fox McCloud
01a68b8895 Ports TG's Fultons 2019-08-18 18:22:07 -04:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update 
Major Lavaland Update
 2019-08-16 22:22:49 -06:00
Fox McCloud
e2f7f6f055 science radio 2019-08-16 23:58:27 -04:00
variableundefined
11e9ecadbf Merge pull request #11894 from TheSardele/blender 
Makes All-In-One Grinders constructable
 2019-08-16 20:41:18 +08:00
variableundefined
adc33ef3a0 Merge pull request #11783 from Couls/on-hit-effects 
[READY] Add on-hit effects for lasers and bullet holes for walls from TG
 2019-08-16 07:50:49 +08:00
variableundefined
34bb102a37 Merge pull request #11767 from Arkatos1/pillbottle 
New Medical Directive - Colored Pillbottles!
 2019-08-15 11:17:46 +08:00
variableundefined
a5e94c6e72 Merge pull request #11776 from Arkatos1/SlimeHUD 
SlimeHUD
 2019-08-15 10:37:12 +08:00
Fox McCloud
5d9fc8e9ea Merge pull request #11985 from Tayyyyyyy/admin_pencode 
Add admin pencode: style, class, and img
 2019-08-14 22:22:34 -04:00
AffectedArc07
bdc4bba6ac Add back parallax SQL changes 2019-08-14 17:53:15 -07:00
Couls
3b35952ff1 mice no longer whisper to the cables before chewing them 2019-08-14 20:17:18 -04:00
Fox McCloud
b3423eac2f Merge pull request #11984 from Markolie/ruinsport 
Netherworld portal fix and butler pick time increase
 2019-08-14 20:02:29 -04:00
Fox McCloud
a0203a60ac Merge pull request #11965 from TDSSS/talisman-icons 
Give cult talisman different icons
 2019-08-14 19:48:54 -04:00
variableundefined
353f0e0b3b Merge pull request #11844 from JKnutson101/cyborgSuccumbBranch 
Gave Cyborgs with 0 battery left the ability to succumb.
 2019-08-14 23:25:16 +08:00
variableundefined
3f990b50ea Merge pull request #11980 from TheSardele/drunk-sleep 
Fixes sleeping drunk making you more drunk
 2019-08-14 14:22:30 +08:00
tayyyyyyy
760009a0cb Fix style 2019-08-13 16:32:31 -07:00
tayyyyyyy
77731d87d2 Fix setting high parallax setting insane instead 2019-08-13 16:32:31 -07:00
AffectedArc07
03af0be168 Ghost parallax 2019-08-13 16:32:31 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
Tayyyyyyy
534a4ce3b9 Add links to ping and open conversation in window for PMs 2019-08-12 23:31:23 -07:00
Tayyyyyyy
f17798d95b FIx more garbled quotes 2019-08-12 22:08:08 -07:00
variableundefined
9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses 
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
 2019-08-13 12:06:39 +08:00
variableundefined
80921a3ba4 Merge pull request #11807 from Tayyyyyyy/ert_tweaks 
Randomized ERT priority + drag and drop role selection
 2019-08-13 08:43:22 +08:00
AzuleUtama
27ff82eb03 adds the truth 2019-08-12 18:41:33 +01:00
variableundefined
bbaf765279 Merge pull request #11949 from florkeger/hierophant-layer-fix 
Hierophant layer fix
 2019-08-13 00:50:05 +08:00
Tayyyyyyy
48c002b361 Add admin pencode: style, class, and img 2019-08-12 09:47:59 -07:00
variableundefined
0bb1ba6eae Merge pull request #11830 from Emanthealmighty/AIchange 
AI can now change its intent
 2019-08-12 23:08:58 +08:00
Arkatos1
cedec38e9b Merge https://github.com/ParadiseSS13/Paradise into SlimeHUD 2019-08-12 16:38:33 +02:00
Arkatos1
bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefined
c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker 
Panic Bunker
 2019-08-12 19:34:19 +08:00
variableundefined
f6505a6fd5 Merge pull request #11819 from Kyep/medals 
Department Medals
 2019-08-12 17:52:22 +08:00
variableundefined
635db54625 Merge pull request #11730 from farie82/afk-list 
Adds a list AFK players verb for admins
 2019-08-12 17:48:33 +08:00
variableundefined
0b469ce563 Merge pull request #11577 from farie82/mhelp-take 
Ticket take now asks for a confirmation if it's already assigned + ticket/PM code refactor
 2019-08-12 17:44:26 +08:00
variableundefined
98b821c120 Merge pull request #11637 from datlo/lavalandgolemsintospace 
Move free golems to lavaland, let them move shuttle still
 2019-08-12 17:42:40 +08:00