cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,564 Commits 13 Branches 2 Tags
f85e8fe55151fb1b263f3e3296a116d8a4808686
Commit Graph
31564 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
 2017-01-11 23:11:29 +01:00
ParadiseSS13-Bot 2069ea0457 Automatic changelog compile, [ci skip] 2017-01-11 17:00:09 -05:00
ParadiseSS13-Bot c697014002 Automatic changelog generation for PR #6124 [ci skip] 2017-01-11 16:37:01 -05:00
Fox McCloudandGitHub 23ee27796e Merge pull request #6124 from Markolie/mechasimple 
Add cooldown to simple_animal Mecha attacks
 2017-01-11 16:37:00 -05:00
Fox McCloudandGitHub b75614c4a2 Merge pull request #6138 from Puckaboo2/masterbackup 
Adding medical scrubs and caps to the loadout
 2017-01-11 16:36:44 -05:00
ParadiseSS13-Bot 9354c3f8c9 Automatic changelog compile, [ci skip] 2017-01-11 09:00:16 -05:00
Fox McCloudandGitHub 42545b0583 Merge pull request #6133 from Crazylemon64/fix_custom_open_borgpanels 
Custom borg panels no longer overwrite themselves
 2017-01-11 08:53:31 -05:00
ParadiseSS13-Bot dcb2e7587e Automatic changelog generation for PR #6147 [ci skip] 2017-01-11 08:53:23 -05:00
Fox McCloudandGitHub 6e1b1d282c Merge pull request #6147 from Crazylemon64/karma_reminder_fix 
Fixes karma reminder inversion
 2017-01-11 08:53:22 -05:00
ParadiseSS13-Bot ff9d6c23f5 Automatic changelog generation for PR #6129 [ci skip] 2017-01-11 08:52:38 -05:00
Fox McCloudandGitHub dce9edc6e3 Merge pull request #6129 from Crazylemon64/ghost_clearcut_respawnability 
Ghosts now have an indicator on whether they can respawn or not
 2017-01-11 08:52:37 -05:00
ParadiseSS13-Bot 9ee9fc9563 Automatic changelog generation for PR #6127 [ci skip] 2017-01-11 08:51:38 -05:00
Fox McCloudandGitHub 7618c386fe Merge pull request #6127 from Lady-Luck/laptop 
Makes office laptops traversable
 2017-01-11 08:51:37 -05:00
Fox McCloudandGitHub ca71f03f7e Merge pull request #6135 from FlattestGuitar/fluff-comp 
Adds a fluff item for ComputerlessCitizen
 2017-01-11 08:51:11 -05:00
ParadiseSS13-Bot a844f0dbef Automatic changelog generation for PR #6131 [ci skip] 2017-01-11 08:50:51 -05:00
Fox McCloudandGitHub 68dfbf6217 Merge pull request #6131 from Crazylemon64/robot_module_actions 
Robot module actions
 2017-01-11 08:50:50 -05:00
ParadiseSS13-Bot 68c0e40011 Automatic changelog generation for PR #6143 [ci skip] 2017-01-11 08:48:05 -05:00
Fox McCloudandGitHub cd82e3d48f Merge pull request #6143 from uraniummeltdown/engiboardsfix 
Atmos Consoles Fix
 2017-01-11 08:48:04 -05:00
ParadiseSS13-Bot a4eb2b23cf Automatic changelog generation for PR #6144 [ci skip] 2017-01-11 08:47:35 -05:00
Fox McCloudandGitHub 44401d384d Merge pull request #6144 from Crazylemon64/runtime_killer 
Runtime killer
 2017-01-11 08:47:34 -05:00
Crazylemon64 3699328100 Fixes karma reminder inversion 2017-01-11 02:25:06 -08:00
Crazylemon64 3e141ebbb7 Mining drones now are able to use meson sight again 
Mining drones now can activate mesons
 2017-01-10 23:37:49 -08:00
