cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,962 Commits 14 Branches 2 Tags
72aec0f9f1f85d368db8dff4a868be25ab5a7a2b
Commit Graph
31962 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markolie 72aec0f9f1 Add shared storage and godeye items, split Lavaland loot files 2017-02-06 01:02:03 +01:00
Markolie b17dca7c57 Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command 2017-02-05 20:36:04 +01:00
ParadiseSS13-Bot 9127d07b4e Automatic changelog compile, [ci skip] 2017-02-05 05:40:10 -05:00
ParadiseSS13-Bot 40f0cd356f Automatic changelog generation for PR #6236 [ci skip] 2017-02-05 05:38:56 -05:00
Crazy LemonandGitHub c4f0790ddb Merge pull request #6236 from Fox-McCloud/botany-rework 
Botany rework
 2017-02-05 02:38:54 -08:00
Fox-McCloud 390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
ParadiseSS13-Bot 641e25eb9f Automatic changelog compile, [ci skip] 2017-02-05 03:47:01 -05:00
ParadiseSS13-Bot b3529c03d4 Automatic changelog generation for PR #6081 [ci skip] 2017-02-05 03:27:41 -05:00
Crazy LemonandGitHub 01c41cfb86 Merge pull request #6081 from Markolie/lavaland_megafauna 
Ports Lavaland megafauna
 2017-02-05 00:27:40 -08:00
Fox-McCloud 99cbcbfbf5 pre-emptive cut-down of conflicts. 2017-02-05 03:18:49 -05:00
ParadiseSS13-Bot 8a639facee Automatic changelog compile, [ci skip] 2017-02-05 01:00:12 -05:00
ParadiseSS13-Bot 7f2c8ead43 Automatic changelog generation for PR #6332 [ci skip] 2017-02-05 00:47:33 -05:00
Fox McCloudandGitHub baab43b840 Merge pull request #6332 from uraniummeltdown/cargoid 
Cargonia ID skin for agent ID and ID Computer
 2017-02-05 00:47:32 -05:00
ParadiseSS13-Bot 16ecb4f0f4 Automatic changelog generation for PR #6325 [ci skip] 2017-02-05 00:22:07 -05:00
Fox McCloudandGitHub bf38e4a719 Merge pull request #6325 from Aurorablade/Unholywater 
Unholy water fix
 2017-02-05 00:22:04 -05:00
uraniummeltdown 7dd342743a added cargo ID skin to agent ID and ID Computer 2017-02-05 09:19:52 +04:00
Fox-McCloud ccd9d9596d fungus among us 2017-02-04 05:01:03 -05:00
Fox-McCloud f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05:00
Aurorablade 1943f059c5 Requested changes 2017-02-03 23:41:04 -05:00
ParadiseSS13-Bot 632deebae3 Automatic changelog compile, [ci skip] 2017-02-03 22:00:10 -05:00
ParadiseSS13-Bot 658d644c6d Automatic changelog generation for PR #6315 [ci skip] 2017-02-03 21:33:25 -05:00
Fox McCloudandGitHub 917fb17e16 Merge pull request #6315 from DrunkDwarf/mrchangs-tweak 
Tweak: Mr Chang's vending machine now refillable
 2017-02-03 21:33:23 -05:00
Aurorablade 391976f7ed I thought i deleted you.... 2017-02-03 17:14:44 -05:00
Aurorablade 37573a4339 Bugfix 2017-02-03 17:05:37 -05:00
Mark van AlphenandGitHub fe62b212b4 Merge branch 'master' into lavaland_megafauna 2017-02-02 20:17:31 +01:00
ParadiseSS13-Bot d3d1718c39 Automatic changelog compile, [ci skip] 2017-02-02 12:00:12 -05:00
ParadiseSS13-Bot 1c5ec39be1 Automatic changelog generation for PR #6301 [ci skip] 2017-02-02 11:07:55 -05:00
Fox McCloudandGitHub c7bb9fd91a Merge pull request #6301 from Alexshreds/bugaroo 
Deconstructing Closets Yields Proper Amount of Metal
 2017-02-02 11:07:54 -05:00
Brian McGillivray 23139987a0 Tweak: Mr Chang's vending machine now refillable 
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
 2017-02-02 15:49:27 +00:00
ParadiseSS13-Bot 193893d4cb Automatic changelog compile, [ci skip] 2017-02-02 01:00:10 -05:00
ParadiseSS13-Bot bb82149373 Automatic changelog generation for PR #6177 [ci skip] 2017-02-02 00:50:35 -05:00
Fox McCloudandGitHub 3d587dea5b Merge pull request #6177 from uraniummeltdown/new 
Cyborg Blueprints
 2017-02-02 00:50:33 -05:00
ParadiseSS13-Bot 6e7166c8b3 Automatic changelog generation for PR #6284 [ci skip] 2017-02-02 00:49:50 -05:00
Fox McCloudandGitHub 29d73519fc Merge pull request #6284 from Kyep/summon_protect 
Adds check to narsie/eldergod summoning, as slaughter summoning already has
 2017-02-02 00:49:49 -05:00
Fox-McCloud ed4ae3dd8f irrigation and missing sprites 2017-02-02 00:32:52 -05:00
Chakirski f39fe8ab75 muh future 2017-02-01 21:29:04 -06:00
Fox McCloudandGitHub 79440f9ca7 Merge pull request #6298 from Draconic-saint/BugSiev2 
Updates the icon for the firecult god
 2017-02-01 22:02:55 -05:00
Fox McCloudandGitHub cd4acc5db8 Merge pull request #6307 from Markolie/fixxxxx 
Fix security record time and mecha attackby cooldown
 2017-02-01 21:58:32 -05:00
Markolie 1a44f3b3d4 Add attack animation to mecha attackby 2017-02-01 18:47:10 +01:00
Markolie d83c28fb54 Removes year from security computer 2017-02-01 18:44:21 +01:00
Markolie 2716083dc3 Fix security record time and mecha attackby cooldown 2017-02-01 18:39:36 +01:00
Chakirski 812c2db2fe closets 2017-01-31 19:14:31 -06:00
Markolie ac93cbd4f0 Forgot to commit sounds 2017-01-31 17:51:50 +01:00
Markolie b55394ace3 Fix resource identifiers 2017-01-31 17:45:46 +01:00
Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
uraniummeltdown 7259e4ce07 blueprints for engiborgs 2017-01-31 19:22:29 +04:00
Joris bb43c5a5b0 Updates the icon for the firecult god 2017-01-31 15:50:15 +01:00
ParadiseSS13-Bot 50117386c3 Automatic changelog compile, [ci skip] 2017-01-31 02:00:14 -05:00
Kyep ce2a75f9da Deletes copypaste, including already-existing copypaste 2017-01-30 22:50:40 -08:00
Fox-McCloud 0415e5ab3a consistency 2017-01-31 01:39:38 -05:00