cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 20:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,294 Commits 11 Branches 2 Tags
ebe28b33720ca21bc2bfdca84dcf2fbda4d748c6
Commit Graph

15223 Commits

Author SHA1 Message Date
Crazy Lemon ebe28b3372 Merge pull request #6425 from Markolie/stackprogressbars 
Progress bars now stack vertically
 2017-02-14 13:27:47 -08:00
Crazy Lemon eaa0316eed Merge pull request #6434 from Kyep/check_antags_ert 
Adds ERT to Check Antagonists
 2017-02-14 13:24:12 -08:00
Crazy Lemon 1f4b684aa0 Merge pull request #6435 from Aurorablade/MagicMushrooms 
Stunts Growth Serum
 2017-02-14 13:21:00 -08:00
Crazy Lemon 1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools 
Goonchat Admin Filters
 2017-02-14 13:09:24 -08:00
Kyep cdf35ce9da fixes merge conflict 2017-02-13 22:27:06 -08:00
Aurorablade a39a0f92d9 1.5 growht cap 2017-02-13 08:32:36 -05:00
Fox McCloud 90f034b470 Merge pull request #6097 from Kyep/terrorspiders-PR2 
Terror Spiders - Part 2
 2017-02-13 06:27:32 -05:00
Fox McCloud 300751373d Merge pull request #6280 from fludd12/Grey-Wingdings 
Wingdings Revival^2
 2017-02-13 06:26:56 -05:00
Fox McCloud 5953b527c0 Merge pull request #6398 from tigercat2000/game_pref_fix 
Fix window flashing not saving to SQL & Add error logging to log_client_to_db
 2017-02-13 06:18:20 -05:00
Fox McCloud 69eae328d3 Merge pull request #6386 from uraniummeltdown/nukedeclaration 
Custom War Declaration
 2017-02-13 06:12:31 -05:00
Fox McCloud 5ac10184a4 Merge pull request #6432 from Crazylemon64/kudzu_botany 
Kudzu growth now scales the correct way for quicker growth speed
 2017-02-13 05:44:02 -05:00
Crazy Lemon 00ed6cd1bd Merge pull request #6367 from Markolie/fixxxxx 
Fixes
 2017-02-13 00:09:46 -08:00
Kyep 3aeb37eedb Adds ERT to Check Antagonists 2017-02-12 23:55:48 -08:00
Aurorablade 6aa7905651 Growth Cap 2017-02-13 02:54:46 -05:00
Crazylemon64 24e255a496 Kudzu growth now scales the correct way for quicker growth speed 2017-02-12 20:54:30 -08:00
Kyep f8647a2108 Crazylemon spacing changes 2017-02-12 19:52:37 -08:00
Tigercat2000 577df3de36 Add debug light source/corner/overlay instance count 2017-02-12 17:30:10 -08:00
Markolie d0247fff2c Progress bars now stack vertically. Also adds a bunch of lazy list helpers. 2017-02-12 23:51:50 +01:00
uraniummeltdown 4cb4b6be82 better war dec checks, added custom war declarations from TG 2017-02-12 20:30:17 +04:00
Kyep be1ae665dd Adds JMP link 2017-02-12 01:23:30 -08:00
Kyep 952c64b1f8 Improves singularity failure notice 2017-02-11 23:08:02 -08:00
Crazylemon64 6718d49af9 Fixes client varedit 2017-02-11 13:40:45 -08:00
Markolie 900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
Tigercat2000 f427d4315f Fix window flashing not saving to SQL & Add error logging to 
log_client_to_db
 2017-02-11 07:15:04 -08:00
uraniummeltdown 3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
Kyep 9f20cb1685 Fixes merge conflict in event_container 2017-02-10 22:07:05 -08:00
Fox McCloud 04f5276047 Merge pull request #6350 from Markolie/lavaland_updates 
Add remaining Lavaland loot, kinetic accelerator refactor
 2017-02-11 00:02:42 -05:00
Markolie c6559c7d9e Fix to_chat 2017-02-11 05:13:28 +01:00
Crazy Lemon cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights 
Goonlights
 2017-02-10 19:21:20 -08:00
Crazy Lemon 17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind 
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
 2017-02-10 18:27:58 -08:00
Crazy Lemon 69b70fbab8 Merge pull request #6374 from Fox-McCloud/drying-rack-fix 
Drying Rack Toggling Uses NanoUI and Other Fixes
 2017-02-10 18:09:27 -08:00
Crazy Lemon c63d8008e2 Merge pull request #6233 from uraniummeltdown/events 
Tweaks Events
 2017-02-10 17:37:50 -08:00
Markolie fb6fee615e Fix detective bag not always showing an item 2017-02-10 21:17:32 +01:00
Markolie b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie c14b560ee0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-10 18:21:06 +01:00
Markolie c93a592102 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	code/modules/shuttle/supply.dm
 2017-02-10 18:19:53 +01:00
CoreyLee Hassell 88f006432b Fixed reagents in destroying angels 
Had listed amantin twice in the reagent_add function for destroying angel. Combined to 0.3
 2017-02-10 11:14:04 -05:00
uraniummeltdown a8aef39625 enabled slaughter demon event 2017-02-10 17:32:11 +04:00
Fox McCloud 795fda7874 Merge pull request #6366 from uraniummeltdown/quantumpads 
Quantum Pads
 2017-02-10 07:28:27 -05:00
Markolie 403b512c9b Merge if conditions 2017-02-09 23:29:10 +01:00
Markolie 0824101f0a Sanity checking for faction copy 2017-02-09 18:57:09 +01:00
Markolie 95f750d6f2 Add faction support to pAI's 2017-02-09 18:54:26 +01:00
Fox-McCloud c34b0abfac Drying Rack Toggling Uses NanoUI and Other Fixes 2017-02-09 06:59:05 -05:00
Markolie d7f8f68ff8 Fix posibrain whispering while muted 2017-02-08 22:12:59 +01:00
uraniummeltdown 60bb4fd5bc ported quantum pads from TG and added to RnD 2017-02-09 00:33:07 +04:00
Markolie 924e539f22 Chassis mods now rename KA, remove cost from chassis mods/tracer mods 2017-02-08 19:27:16 +01:00
Markolie 3298f7edce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	icons/obj/objects.dmi
 2017-02-08 19:25:47 +01:00
Markolie 7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-08 19:21:57 +01:00
Fox McCloud b35eb8e96f Merge pull request #6086 from tigercat2000/shuttle_hijack 
Hijacking a shuttle diverts it to the syndicate outpost
 2017-02-08 10:05:34 -05:00
Fox-McCloud efb49ef18e Reagent Grinder Hotfix 2017-02-08 03:19:50 -05:00