cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,326 Commits 6 Branches 0 Tags
21e00aa5dc4b2932dce1a305bc48ddb2b3f99be2
Commit Graph

7932 Commits

Author SHA1 Message Date
Cael_Aislinn
21e00aa5dc some tweaks 2012-12-05 04:55:50 +10:00
Cael_Aislinn
defcbdc0ac Merge branch 'test_branch' into work_in_progress 2012-12-05 04:48:10 +10:00
Cael_Aislinn
bc3b0757fc added functional bunsen burner (with placeholder sprite), added capability for heated chem recipes, added preservation of data across chemical reactions for xenoarch (not sure if it actually works, seemed a bit buggy), added tungsten as a dispensable reagent for xenoarch 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-05 04:47:48 +10:00
Cael_Aislinn
3257a529ba fixed up the core sampler + gave it a placeholder sprite, made geo data actually persist across turfs and ores, cleaned up some new xenoarch stuff 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-05 04:44:42 +10:00
Cael_Aislinn
c173b0fcc3 Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into work_in_progress 2012-12-04 18:20:19 +10:00
Cael_Aislinn
1a998e804d cleaned up and commented airflow code, fixed a bug in airflow where items airflow'd items could move other things around, removed myself from admins (it is such a dreadful bother to have to re-add myself all the time, I don't know how anyone could stand it) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-04 18:18:38 +10:00
Cael_Aislinn
f7d41058ed Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into features 2012-12-03 18:56:16 +10:00
Cael_Aislinn
39f07d50bf Merge https://github.com/Baystation12/Baystation12 into features 2012-12-03 18:54:21 +10:00
Cael_Aislinn
cc2771d4d5 thrown facehuggers only have a 25% chance of hitting now, and they have a chance to miss when leaping normally 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:58:58 +10:00
Cael_Aislinn
ee04fd9f1e significantly reduced alien disarm-stun time (from 10-15 seconds to 0.5-3 seconds), reduced stun chance, added a 25% chance to stun the alien, reduced alien heal rate on weeds from 5 to 1 (they still heal toxin damage at a rate of 5) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:54:29 +10:00
Cael_Aislinn
d09d7bf313 changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:50:57 +10:00
Cael_Aislinn
6d1ea0548d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress 
Conflicts:
	code/modules/customitems/item_defines.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:08:47 +10:00
Cael_Aislinn
d55170ab97 fixed an extra line added 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 01:04:14 +10:00
Chinsky
66d0f554f6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-12-02 00:14:03 +04:00
Chinsky
0a9b6f6bbe Removed armor suit from Captain's spawn gear 2012-12-02 00:03:30 +04:00
Chinsky
0b614a488c Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle. 2012-12-02 00:02:43 +04:00
Chinsky
ab440fbf7d Fixed compile error in custom items. 
Made rigs protect against radiation again.
 2012-12-01 18:35:27 +04:00
Cael_Aislinn
3b6c00eae5 made space ninja a toggleable client option 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:07:18 +10:00
Cael_Aislinn
c8f603cebd WIP stuff for skin styles sprite accessory 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:07:02 +10:00
Cael_Aislinn
7e3f58cea2 CPR optimisations, made hypospray visible on the map 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:06:19 +10:00
Cael_Aislinn
9391d55e6e compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:05:05 +10:00
Cael_Aislinn
2f7baa26f8 antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 17:49:34 +10:00
MrYeti
1c3d72e471 Added My own Custom item and Misterbook's pipe spawning in his backpack. 
Also deleted some stuff that were requested for deletion.
 2012-11-28 16:38:40 -05:00
MrYeti
8442a9359e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-27 15:17:06 -05:00
MrYeti
69992184d3 Deleted the items! 2012-11-27 14:16:21 -05:00
Hawk-v3
0e52548c9e Merge pull request #2019 from CIB/master 
Fix stuff
 2012-11-27 03:42:59 -08:00
cib
7bc9d60c0e Possible fix for air tanks running out too quickly. 2012-11-27 12:36:52 +01:00
MrYeti
f1b328f1fb Finished up Roaper's Custom item 
Now ready to push!
 2012-11-26 18:55:54 -05:00
MrYeti
ded839e0f7 Added Custom Item: Monogrammed Handkerchief 2012-11-26 17:15:03 -05:00
MrYeti
fda5be14de Added Roaper's Custom Item 
Deleted some unwanted custom item stuff as well
 2012-11-26 16:40:19 -05:00
Mloc
1923260b5e Merge pull request #2012 from comma/master 
Fixes for surgery
 2012-11-26 08:59:20 -08:00
Chinsky
faa084a955 Fix for lung surgery. 
Fix for internal wounds surgery messages.
 2012-11-25 15:20:08 +04:00
MrYeti
8d0ab6b56c Added Custom Item: Etched Beaker 2012-11-24 23:28:52 -05:00
MrYeti
10b42cc1b3 Fixed my mistake, 
Thanks to Sheep for catching it!
 2012-11-24 23:01:14 -05:00
Hawk-v3
d2a8e5b3ef Merge pull request #2008 from SniperYeti/master 
Added Custom Items - Engraved Zippo, Scanning Goggles, and Left hand Glove
 2012-11-24 14:08:02 -08:00
Hawk-v3
2cdbafa87e Merge pull request #2009 from CIB/master 
Fixes voting
 2012-11-24 14:06:58 -08:00
MrYeti
de83a09f50 Added Custom Item Left Hand Glove 2012-11-24 15:33:46 -05:00
MrYeti
d63b1b232e Added Custom Item: Scanning Goggles 2012-11-24 14:22:14 -05:00
cib
5120d70e04 Fix the issue with time not counting down before game start. 2012-11-24 19:13:15 +01:00
cib
6367d829eb Fixes issue #1989 
Votes should now behave a lot better. Added crew transfer votes.
 2012-11-24 18:35:48 +01:00
MrYeti
c92f831811 Added Engraved Zippo Lighter 2012-11-24 08:34:21 -05:00
Hawk-v3
ebc31cfeb2 Merge pull request #2002 from SniperYeti/master 
Added Custom Item- Fountain Pen and Lithium Flask
 2012-11-23 17:53:52 -08:00
Hawk-v3
74ed33360b Merge pull request #1975 from RavingManiac/master 
Wrapping paper fixes and improvements
 2012-11-23 17:52:52 -08:00
Hawk-v3
2197fd6cbc Merge pull request #2000 from Whitellama/master 
Map Fixes
 2012-11-23 17:52:27 -08:00
Whitellama
5f1552d35e Turned off space ninja spawning as a minievent 2012-11-23 14:59:18 -08:00
MrYeti
314911e458 Added Custom item: Lithium Flask 2012-11-23 12:57:58 -05:00
RavingManiac
f4fe11fc4c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-24 01:26:19 +08:00
cib
300219813d Fix for cryo stopping bleeding. 
Forgot that internal bleeding doesn't use drip()
 2012-11-23 16:04:16 +01:00
cib
d52d0c2c88 Cryo now stops bleeding temporarily. 
To be exact, low body temperature in general does.
 2012-11-23 15:59:43 +01:00
cib
657ede67c0 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-23 15:46:03 +01:00