Commit Graph

7922 Commits

Author SHA1 Message Date
cib
ecb12fb4db Merge branch 'master' of git://github.com/comma/Baystation12 2012-12-06 16:50:28 +04:00
Chinsky
f0ac799952 Merge branch 'bandages' 2012-12-02 21:17:11 +04:00
cib
77943e04f3 Balance fix to random blob event.
It now lasts 20 minutes instead of 5, and accordingly each blob
advancements happens every 30 seconds instead of every 7 seconds. This
means more time to respond to the blob, but overally the blob can still
be just as harmful if nothing is done about it.
2012-12-02 13:58:57 +01:00
cib
bce8c4cfee Merge github.com:Baystation12/Baystation12 2012-12-02 13:36:10 +01:00
Chinsky
507dc0c496 Better feedback messages and ability to target groin, hands and feet. 2012-12-02 16:30:24 +04: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
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
Chinsky
85c2af3871 Started cleanup of medical stacks code.
Removed silly way to get targeted organ.
Removed child organs being affected sometimes.
2012-12-01 09:04:20 +04: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
cib
e11bab8ed7 Balancing emergency air tanks.
- Reduced volume by 33%, since testing revealed they currently last nearly 10 minutes
- Made *everyone* spawn with emergency air tanks, as opposed to random jobs like lawyer etc.
2012-11-28 02:32:04 +01: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