cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,678 Commits 12 Branches 0 Tags
f6bcb421d4d0010555a2423bd2d2d05d63fd08e2
Commit Graph
9678 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chinsky f6bcb421d4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 21:35:13 +04:00
Chinsky 7fb7e13ba5 Forgot to click fuel code in. 2012-10-18 21:29:10 +04:00
Chinsky 5f7c9d5518 Readded welder fuel. 
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
 2012-10-18 21:25:24 +04:00
Mloc af8ab15ebf Merge pull request #1795 from CIB/master 
Various fixes
 2012-10-18 10:18:03 -07:00
Chinsky 7f9132e23a Fixes a runtime. 2012-10-18 20:58:35 +04:00
cib ed6994d17c Removed the silly adminhelp delay. 2012-10-18 16:33:14 +02:00
cib b0aee942a7 You can now exame an IV drip to get the loaded chemicals and attached person. 2012-10-18 16:08:43 +02:00
cib 01ba3871ca Fixed the bug where 'Show Own Skills' wouldn't work. 2012-10-18 15:33:46 +02:00
cib e103cc799e Fixes a runtime. 2012-10-18 15:22:54 +02:00
headswe 3212575711 Merge pull request #1794 from comma/master 
Welder tanks are back in business.
 2012-10-18 06:02:31 -07:00
headswe a993f3242c Merge pull request #1793 from CIB/master 
Internal Bleeding Surgery
 2012-10-18 06:01:55 -07:00
Chinsky 509dd0f070 Updated changelog 2012-10-18 16:00:06 +04:00
Chinsky 274ac1d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-18 15:42:11 +04:00
Chinsky 16e6f178a4 Buffed fuel tank explosions. 2012-10-18 15:40:55 +04:00
cib fafe46e197 Added internal wound surgery. 2012-10-18 13:32:45 +02:00
Chinsky a4103cee8f replaced red evac overlays for halways. 
No more RAVE PARTY.
 2012-10-18 15:10:50 +04:00
Mloc 425efc6c93 Merge pull request #1792 from CIB/master 
Appendix related stuff
 2012-10-18 03:46:41 -07:00
cib d90944ad50 Several medical related changes. 
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
 2012-10-18 12:39:04 +02:00
Mloc 75c1d41f6c Merge pull request #1791 from zartco/master 
Engineering Layout Changes
 2012-10-18 02:07:21 -07:00
headswe 3c70b92929 Merge pull request #1785 from comma/master 
Sparks and some fixes.
 2012-10-17 23:31:54 -07:00
Chinsky 886119787d Arrivals computer fixed forever. 2012-10-18 10:09:39 +04:00
Chinsky c8b7227329 Mixup in forensics jacket path 2012-10-18 10:09:14 +04:00
Chinsky 92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html
 2012-10-18 09:13:24 +04:00
zartco 6da1e841a1 Remodels Engineering Break Room, spreads suits out over engineering and adds magboots, adds an airlock separating engineering storage from the engine room. 2012-10-17 22:06:55 -05:00
Hawk-v3 28f417ce01 Merge pull request #1790 from Asanadas/master 
Bugfix: Infinite BoH in BoH, Soghun Stutter Removal
 2012-10-17 19:31:02 -07:00
Asanadas 0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
headswe fde9562bb5 Merge pull request #1789 from CIB/master 
Limb selection
 2012-10-17 11:28:48 -07:00
cib 3a29915efe Updated changelog. 2012-10-17 20:17:04 +02:00
cib a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00
headswe 58a63cd61f Merge pull request #1788 from headswe/master 
Whoops forgot a thing also reenabled a warning message but with a add…
 2012-10-17 10:02:31 -07:00
Head 59964d4025 Whoops forgot a thing also reenabled a warning message but with a added check 2012-10-17 19:00:20 +02:00
cib 463178213c You can now pick opposite gender hairstyles. 2012-10-17 18:53:00 +02:00
Mloc a5366e8647 Merge pull request #1787 from headswe/master 
Fixed iv drips hopefully
 2012-10-17 09:31:41 -07:00
Head ea714643b6 Hopefull fixed iv drip bug. 2012-10-17 18:27:44 +02:00
headswe 79c4587145 Merge pull request #1786 from Mloc/master 
Nerfed volatile fuel, fixed arrival runtime.
 2012-10-17 09:00:45 -07:00
Mloc 3845ed96d9 Nerfed volatile fuel. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-10-17 16:55:13 +01:00
Mloc 351a233f5f Arrivals runtime fix, thanks to Head! 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-10-17 16:07:19 +01:00
Chinsky 44934ef622 Removed my highly informative and professional debug print. 2012-10-17 14:33:53 +04:00
headswe c26f7d2d05 Merge pull request #1783 from pobiega/master 
Fixes typo in cleanbots writing out the word 'panel' twice.
 2012-10-17 03:28:26 -07:00
Chinsky 45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +04:00
Chinsky cd72d4d312 Updated changelog. 2012-10-17 14:09:06 +04:00
Chinsky 357f42028e Forgot one hairstyle. 2012-10-17 13:50:47 +04:00
Pobiega 49fbe5f312 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 07:42:30 +02:00
Pobiega 917e31cfff Fixed cleanbots stating panel panel instead of panel. 2012-10-17 07:41:17 +02:00
Hawk-v3 bdca17ada6 Merge pull request #1781 from Asanadas/master 
Misc: Remove BoH Singularity, Remove adminlog damage spam
 2012-10-16 19:09:34 -07:00
Asanadas f4193383c8 Compile fix 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-16 21:26:36 -04:00
Asanadas adff0d3991 adding me to a .txt 2012-10-16 20:55:29 -04:00
Asanadas e2abd0a9b8 Commented out BoH on BoH Singulos. 2012-10-16 20:52:28 -04:00
Asanadas d6d1380b53 What is this thing? Why do we need it? Why does it spam so much? 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-16 20:51:04 -04:00
Chinsky f0c4e3e965 Ported some of hairstyles. 2012-10-17 04:50:49 +04:00