cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,305 Commits 5 Branches 0 Tags
d55170ab973372b200fe78f627c4f46cd73aa8b3
Commit Graph

7915 Commits

Author SHA1 Message Date
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
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
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
cib
1d7ade2e64 Fixes issue #2001 
Robots with mesons or x-ray now don't see the lighting gradients anymore.
 2012-11-22 22:14:30 +01:00
MrYeti
77a2672a6e Added Custom Item: Fountain Pen 2012-11-22 15:48:15 -05:00
Mloc
33aa4f8ae4 Merge pull request #1997 from CIB/master 
Go fixes
 2012-11-22 12:14:25 -08:00
Chinsky
4e4db63889 Fixes healthy appendix spawning always, regardless of if mob had appendicitis or no. 
Also possibly mobs did not get resistance to appendicitis.
 2012-11-22 23:40:24 +04:00
RavingManiac
e252c47a51 removes the floating code 2012-11-23 02:02:45 +08:00
Chinsky
8e716d12f1 Stuffing mobs in disposals was logged only when you did it via grab. 
Now from dragging too.
 2012-11-22 21:25:19 +04:00
Chinsky
eb1d24429a Fixed typo and wrong colors for ribcage surgery messages. 2012-11-22 15:16:17 +04:00
Whitellama
20bf7f6a2b Fixed the lack of job alt-titles in Crew Manifest 2012-11-21 22:02:18 -08:00
Mloc
bdc587b999 Hopeful fix for NT status. 2012-11-21 21:51:51 +00:00
cib
316af619f8 Rebalanced internal bleeding. 2012-11-21 22:42:20 +01:00
cib
6fbff77163 Re-nerf lung capacity due to problems with internals. 2012-11-21 22:41:35 +01:00
Mloc
2f3b3f84c3 Merge pull request #1995 from CIB/master 
Fixes and stuff
 2012-11-21 13:30:32 -08:00
cib
966f78f1ab Fixes #1993 
Bleeders now stay dead after being killed by blood loss..
 2012-11-21 20:51:57 +01:00
cib
a6c1b5356c Lungs now can only be damaged when breathing from a turf. 2012-11-21 20:41:50 +01:00
cib
e6af3afd42 Fix to breathing inside objects. 2012-11-21 20:33:24 +01:00
Chinsky
8270ea9b9e Made incubator eat right chems, issue #1991 2012-11-21 23:05:13 +04:00
Chinsky
7150999fc6 Rolling pins now work not inly only in full moon at the odd day of week between 1 and 3 am if stars are right. 
Fixes issue #1980
 2012-11-21 22:29:46 +04:00