cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,665 Commits 5 Branches 0 Tags
274ac1d59c202eb0a9c88b9fb16f109b18bd5ba4
Commit Graph

7409 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Chinsky
45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +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
Asanadas
f4193383c8 Compile fix 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-16 21:26:36 -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
Chinsky
da147b083c Added Forensics Technician jackets to Detective wardrobe. 2012-10-17 03:28:59 +04:00
Chinsky
0c97d77d77 Fixes issue with slurring never going away. 
Ethylredoxrazine now properly fights alcohol effects.
 2012-10-17 03:28:10 +04:00
Chinsky
fbc26fde61 Fixed Arrivals runtime. Does not fix issue of it not announcing arrival though. 2012-10-17 03:24:39 +04:00
Chinsky
a4142fa098 Throwing metal (with non-zero m_amt) items will make electrified doors and grilles spark. 2012-10-17 00:09:49 +04:00
cib
848355292a Fixed bug with RP rev where anyone could become head rev, even non-revs. 2012-10-16 19:36:39 +02:00
cib
14805c3bf2 Added RP revolution. 2012-10-16 19:28:54 +02:00
Chinsky
81960d42c9 Igniter assembly now sparks when it sparks. 
Added visual effect when it's triggered.
 2012-10-16 21:14:51 +04:00
cib
7fccadfc89 Ported AutoTraitor. 2012-10-16 18:44:53 +02:00
Mloc
a9e43389e6 Merge pull request #1773 from pobiega/master 
Bandaging already bandaged wounds. Fixes issue #1772
 2012-10-16 01:48:04 -07:00
Pobiega
8991f73efc Fixes issue #1772, bandaging already bandaged wounds. 2012-10-16 10:35:13 +02:00
DarkTechnomancer
981481ca56 Fixed nutrition-related messages showing up twice in the examine verb and ported pulling damage back in. 2012-10-16 00:10:40 -04:00
headswe
f296f9c3c8 Merge pull request #1761 from caelaislinn/bs12_with_tgport 
misc merge things
 2012-10-15 10:59:58 -07:00
headswe
3e94d7a682 Merge pull request #1768 from CIB/master 
Bleeding fixes
 2012-10-15 10:59:27 -07:00
headswe
931cf50bdc Merge pull request #1769 from comma/master 
Reagent code cleanup and slur
 2012-10-15 10:58:47 -07:00
cib
874d2c1519 Health analyzer now shows if an organ is bleeding. 2012-10-15 19:54:17 +02:00
cib
8f2055080d Increased blood pack volume and IV injection rate. 2012-10-15 19:48:20 +02:00
cib
21d0619cf5 Blood packs now are faster on the IV than other chemicals. 2012-10-15 19:23:57 +02:00
cib
150d7e51b5 Added some medical stuff to the map. 
Also added blood packs.
 2012-10-15 19:17:38 +02:00
Chinsky
468752ea6d Ported BS12 slur. 
Sorta. Can't use html in said strings, so it will look a bit different.
 2012-10-15 20:14:34 +04:00
Chinsky
514989394f Cleaned up food and drinks code. 
God bless OOP.
 2012-10-15 20:13:35 +04:00
cib
a577c0bfac Fixed a few bugs with IV drips. 2012-10-15 18:01:31 +02:00
cib
82dca5a4a0 Added an IV drip machinery. 2012-10-15 17:19:43 +02:00
cib
6ca73039fb Wounds now bleed only until a certain stage. 2012-10-15 15:27:10 +02:00
cib
19846abebe Halved bleeding speed. 2012-10-15 15:13:49 +02:00
cib
8b630d9b49 Merge github.com:Baystation12/Baystation12 2012-10-15 15:06:21 +02:00