Crazy LemonandGitHub 8c4962d2ca Merge pull request #6139 from Puckaboo2/master 
Forgot to add a detail to the medical HUD
 2017-01-10 23:10:54 -08:00
uraniummeltdown c4033a85bd added category for atmos consoles 2017-01-11 09:56:16 +04:00
Crazylemon64 bfdd22dcd9 Fixes a few limb removal runtimes 2017-01-10 18:59:33 -08:00
Crazy LemonandGitHub 45c4461637 Merge pull request #6141 from Fox-McCloud/food-fix 
Fixing Food Runtime
 2017-01-10 18:48:10 -08:00
Fox-McCloud 8e355a867c Fixing Food Runtime 2017-01-10 21:40:54 -05:00
Crazylemon64 a852d3f314 Fixes a garrote runtime 2017-01-10 18:28:40 -08:00
Puckaboo2 6db251ca16 Forgot to add a detail to the medical HUD 2017-01-10 18:07:31 -07:00
ParadiseSS13-Bot 5eb2c3aa28 Automatic changelog compile, [ci skip] 2017-01-10 19:00:15 -05:00
ParadiseSS13-Bot 854c17f55b Automatic changelog generation for PR #6125 [ci skip] 2017-01-10 17:46:44 -05:00
Fox McCloudandGitHub ef3e433f07 Merge pull request #6125 from Crazylemon64/spiders_non_xeno 
Giant Spiders no longer clog up the Alien role channel
 2017-01-10 17:46:43 -05:00
ParadiseSS13-Bot 1044d20a27 Automatic changelog compile, [ci skip] 2017-01-10 17:00:16 -05:00
FlattestGuitar 0cc4080288 Merge branch 'master' into fluff-comp 2017-01-10 21:46:20 +01:00
Puckaboo2 69ac2be044 Adding medical scrubs and caps to the loadout 2017-01-10 13:30:13 -07:00
Crazy LemonandGitHub 3eafc27835 Merge pull request #6126 from Puckaboo2/master 
Finalized Medical HUD Interface Update
 2017-01-10 12:20:11 -08:00
ParadiseSS13-Bot 44cb53779b Automatic changelog generation for PR #6085 [ci skip] 2017-01-10 15:11:18 -05:00
Crazy LemonandGitHub f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
Crazy LemonandGitHub 09c0e6d646 Merge pull request #6136 from FlattestGuitar/logfix 
Fixes a silly admin logs runtime
 2017-01-10 12:08:26 -08:00
FlufflemonsterandGitHub b9cca501be Update data_huds.dm 2017-01-10 13:06:53 -07:00
ParadiseSS13-Bot 505aac36f2 Automatic changelog compile, [ci skip] 2017-01-10 15:00:20 -05:00
ParadiseSS13-Bot c5a43db914 Automatic changelog generation for PR #6087 [ci skip] 2017-01-10 14:36:01 -05:00
Fox McCloudandGitHub c8548edf07 Merge pull request #6087 from uraniummeltdown/autodrobe 
Adds more costumes to Autodrobe
 2017-01-10 14:36:00 -05:00
FlattestGuitar 81b723577e Fixes a silly admin logs runtime 2017-01-10 19:45:46 +01:00
uraniummeltdown ed3016abe6 updated flags 2017-01-10 20:43:55 +04:00
FlattestGuitar f610be5fb1 Adds a fluff item for ComputerlessCitizen 2017-01-10 14:31:27 +01:00
ParadiseSS13-Bot 77b10a9f0c Automatic changelog compile, [ci skip] 2017-01-10 05:00:16 -05:00
ParadiseSS13-Bot bae9ba7ec3 Automatic changelog generation for PR #6114 [ci skip] 2017-01-10 04:02:22 -05:00
Fox McCloudandGitHub cfc5c0a10b Merge pull request #6114 from uraniummeltdown/mimename 
Mimes can rename themselves
 2017-01-10 04:02:21 -05:00
ParadiseSS13-Bot b84edc1821 Automatic changelog compile, [ci skip] 2017-01-10 04:00:12 -05:00